X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=9b00836e81689755a8ede2c41cc278597c292265;hb=6d0bb0dd2f33d4cff3687be9a76ad5188a22b2d9;hp=1cb5d749eaf6aadeb4ce79649946103209ef8e5a;hpb=2b737cd3780f238d4e01ca204402b43bf753d1d7;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 1cb5d749e..9b00836e8 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -18,10 +18,9 @@ node default {
     $nodeinfo  = nodeinfo($fqdn, "/etc/puppet/modules/debian-org/misc/local.yaml")
     $hoster    = whohosts($nodeinfo, "/etc/puppet/modules/debian-org/misc/hoster.yaml")
     $keyinfo   = allnodeinfo("sshRSAHostKey", "ipHostNumber")
+    $mxinfo    = allnodeinfo("mXRecord")
     notice("hoster for ${fqdn} is ${hoster}")
 
-    $mxinfo   = allnodeinfo("mXRecord")
-
     include munin-node
     include sudo
     include ssh
@@ -83,20 +82,15 @@ node default {
     case $hostname {
         klecker,ravel,senfl,orff: { include named::secondary }
         geo1,geo2,geo3:           { include named::geodns }
-        bartok,franck,liszt,master,ries,samosa,schein,spohr,steffani:   { include named::recursor }
+        bartok,franck,liszt,master,samosa,schein,spohr,steffani:   { include named::recursor }
     }
 
-    case $hostname {
-        cilea,paganini,rautavaara: {}
-        default: {
-             case $kernel {
-                 Linux: {
-                     include ferm
-                 }
-             }
-         }
+    case $kernel {
+        Linux: {
+            include ferm
+            include ferm::per-host
+        }
     }
-    include ferm::per-host
 
     case $hostname {
         beethoven,ravel,spohr: {
@@ -115,3 +109,7 @@ node default {
     }
     include samhain
 }
+
+# vim:set et:
+# vim:set sts=4 ts=4:
+# vim:set shiftwidth=4: