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

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