summaryrefslogtreecommitdiff
path: root/puppet
diff options
context:
space:
mode:
Diffstat (limited to 'puppet')
-rw-r--r--puppet/modules/site_apt/manifests/preferences/passenger.pp14
-rw-r--r--puppet/modules/site_config/manifests/remove/jessie.pp2
2 files changed, 1 insertions, 15 deletions
diff --git a/puppet/modules/site_apt/manifests/preferences/passenger.pp b/puppet/modules/site_apt/manifests/preferences/passenger.pp
deleted file mode 100644
index 8cd41f91..00000000
--- a/puppet/modules/site_apt/manifests/preferences/passenger.pp
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# 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;
- }
-
-}
diff --git a/puppet/modules/site_config/manifests/remove/jessie.pp b/puppet/modules/site_config/manifests/remove/jessie.pp
index e9497baf..a3ac19b7 100644
--- a/puppet/modules/site_config/manifests/remove/jessie.pp
+++ b/puppet/modules/site_config/manifests/remove/jessie.pp
@@ -7,7 +7,7 @@ class site_config::remove::jessie {
}
apt::preferences_snippet {
- [ 'facter', 'obfsproxy', 'python-twisted', 'unbound' ]:
+ [ 'facter', 'obfsproxy', 'python-twisted', 'unbound', 'passenger' ]:
ensure => absent;
}