diff options
| author | Micah Anderson <micah@leap.se> | 2015-07-23 11:46:55 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@leap.se> | 2015-07-23 11:46:55 -0400 |
| commit | 70b1c648b94e6c007b9241a4661f33881e74485f (patch) | |
| tree | 999e5dc1f386fc3894889c1cf263094cc748fd41 /puppet/modules/site_apt/manifests | |
| parent | b429b30bda4dafc78cb02f6ece5d82f08e35de1f (diff) | |
| parent | 2761fa77394d5a2857812de840e49172d0e486fb (diff) | |
Merge branch 'develop'
Diffstat (limited to 'puppet/modules/site_apt/manifests')
| -rw-r--r-- | puppet/modules/site_apt/manifests/preferences/passenger.pp | 8 |
1 files changed, 6 insertions, 2 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; } } |