X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=7b76de95389c988cd0ead2b9862c45d45395cb1e;hb=80bb18ab93cfecfc3db9888e150e85c610d04ef7;hp=094c4181e2d950e975f8123d59a9ce9110406a28;hpb=c4e5e19d9fb914cb340fd84632d3cc2a10f13957;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 094c4181e..7b76de953 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -18,8 +18,12 @@ node default {
     include sudo
     include debian-org
     include monit
-    include motd
     include samhain
+    include apt-keys
+
+    $nodeinfo = nodeinfo($fqdn, "/etc/puppet/modules/debian-org/misc/local.yaml")
+
+    include motd
 
     case $smartarraycontroller {
         "true":    { include debian-proliant }
@@ -43,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:   {}
     }