push our standard apache stuff to duarte

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

diff --git a/manifests/site.pp b/manifests/site.pp
index 667aff0..7b76de9 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -19,6 +19,7 @@ node default {
     include debian-org
     include monit
     include samhain
+    include apt-keys
 
     $nodeinfo = nodeinfo($fqdn, "/etc/puppet/modules/debian-org/misc/local.yaml")
 
@@ -46,14 +47,14 @@ node default {
 
     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:   {}
     }
@@ -62,11 +63,6 @@ node default {
                    { include geodns }
         default:   {}
     }
-
-    case $hostname {
-        bartok:    { include apt-keys }
-        default:   {}
-    }
 }
 
 node penalosa inherits default {