some more squeeze + wheezy fixups

Signed-off-by: Stephen Gran <steve@lobefin.net>

diff --git a/manifests/site.pp b/manifests/site.pp
index 3c862097c8b2fe8540b4b62a9ec82e884f17d4b9..a44821f37898740d05b2852bd27297c92aa99bce 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -121,6 +121,9 @@ node default {
     case getfromhash($nodeinfo, 'squeeze') {
         true:  { include unbound }
     }
+    case getfromhash($nodeinfo, 'wheezy') {
+        true:  { include unbound }
+    }
     include resolv
 
     case $kernel {

diff --git a/modules/debian-org/templates/pam.common-session.erb b/modules/debian-org/templates/pam.common-session.erb
index 360b09d2013b672ddb320a1d0f29f1bf69a87ecf..be993435a1d6ce633f2cf9adc839e02d3e312db6 100644 (file)
--- a/modules/debian-org/templates/pam.common-session.erb
+++ b/modules/debian-org/templates/pam.common-session.erb
@@ -3,7 +3,7 @@
 ## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
 ##
 
-<% if nodeinfo.has_key?('squeeze') and nodeinfo['squeeze'] %>
+<% if (nodeinfo.has_key?('squeeze') and nodeinfo['squeeze']) or (nodeinfo.has_key?('wheezy') and nodeinfo['wheezy']) %>
 #
 # /etc/pam.d/common-session - session-related modules common to all services
 #

diff --git a/modules/monit/templates/default.erb b/modules/monit/templates/default.erb
index 0e32b993f5775e13cad2e5d5c34e99f4649b648c..15a0ba07c41b9623ec4ba591aee53c6d5eae5ab8 100644 (file)
--- a/modules/monit/templates/default.erb
+++ b/modules/monit/templates/default.erb
@@ -11,8 +11,7 @@
 # You must set this variable to for monit to start
 startup=0
 
-<% if nodeinfo.has_key?('squeeze') and nodeinfo['squeeze'] %>
-<% else %>
+<% unless (nodeinfo.has_key?('squeeze') and nodeinfo['squeeze']) or (nodeinfo.has_key?('wheezy') and nodeinfo['wheezy']) %>
 
 # To change the intervals which monit should run uncomment
 # and change this variable.

diff --git a/modules/monit/templates/monitrc.erb b/modules/monit/templates/monitrc.erb
index e640cbe1fba3e319df45a2c061acfdc152847316..727e3aec965c7a99697c5ad5a2cfde373d7f9cd9 100644 (file)
--- a/modules/monit/templates/monitrc.erb
+++ b/modules/monit/templates/monitrc.erb
@@ -21,9 +21,8 @@
 ## Start monit in the background (run as a daemon) and check services at 
 ## 2-minute intervals.
 #
-<% if nodeinfo.has_key?('squeeze') and nodeinfo['squeeze'] %>
+<% if (nodeinfo.has_key?('squeeze') and nodeinfo['squeeze']) or (nodeinfo.has_key?('wheezy') and nodeinfo['wheezy']) %>
 set daemon 300
-<% else %>
 <% end %>
 #
 #

diff --git a/modules/nagios/templates/nrpe.cfg.erb b/modules/nagios/templates/nrpe.cfg.erb
index 85ce99a19dd369a86029668d763c17e1b208bbc1..67edbb307ae5a0726c739601325ffeed79cd24df 100644 (file)
--- a/modules/nagios/templates/nrpe.cfg.erb
+++ b/modules/nagios/templates/nrpe.cfg.erb
@@ -27,7 +27,7 @@ log_facility=daemon
 # number.  The file is only written if the NRPE daemon is started by the root
 # user and is running in standalone mode.
 
-<% if nodeinfo.has_key?('squeeze') and nodeinfo['squeeze'] %>
+<% if (nodeinfo.has_key?('squeeze') and nodeinfo['squeeze']) or (nodeinfo.has_key?('wheezy') and nodeinfo['wheezy']) %>
 pid_file=/var/run/nagios/nrpe.pid
 <% else %>
 pid_file=/var/run/nrpe.pid

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index ce0cadd254a1dc474f1a97d85e6601aa376d0df4..24e6478fdbb19e1e6d18cc9c3df0d1c1756532c5 100644 (file)
--- a/modules/samhain/templates/samhainrc.erb
+++ b/modules/samhain/templates/samhainrc.erb
@@ -147,7 +147,7 @@ file=/etc/ferm/
 file=/etc/ferm/conf.d
 file=/etc/ferm/dsa.d
 file=/etc/rc.local
-<% if nodeinfo.has_key?('squeeze') and nodeinfo['squeeze'] %>
+<% if (nodeinfo.has_key?('squeeze') and nodeinfo['squeeze']) or (nodeinfo.has_key?('wheezy') and nodeinfo['wheezy']) %>
 file=/etc/unbound
 <% end -%>
 file=/etc/dsa
@@ -399,7 +399,7 @@ file=/etc/ferm/conf.d/me.conf
 file=/etc/ferm/conf.d/defs.conf
 file=/etc/ferm/ferm.conf
 dir=2/etc/ssl/debian
-<% if nodeinfo.has_key?('squeeze') and nodeinfo['squeeze'] %>
+<% if (nodeinfo.has_key?('squeeze') and nodeinfo['squeeze']) or (nodeinfo.has_key?('wheezy') and nodeinfo['wheezy']) %>
 file=/etc/unbound/unbound.conf
 <% end -%>