refresh only for command

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

diff --git a/manifests/site.pp b/manifests/site.pp
index c3c7b81..fce042a 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -11,7 +11,6 @@ File {
 
 node default {
     include munin-node
-    include samhain
     include sudo
     include debian-org
     include monit
@@ -29,6 +28,11 @@ node default {
     import "nagios"
     include nagios-client
 
+    case $hostname {
+        morales:   {}
+        default:   { include samhain }
+    }
+
     case $hostname {
         spohr:     {
                       import "nagios"
@@ -39,7 +43,7 @@ node default {
 
     case $apache2 {
         "true":    { case $hostname {
-                        "carver":  { include apache2 }
+                        carver,rore,tartini:  { include apache2 }
                         default:   {}
                    } }
         default: {}
@@ -59,4 +63,5 @@ node default {
 
 node penalosa inherits default {
     include hosts
+    include motd
 }