diff options
| author | elijah <elijah@riseup.net> | 2015-06-24 16:44:34 -0700 |
|---|---|---|
| committer | elijah <elijah@riseup.net> | 2015-06-24 16:44:34 -0700 |
| commit | a845c11183a0ee29776c70def63f2d27aaeb653c (patch) | |
| tree | 26a3f993d2c3f33b03176a40777bf33786d2a60f | |
| parent | 19258e1f40a783485f6a422a630dbb33b2e2d2c8 (diff) | |
remove static site circular dependency (closes #7145)
| -rw-r--r-- | puppet/modules/site_apt/manifests/preferences/passenger.pp | 8 | ||||
| -rw-r--r-- | puppet/modules/site_static/manifests/init.pp | 3 |
2 files changed, 8 insertions, 3 deletions
diff --git a/puppet/modules/site_apt/manifests/preferences/passenger.pp b/puppet/modules/site_apt/manifests/preferences/passenger.pp index af501b6b..8cd41f91 100644 --- a/puppet/modules/site_apt/manifests/preferences/passenger.pp +++ b/puppet/modules/site_apt/manifests/preferences/passenger.pp @@ -1,10 +1,14 @@ +# +# currently, this is only used by static_site to get passenger v4. +# +# UPGRADE: this is not needed for jessie. +# class site_apt::preferences::passenger { apt::preferences_snippet { 'passenger': package => 'libapache2-mod-passenger', release => "${::lsbdistcodename}-backports", - priority => 999, - require => [Package['apache'], Class['ruby']]; + priority => 999; } } 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': } } |