Prepare to move postgres to lw07

[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 637159916ad4e686a6f739749522ea24f99191c0..24a37b1bfe9fcfd1ce272424600e890211d1ca0d 100644 (file)
--- a/modules/ferm/manifests/per-host.pp
+++ b/modules/ferm/manifests/per-host.pp
@@ -422,6 +422,12 @@ class ferm::per-host {
                                rule            => '&SERVICE_RANGE(tcp, 5439, ( 185.17.185.181/32 185.17.185.182/32 ))'
                        }
                }
+               lw07: {
+                       @ferm::rule { 'dsa-postgres-snapshot':
+                               description     => 'Allow postgress access',
+                               rule            => '&SERVICE_RANGE(tcp, 5439, ( 185.17.185.176/28 ))'
+                       }
+               }
                default: {}
        }
        # vpn fu
@@ -455,16 +461,21 @@ REJECT reject-with icmp-admin-prohibited
        }
        # tftp
        case $::hostname {
-               abel,jenkins: {
+               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(udp, 69)'
+                               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(udp, 69)'
                                rule            => '&SERVICE_RANGE(udp, 69, ( 82.195.75.64/26 ))'
                        }
                }