X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=d8a717ca8f48bfd410bb4bcfdee3304b6e9e9502;hb=00fa82211f04415c51fdd8668504683d537a87cf;hp=ef98dfc6d0d4ac8ceffacea8a1032f3cd8501f54;hpb=be6b89c6497aa1a34d3245105f69d675637b2812;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index ef98dfc6d..d8a717ca8 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,36 +75,35 @@ 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 }
-    }
-
-    case extractnodeinfo($nodeinfo, 'apache2_security_mirror') {
-        true: { include rsync }
-        true: { include ftp }
+        bartok,franck,liszt,master,ries,samosa,schein,spohr,steffani:   { include named::recursor }
     }
 
     case $hostname {
-	senfl: { include rsync }
+        cilea,luchesi,paganini,rautavaara,sibelius: {}
+        default: {
+             case $kernel {
+                 Linux: {
+                     include ferm
+                 }
+             }
+         }
     }
+    include ferm::per-host
 
     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 }
     }