From a845c11183a0ee29776c70def63f2d27aaeb653c Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Wed, 24 Jun 2015 16:44:34 -0700
Subject: remove static site circular dependency (closes #7145)

---
 puppet/modules/site_apt/manifests/preferences/passenger.pp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'puppet/modules/site_apt/manifests/preferences')

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;
   }
 
 }
-- 
cgit v1.2.3