fix rule

[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 7164206c2a1acf7fd86a0ff43daead3d313fe4e8..17b16070429498dc8e9955f1fb0d61d1b1db3523 100644 (file)
--- a/modules/ferm/manifests/per-host.pp
+++ b/modules/ferm/manifests/per-host.pp
@@ -82,12 +82,6 @@ class ferm::per-host {
                                rule        => 'destination 78.8.208.246/32 proto tcp dport 25 jump DROP',
                        }
                }
-               abel,rietz,jenkins: {
-                       @ferm::rule { 'dsa-tftp':
-                               description     => 'Allow tftp access',
-                               rule            => '&SERVICE(udp, 69)'
-                       }
-               }
                lotti,lully: {
                        @ferm::rule { 'dsa-syslog':
                                description     => 'Allow syslog access',
@@ -459,4 +453,25 @@ REJECT reject-with icmp-admin-prohibited
                }
                default: {}
        }
+       # tftp
+       case $::hostname {
+               abel: {
+                       @ferm::rule { 'dsa-tftp':
+                               description     => 'Allow tftp access',
+                               rule            => '&SERVICE_RANGE(udp, 69, ( 172.28.17.0/24 ))'
+                       }
+               }
+               jenkins: {
+                       @ferm::rule { 'dsa-tftp':
+                               description     => 'Allow tftp access',
+                               rule            => '&SERVICE_RANGE(udp, 69, ( 192.168.2.0/24 206.12.19.0/24 ))'
+                       }
+               }
+               master: {
+                       @ferm::rule { 'dsa-tftp':
+                               description     => 'Allow tftp access',
+                               rule            => '&SERVICE_RANGE(udp, 69, ( 82.195.75.64/26 ))'
+                       }
+               }
+       }
 }