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

diff --git a/manifests/site.pp b/manifests/site.pp
index 40294bbdf..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
@@ -29,6 +28,7 @@ node default {
     include monit
     include apt-keys
     include ntp
+    include ssl
 
     include motd
 
@@ -49,7 +49,7 @@ node default {
     case $mta {
         "exim4":   {
              case extractnodeinfo($nodeinfo, 'heavy_exim') {
-                  true:    { include exim::mx }
+                  'true':  { include exim::mx }
                   default: { include exim }
              }
         }
@@ -74,46 +74,30 @@ node default {
     }
 
     case extractnodeinfo($nodeinfo, 'buildd') {
-         true:  { include buildd }
+         'true':  {
+             include buildd
+         }
     }
 
     case $hostname {
         klecker,ravel,senfl,orff: { include named::secondary }
         geo1,geo2,geo3:           { include named::geodns }
-        bartok:                   { include named::recursor }
+        bartok,franck,liszt,master,samosa,schein,spohr,steffani:   { include named::recursor }
     }
 
-    case $hostname {
-        logtest01,geo1,geo2,geo3,bartok,senfl,beethoven,piatti,saens,villa: { include ferm }
+    case $kernel {
+        Linux: {
+            include ferm
+            include ferm::per-host
+        }
     }
+
     case $hostname {
-        piatti: {
-           @ferm::rule { "dsa-udd-stunnel":
-               description  => "port 8080 for udd stunnel",
-               rule         => "&SERVICE_RANGE(tcp, http-alt, ( 192.25.206.16 70.103.162.29 217.196.43.134 ))"
-           }
+        beethoven,ravel,spohr: {
+            include nfs-server
         }
-	senfl: {
-	   @ferm::rule { "dsa-rsync":
-		    domain          => "(ip ip6)",
-		    description     => "Allow rsync access",
-		    rule            => "&SERVICE(tcp, 873)"
-	   }
-        }
-        saens,villa: {
-           @ferm::rule { "dsa-ftp":
-		    domain          => "(ip ip6)",
-		    description     => "Allow ftp access",
-		    rule            => "&SERVICE(tcp, 21)"
-           }
-	   @ferm::rule { "dsa-rsync":
-		    domain          => "(ip ip6)",
-		    description     => "Allow rsync access",
-		    rule            => "&SERVICE(tcp, 873)"
-	   }
-        }
-
     }
+
     case $brokenhosts {
         "true":    { include hosts }
     }
@@ -125,3 +109,7 @@ node default {
     }
     include samhain
 }
+
+# vim:set et:
+# vim:set sts=4 ts=4:
+# vim:set shiftwidth=4: