get rid of old flat files

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

diff --git a/manifests/site.pp b/manifests/site.pp
index 91e6f59..cdecc63 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -18,11 +18,13 @@ node default {
     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
 
-    $nodeinfo = nodeinfo($fqdn, "/home/sgran/local.yaml")
-
     case $smartarraycontroller {
         "true":    { include debian-proliant }
         default: {}
@@ -45,17 +47,25 @@ 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:   {}
     }
+
+# 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 }