From: Stephen Gran <steve@lobefin.net>
Date: Sun, 8 Nov 2009 16:31:07 +0000 (+0000)
Subject: some manifest tidy up
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=a7ce759a7185ec3a6a9ef5694fb5cbf832b234d8;p=dsa-puppet.git

some manifest tidy up

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

diff --git a/manifests/site.pp b/manifests/site.pp
index ba2dcefd..fef361e6 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -42,7 +42,6 @@ node default {
         }
     }
 
-
     case $hostname {
         spohr: {
                       include nagios::server
@@ -52,16 +51,16 @@ node default {
 	}
     }
 
-     case extractnodeinfo($nodeinfo, 'apache2_defaultconfig') {
-          "true":  { include apache2 }
-     }
+    case extractnodeinfo($nodeinfo, 'apache2_defaultconfig') {
+         "true":  { include apache2 }
+    }
 
-     case extractnodeinfo($nodeinfo, 'buildd') {
-          "true":  { include buildd }
-     }
-     case extractnodeinfo($nodeinfo, 'apache2_security_mirror') {
-          "true":  { include apache2::security_mirror }
-     }
+    case extractnodeinfo($nodeinfo, 'buildd') {
+         "true":  { include buildd }
+    }
+    case extractnodeinfo($nodeinfo, 'apache2_security_mirror') {
+         "true":  { include apache2::security_mirror }
+    }
 
 
 # maybe wait for rietz to be upgraded to lenny
@@ -69,10 +68,10 @@ node default {
         rietz,raff,klecker: { include named::secondary }
     }
 
-     case $hostname {
-         geo1,geo2,geo3: { include named::geodns }
-     }
-     case $brokenhosts {
-         "true":    { include hosts }
-     }
+    case $hostname {
+        geo1,geo2,geo3: { include named::geodns }
+    }
+    case $brokenhosts {
+        "true":    { include hosts }
+    }
 }