X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=cdecc6394c6193e8ef2c236215a0de3fba3272b3;hb=62e1d338fe5d1027cc8ac35a1b09d46a9ad5dbee;hp=86b8c718aeff8a7f01dd743775038303bae3adce;hpb=b1e1fbd9fddbcb3715eb914c2a01c6f8408dfea5;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 86b8c718a..cdecc6394 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -9,11 +9,21 @@ File {
     ensure  => file,
 }
 
+Exec {
+    path => "/usr/bin:/usr/sbin:/bin:/sbin"
+}
+
 node default {
     include munin-node
     include sudo
     include debian-org
     include monit
+    include apt-keys
+
+    $nodeinfo = nodeinfo($fqdn, "/etc/puppet/modules/debian-org/misc/local.yaml")
+
+    include motd
+    include samhain
 
     case $smartarraycontroller {
         "true":    { include debian-proliant }
@@ -25,35 +35,37 @@ node default {
         default:   {}
     }
 
-    import "nagios"
-    include nagios-client
-
-    case $hostname {
-        morales:   {}
-        default:   { include samhain }
-    }
 
     case $hostname {
-        spohr:     {
-                      import "nagios"
-                      include nagios-server
-                   }
-        default:   {}
+        spohr: {
+                      include nagios::server
+        }
+        default: {
+		      include nagios::client
+	}
     }
 
     case $apache2 {
         "true":    { case $hostname {
-                        carver,rore,tartini:  { include apache2 }
+                        carver,rore,draghi,tartini,samosa,duarte:  { include apache2 }
                         default:   {}
                    } }
         default: {}
     }
 
     case $hostname {
-        ancina,brahms,goedel,goetz,lafayette,malo,praetorius,puccini:
+        ancina,arcadelt,argento,brahms,goedel,goetz,lafayette,malo,murphy,praetorius,puccini,paer:
                    { include buildd }
         default:   {}
     }
+
+# maybe wait for rietz to be upgraded to lenny
+#    case $hostname {
+#        rietz,raff,klecker:
+#                   { include named-secondary }
+#        default:   {}
+#    }
+
     case $hostname {
         geo1,geo2,geo3:
                    { include geodns }