X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=d4f7b84a76bd80f2d1a3829fe8e106df24e2fdd5;hb=6e15bf83682748c31c4d369b960d88078bd474f0;hp=a29e9d3543bb27619aaa7e0c9377c45552a7bfa6;hpb=613d78d876da45d8bdedd08808d6c6bea85d30bb;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index a29e9d354..d4f7b84a7 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -29,6 +29,7 @@ node default {
     include monit
     include apt-keys
     include ntp
+    include ssl
 
     include motd
 
@@ -49,7 +50,7 @@ node default {
     case $mta {
         "exim4":   {
              case extractnodeinfo($nodeinfo, 'heavy_exim') {
-                  true:    { include exim::mx }
+                  'true':  { include exim::mx }
                   default: { include exim }
              }
         }
@@ -74,38 +75,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,ries,samosa,schein,spohr,steffani:   { include named::recursor }
     }
 
-    case extractnodeinfo($nodeinfo, 'apache2_security_mirror') {
-        true: { 
-              include rsync
-              include ftp
+    case $kernel {
+        Linux: {
+            include ferm
+            include ferm::per-host
         }
     }
 
     case $hostname {
-	senfl: { include rsync }
-    }
-
-    case $hostname {
-        logtest01,geo1,geo2,geo3,bartok,senfl,beethoven,piatti,saens: { include ferm }
-    }
-    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
         }
-
     }
+
     case $brokenhosts {
         "true":    { include hosts }
     }
@@ -117,3 +110,7 @@ node default {
     }
     include samhain
 }
+
+# vim:set et:
+# vim:set sts=4 ts=4:
+# vim:set shiftwidth=4: