summaryrefslogtreecommitdiff
path: root/puppet/modules/site_static/manifests
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2015-06-24 16:44:34 -0700
committerelijah <elijah@riseup.net>2015-06-24 16:44:34 -0700
commita845c11183a0ee29776c70def63f2d27aaeb653c (patch)
tree26a3f993d2c3f33b03176a40777bf33786d2a60f /puppet/modules/site_static/manifests
parent19258e1f40a783485f6a422a630dbb33b2e2d2c8 (diff)
remove static site circular dependency (closes #7145)
Diffstat (limited to 'puppet/modules/site_static/manifests')
-rw-r--r--puppet/modules/site_static/manifests/init.pp3
1 files changed, 2 insertions, 1 deletions
diff --git a/puppet/modules/site_static/manifests/init.pp b/puppet/modules/site_static/manifests/init.pp
index 35ecabf8..2a198b57 100644
--- a/puppet/modules/site_static/manifests/init.pp
+++ b/puppet/modules/site_static/manifests/init.pp
@@ -35,6 +35,8 @@ class site_static {
include site_apache::module::rewrite
apache::config::include{ 'ssl_common.inc': }
+ include site_config::ruby::dev
+
if (member($formats, 'rack')) {
include site_apt::preferences::passenger
class { 'passenger':
@@ -44,7 +46,6 @@ class site_static {
}
if (member($formats, 'amber')) {
- include site_config::ruby::dev
rubygems::gem{'amber-0.3.4': }
}