different db stuff for qa/ticharich

[mirror/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 a6bf441..ecba854 100644 (file)
--- a/modules/ferm/manifests/per-host.pp
+++ b/modules/ferm/manifests/per-host.pp
@@ -38,22 +38,22 @@ class ferm::per-host {
                                rule            => 'destination 78.8.208.246/32 proto tcp dport 25 jump DROP',
                        }
                }
-               abel,alwyn,rietz: {
-                       @ferm::rule { 'dsa-tftp':
-                               description     => 'Allow tftp access',
-                               rule            => '&SERVICE(udp, 69)'
-                       }
-               }
-               paganini: {
-                       @ferm::rule { 'dsa-dhcp':
-                               description     => 'Allow dhcp access',
-                               rule            => '&SERVICE(udp, 67)'
-                       }
+               abel,alwyn,rietz,jenkins: {
                        @ferm::rule { 'dsa-tftp':
                                description     => 'Allow tftp access',
                                rule            => '&SERVICE(udp, 69)'
                        }
                }
+               #paganini: {
+               #       @ferm::rule { 'dsa-dhcp':
+               #               description     => 'Allow dhcp access',
+               #               rule            => '&SERVICE(udp, 67)'
+               #       }
+               #       @ferm::rule { 'dsa-tftp':
+               #               description     => 'Allow tftp access',
+               #               rule            => '&SERVICE(udp, 69)'
+               #       }
+               #}
                lotti,lully: {
                        @ferm::rule { 'dsa-syslog':
                                description     => 'Allow syslog access',
@@ -116,22 +116,6 @@ class ferm::per-host {
                                rule            => '&TCP_UDP_SERVICE(5080)'
                        }
                }
-               unger: {
-                       @ferm::rule { 'dsa-notrack-dns-diamond-in':
-                               domain      => 'ip',
-                               description => 'NOTRACK for nameserver traffic',
-                               table       => 'raw',
-                               chain       => 'PREROUTING',
-                               rule        => 'destination 82.195.75.108 proto (tcp udp) dport 53 jump NOTRACK'
-                       }
-                       @ferm::rule { 'dsa-notrack-dns-diamond-out':
-                               domain      => 'ip',
-                               description => 'NOTRACK for nameserver traffic',
-                               table       => 'raw',
-                               chain       => 'PREROUTING',
-                               rule        => 'source 82.195.75.108 proto (tcp udp) sport 53 jump NOTRACK'
-                       }
-               }
                sonntag: {
                        @ferm::rule { 'dsa-bugs-search':
                                description  => 'port 1978 for bugs-search from bug web frontends',
@@ -234,12 +218,12 @@ class ferm::per-host {
                bmdb1: {
                        @ferm::rule { 'dsa-postgres-main':
                                description     => 'Allow postgress access',
-                               rule            => '&SERVICE_RANGE(tcp, 5435, ( 5.153.231.14/32 ))'
+                               rule            => '&SERVICE_RANGE(tcp, 5435, ( 5.153.231.14/32 5.153.231.23/32 ))'
                        }
                        @ferm::rule { 'dsa-postgres-main6':
                                domain          => 'ip6',
                                description     => 'Allow postgress access',
-                               rule            => '&SERVICE_RANGE(tcp, 5435, ( 2001:41c8:1000:21::21:14/128 ))'
+                               rule            => '&SERVICE_RANGE(tcp, 5435, ( 2001:41c8:1000:21::21:14/128 2001:41c8:1000:21::21:23/128 ))'
                        }
                        @ferm::rule { 'dsa-postgres-dak':
                                description     => 'Allow postgress access',
@@ -250,16 +234,37 @@ class ferm::per-host {
                                description     => 'Allow postgress access',
                                rule            => '&SERVICE_RANGE(tcp, 5434, ( 2001:41c8:1000:21::21:11/128 2607:f8f0:610:4000:216:36ff:fe40:3860/128 2607:f8f0:610:4000:216:36ff:fe40:3861/128 2607:f8f0:610:4000:6564:a62:ce0c:1386/128 ))'
                        }
+                       @ferm::rule { 'dsa-postgres-wanna-build':
+                               # wuiet, ullmann, franck
+                               description     => 'Allow postgress access',
+                               rule            => '&SERVICE_RANGE(tcp, 5436, ( 5.153.231.18/32 206.12.19.141/32 138.16.160.12/32 ))'
+                       }
+                       @ferm::rule { 'dsa-postgres-wanna-build6':
+                               domain          => 'ip6',
+                               description     => 'Allow postgress access',
+                               rule            => '&SERVICE_RANGE(tcp, 5436, ( 2001:41c8:1000:21::21:18/128 2607:f8f0:610:4000:6564:a62:ce0c:138d/128 ))'
+                       }
+                       @ferm::rule { 'dsa-postgres-bacula':
+                               # dinis
+                               description     => 'Allow postgress access1',
+                               rule            => '&SERVICE_RANGE(tcp, 5437, ( 5.153.231.19/32 ))'
+                       }
+                       @ferm::rule { 'dsa-postgres-bacula6':
+                               domain          => 'ip6',
+                               description     => 'Allow postgress access1',
+                               rule            => '&SERVICE_RANGE(tcp, 5437, ( 2001:41c8:1000:21::21:19/128 ))'
+                       }
                }
                danzi: {
                        @ferm::rule { 'dsa-postgres-danzi':
+                               # ubc, wuit
                                description     => 'Allow postgress access',
-                               rule            => '&SERVICE_RANGE(tcp, 5433, ( 206.12.19.0/24 194.177.211.200/32 ))'
+                               rule            => '&SERVICE_RANGE(tcp, 5433, ( 206.12.19.0/24 5.153.231.18/32 ))'
                        }
                        @ferm::rule { 'dsa-postgres-danzi6':
                                domain          => 'ip6',
                                description     => 'Allow postgress access',
-                               rule            => '&SERVICE_RANGE(tcp, 5433, ( 2607:f8f0:610:4000::/64 2001:648:2ffc:deb:214:22ff:fe74:1fa/128 ))'
+                               rule            => '&SERVICE_RANGE(tcp, 5433, ( 2607:f8f0:610:4000::/64 2001:41c8:1000:21::21:18/128 ))'
                        }
 
                        @ferm::rule { 'dsa-postgres2-danzi':
@@ -275,15 +280,6 @@ class ferm::per-host {
                                rule            => '&SERVICE_RANGE(tcp, 5438, ( 206.12.19.0/24 ))'
                        }
 
-                       @ferm::rule { 'dsa-postgres-bacula-danzi':
-                               description     => 'Allow postgress access1',
-                               rule            => '&SERVICE_RANGE(tcp, 5434, ( 206.12.19.139/32 ))'
-                       }
-                       @ferm::rule { 'dsa-postgres-bacula-danzi6':
-                               domain          => 'ip6',
-                               description     => 'Allow postgress access1',
-                               rule            => '&SERVICE_RANGE(tcp, 5434, ( 2607:f8f0:610:4000:6564:a62:ce0c:138b/128 ))'
-                       }
                }
        }
        # vpn fu