From 23f10c8e359298d717decf0da12ec3d6b1907c1f Mon Sep 17 00:00:00 2001
From: Stephen Gran <steve@lobefin.net>
Date: Mon, 10 Oct 2011 20:26:28 +0100
Subject: [PATCH] some more squeeze + wheezy fixups

Signed-off-by: Stephen Gran <steve@lobefin.net>
---
 manifests/site.pp                                   | 3 +++
 modules/debian-org/templates/pam.common-session.erb | 2 +-
 modules/monit/templates/default.erb                 | 3 +--
 modules/monit/templates/monitrc.erb                 | 3 +--
 modules/nagios/templates/nrpe.cfg.erb               | 2 +-
 modules/samhain/templates/samhainrc.erb             | 4 ++--
 6 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/manifests/site.pp b/manifests/site.pp
index 3c862097c..a44821f37 100644
--- 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 360b09d20..be993435a 100644
--- 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 0e32b993f..15a0ba07c 100644
--- 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 e640cbe1f..727e3aec9 100644
--- 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 85ce99a19..67edbb307 100644
--- 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 ce0cadd25..24e6478fd 100644
--- 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 -%>
 
-- 
2.20.1