some readability cleanup

[dsa-puppet.git] / modules / ferm / manifests / per-host.pp

diff --git a/modules/ferm/manifests/per-host.pp b/modules/ferm/manifests/per-host.pp
index a1715dc09fa63e18a60679b1e44d69bb9a936cba..a5717e15d4b3dbf76f4d87142b0d0c8ec23a8a12 100644 (file)
--- a/modules/ferm/manifests/per-host.pp
+++ b/modules/ferm/manifests/per-host.pp
@@ -1,17 +1,17 @@
 class ferm::per-host {
-    case $hostname {
+    case $::hostname {
         ancina,zandonai,zelenka: {
             include ferm::zivit
         }
     }
 
-    case $hostname {
-        chopin,franck,gluck,kassia,klecker,lobos,morricone,ravel,ries,rietz,saens,schein,santoro,steffani,valente,villa,wieck,stabile: {
+    case $::hostname {
+        chopin,franck,gluck,kassia,klecker,lobos,morricone,ravel,ries,rietz,saens,schein,santoro,steffani,valente,villa,wieck,stabile,bizet: {
             include ferm::ftp
         }
     }
 
-    case $hostname {
+    case $::hostname {
         piatti,samosa: {
             @ferm::rule { "dsa-udd-stunnel":
                 description  => "port 8080 for udd stunnel",
@@ -19,9 +19,19 @@ class ferm::per-host {
             }
         }
         danzi: {
-                @ferm::rule { "dsa-postgres-danzi":
-                    description     => "Allow postgress access",
-                    rule            => "&SERVICE_RANGE(tcp, 5433, ( 206.12.19.0/24 ))"
+                @ferm::rule {
+                    "dsa-postgres-danzi":
+                        description     => "Allow postgress access",
+                        rule            => "&SERVICE_RANGE(tcp, 5433, ( 206.12.19.0/24 ))"
+                        ;
+                    "dsa-postgres2-danzi":
+                        description     => "Allow postgress access2",
+                        rule            => "&SERVICE_RANGE(tcp, 5437, ( 206.12.19.0/24 ))"
+                        ;
+                    "dsa-postgres3-danzi":
+                        description     => "Allow postgress access2",
+                        rule            => "&SERVICE_RANGE(tcp, 5436, ( 206.12.19.0/24 ))"
+                        ;
                 }
 
         }
@@ -81,7 +91,14 @@ class ferm::per-host {
                 rule            => "&SERVICE(tcp, 11371)"
             }
         }
-        liszt: {
+        gombert: {
+            @ferm::rule { "dsa-infinoted":
+                domain          => "(ip ip6)",
+                description     => "Allow infinoted access",
+                rule            => "&SERVICE(tcp, 6523)"
+            }
+        }
+        bendel,liszt: {
             @ferm::rule { "smtp":
                 domain          => "(ip ip6)",
                 description     => "Allow smtp access",
@@ -204,7 +221,7 @@ class ferm::per-host {
     }
 
     # redirect snapshot into varnish
-    case $hostname {
+    case $::hostname {
         sibelius: {
             @ferm::rule { "dsa-snapshot-varnish":
                 rule            => '&SERVICE(tcp, 6081)',
@@ -226,6 +243,10 @@ class ferm::per-host {
             }
         }
     }
+
+    if $::rsyncd {
+        include ferm::rsync
+    }
 }
 
 # vim:set et: