debug?

[dsa-puppet.git] / manifests / site.pp

diff --git a/manifests/site.pp b/manifests/site.pp
index 2593be0baa047e022dc13b25d866a6acc4798499..86300969088c9fb4deb139cbf76619016b25e3e9 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -9,11 +9,20 @@ File {
     ensure  => file,
 }
 
+Exec {
+    path => "/usr/bin:/usr/sbin:/bin:/sbin"
+}
+
 node default {
     include munin-node
-    include samhain
     include sudo
     include debian-org
+    include monit
+    include motd
+    include samhain
+
+    $nodeinfo = nodeinfo($fqdn, "/home/sgran/local.yaml")
+    debug($nodeinfo)
 
     case $smartarraycontroller {
         "true":    { include debian-proliant }
@@ -25,36 +34,34 @@ node default {
         default:   {}
     }
 
-    import "nagios"
-    include nagios-client
 
     case $hostname {
-        spohr:     {
-                      import "nagios"
-                      include nagios-server
-                   }
-        default:   {}
+        spohr: {
+                      include nagios::server
+        }
+        default: {
+                     include nagios::client
+       }
     }
 
     case $apache2 {
         "true":    { case $hostname {
-                        "carver":  { include apache2 }
+                        carver,rore,tartini:  { include apache2 }
                         default:   {}
                    } }
         default: {}
     }
 
     case $hostname {
-        brahms,goetz,lafayette,malo,praetorius,puccini:
+        ancina,brahms,goedel,goetz,lafayette,malo,praetorius,puccini:
                    { include buildd }
         default:   {}
     }
     case $hostname {
-       geo1,geo2,geo3:
-                  { include geodns }
+        geo1,geo2,geo3:
+                   { include geodns }
         default:   {}
     }
-
 }
 
 node penalosa inherits default {