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

diff --git a/manifests/site.pp b/manifests/site.pp
index a69f518d4..1cb5d749e 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 }
              }
         }
@@ -76,78 +77,33 @@ node default {
     case extractnodeinfo($nodeinfo, 'buildd') {
          'true':  {
              include buildd
-             case $kernel {
-                 Linux: {
-                     include ferm
-                 }
-             }
          }
     }
 
     case $hostname {
         klecker,ravel,senfl,orff: { include named::secondary }
         geo1,geo2,geo3:           { include named::geodns }
-        bartok,schein,steffani:   { include named::recursor }
+        bartok,franck,liszt,master,ries,samosa,schein,spohr,steffani:   { include named::recursor }
     }
 
     case $hostname {
-        logtest01,geo1,geo2,geo3,bartok,senfl,beethoven,piatti,saens,villa,lobos,raff,gluck,schein,wieck,steffani,ball,handel,tchaikovsky: { include ferm }
+        cilea,paganini,rautavaara: {}
+        default: {
+             case $kernel {
+                 Linux: {
+                     include ferm
+                 }
+             }
+         }
     }
+    include ferm::per-host
+
     case $hostname {
-        zandonai,zelenka: {
-           @ferm::rule { "dsa-zivit-rrdcollect":
-               description  => "port 6666 for rrdcollect for zivit",
-               rule         => "&SERVICE_RANGE(tcp, 6666, ( 10.130.18.71 ))"
-           }
-           @ferm::rule { "dsa-zivit-zabbix":
-               description  => "port 10050 for zabbix for zivit",
-               rule         => "&SERVICE_RANGE(tcp, 10050, ( 10.130.18.76 ))"
-           }
-        }
-        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 ))"
-           }
-        }
-	senfl: {
-	   @ferm::rule { "dsa-rsync":
-		    domain          => "(ip ip6)",
-		    description     => "Allow rsync access",
-		    rule            => "&SERVICE(tcp, 873)"
-	   }
-        }
-        saens,villa,lobos,raff,gluck,schein,wieck,steffani: {
-           @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)"
-	   }
+        beethoven,ravel,spohr: {
+            include nfs-server
         }
-        ancina,zelenka: {
-	   @ferm::rule { "dsa-time":
-		    description     => "Allow time access",
-		    rule            => "&SERVICE_RANGE(tcp, time, \$HOST_NAGIOS_V4)"
-	   }
-        }
-        handel: {
-	   @ferm::rule { "dsa-puppet":
-		    description     => "Allow puppet access",
-		    rule            => "&SERVICE_RANGE(tcp, 8140, \$HOST_DEBIAN_V4)"
-	   }
-	   @ferm::rule { "dsa-puppet-v6":
-		    domain          => 'ip6',
-		    description     => "Allow puppet access",
-		    rule            => "&SERVICE_RANGE(tcp, 8140, \$HOST_DEBIAN_V6)"
-	   }
-        }
-
     }
+
     case $brokenhosts {
         "true":    { include hosts }
     }