]> git.donarmstrong.com Git - dsa-puppet.git/blobdiff - modules/ferm/manifests/per-host.pp
projects / dsa-puppet.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
do not run an authority on draghi
[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 4c3cc4c558dfd5dcdfa3e16414a57aec0dc4d616..818c2aaa5233a0c661ae123362d6c54718f19441 100644 (file)
--- a/modules/ferm/manifests/per-host.pp
+++ b/modules/ferm/manifests/per-host.pp
@@ -12,12 +12,6 @@ class ferm::per-host {
        }
 
        case $::hostname {
-               samosa: {
-                       @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 ))'
-                       }
-               }
                czerny,clementi: {
                        @ferm::rule { 'dsa-upsmon':
                                description     => 'Allow upsmon access',
@@ -26,16 +20,16 @@ class ferm::per-host {
                }
                bendel: {
                        @ferm::rule { 'listmaster-ontp-in':
-                               description     => 'ONTP has a broken mail setup',
-                               table           => 'filter',
-                               chain           => 'INPUT',
-                               rule            => 'source 188.165.23.89/32 proto tcp dport 25 jump DROP',
+                               description => 'ONTP has a broken mail setup',
+                               table       => 'filter',
+                               chain       => 'INPUT',
+                               rule        => 'source 188.165.23.89/32 proto tcp dport 25 jump DROP',
                        }
                        @ferm::rule { 'listmaster-ontp-out':
-                               description     => 'ONTP has a broken mail setup',
-                               table           => 'filter',
-                               chain           => 'OUTPUT',
-                               rule            => 'destination 78.8.208.246/32 proto tcp dport 25 jump DROP',
+                               description => 'ONTP has a broken mail setup',
+                               table       => 'filter',
+                               chain       => 'OUTPUT',
+                               rule        => 'destination 78.8.208.246/32 proto tcp dport 25 jump DROP',
                        }
                }
                abel,alwyn,rietz,jenkins: {
@@ -80,11 +74,6 @@ class ferm::per-host {
                        }
                }
                draghi: {
-                       #@ferm::rule { 'dsa-bind':
-                       #    domain          => '(ip ip6)',
-                       #    description     => 'Allow nameserver access',
-                       #    rule            => '&TCP_UDP_SERVICE(53)'
-                       #}
                        @ferm::rule { 'dsa-finger':
                                domain          => '(ip ip6)',
                                description     => 'Allow finger access',
@@ -175,22 +164,63 @@ class ferm::per-host {
                        @ferm::rule { 'dsa-conntrackd':
                                rule            => 'interface vlan2 daddr 225.0.0.50 jump ACCEPT',
                        }
+                       @ferm::rule { 'dsa-bind-notrack-in':
+                               domain      => 'ip',
+                               description => 'NOTRACK for nameserver traffic',
+                               table       => 'raw',
+                               chain       => 'PREROUTING',
+                               rule        => 'proto (tcp udp) daddr 5.153.231.24 dport 53 jump NOTRACK'
+                       }
+
+                       @ferm::rule { 'dsa-bind-notrack-out':
+                               domain      => 'ip',
+                               description => 'NOTRACK for nameserver traffic',
+                               table       => 'raw',
+                               chain       => 'OUTPUT',
+                               rule        => 'proto (tcp udp) saddr 5.153.231.24 sport 53 jump NOTRACK'
+                       }
+
+                       @ferm::rule { 'dsa-bind-notrack-in6':
+                               domain      => 'ip6',
+                               description => 'NOTRACK for nameserver traffic',
+                               table       => 'raw',
+                               chain       => 'PREROUTING',
+                               rule        => 'proto (tcp udp) daddr 2001:41c8:1000:21::21:24 dport 53 jump NOTRACK'
+                       }
+
+                       @ferm::rule { 'dsa-bind-notrack-out6':
+                               domain      => 'ip6',
+                               description => 'NOTRACK for nameserver traffic',
+                               table       => 'raw',
+                               chain       => 'OUTPUT',
+                               rule        => 'proto (tcp udp) saddr 2001:41c8:1000:21::21:24 sport 53 jump NOTRACK'
+                       }
                }
                default: {}
        }
 
+       # solr stuff
+       case $::hostname {
+               stockhausen: {
+                       @ferm::rule { 'dsa-solr-jetty':
+                               description     => 'Allow jetty access',
+                               rule            => '&SERVICE_RANGE(tcp, 8080, ( 82.195.75.100/32 ))'
+                       }
+               }
+       }
+
        # postgres stuff
        case $::hostname {
                ullmann: {
                        @ferm::rule { 'dsa-postgres-udd':
                                description     => 'Allow postgress access',
-                               # quantz, wagner, master, couper, coccia, franck
-                               rule            => '&SERVICE_RANGE(tcp, 5452, ( 206.12.19.122/32 217.196.43.134/32 217.196.43.132/32 82.195.75.110/32 5.153.231.14/32 5.153.231.11/32 138.16.160.12/32 ))'
+                               # quantz, moszumanska, master, couper, coccia, franck
+                               rule            => '&SERVICE_RANGE(tcp, 5452, ( 206.12.19.122/32 5.153.231.21/32 82.195.75.110/32 5.153.231.14/32 5.153.231.11/32 138.16.160.12/32 ))'
                        }
                        @ferm::rule { 'dsa-postgres-udd6':
                                domain          => '(ip6)',
                                description     => 'Allow postgress access',
-                               rule            => '&SERVICE_RANGE(tcp, 5452, ( 2607:f8f0:610:4000:216:36ff:fe40:3860/128 2001:41b8:202:deb:216:36ff:fe40:4001/128 2001:41c8:1000:21::21:14/128 2001:41c8:1000:21::21:11/32 ))'
+                               rule            => '&SERVICE_RANGE(tcp, 5452, ( 2607:f8f0:610:4000:216:36ff:fe40:3860/128 2001:41b8:202:deb:216:36ff:fe40:4001/128 2001:41c8:1000:21::21:14/128 2001:41c8:1000:21::21:11/32 2001:41c8:1000:21::21:21/128 ))'
                        }
                }
                grieg: {
@@ -218,21 +248,21 @@ 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 5.153.231.25/32 206.12.19.141/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 2001:41c8:1000:21::21:25/128 2607:f8f0:610:4000:6564:a62:ce0c:138d/128 ))'
                        }
                        @ferm::rule { 'dsa-postgres-dak':
                                description     => 'Allow postgress access',
-                               rule            => '&SERVICE_RANGE(tcp, 5434, ( 5.153.231.11/32 206.12.19.122/32 206.12.19.123/32 206.12.19.134/32 ))'
+                               rule            => '&SERVICE_RANGE(tcp, 5434, ( 5.153.231.11/32 206.12.19.122/32 206.12.19.123/32 206.12.19.134/32 5.153.231.21/32 ))'
                        }
                        @ferm::rule { 'dsa-postgres-dak6':
                                domain          => 'ip6',
                                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 ))'
+                               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 2001:41c8:1000:21::21:21/128 ))'
                        }
                        @ferm::rule { 'dsa-postgres-wanna-build':
                                # wuiet, ullmann, franck
@@ -254,26 +284,6 @@ class ferm::per-host {
                                description     => 'Allow postgress access1',
                                rule            => '&SERVICE_RANGE(tcp, 5437, ( 2001:41c8:1000:21::21:19/128 ))'
                        }
-                       @ferm::rule { 'dsa-postgres-tracker':
-                               # dinis
-                               description     => 'Allow postgress access for tracker',
-                               rule            => '&SERVICE_RANGE(tcp, 5438, ( 5.153.231.23/32 ))'
-                       }
-                       @ferm::rule { 'dsa-postgres-tracker6':
-                               domain          => 'ip6',
-                               description     => 'Allow postgress access for tracker1',
-                               rule            => '&SERVICE_RANGE(tcp, 5438, ( 2001:41c8:1000:21::21:23/128 ))'
-                       }
-                       @ferm::rule { 'dsa-postgres-tracker-dev':
-                               # dinis
-                               description     => 'Allow postgress access for tracker-dev',
-                               rule            => '&SERVICE_RANGE(tcp, 5439, ( 5.153.231.23/32 ))'
-                       }
-                       @ferm::rule { 'dsa-postgres-tracker-dev6':
-                               domain          => 'ip6',
-                               description     => 'Allow postgress access for tracker-dev',
-                               rule            => '&SERVICE_RANGE(tcp, 5439, ( 2001:41c8:1000:21::21:23/128 ))'
-                       }
                }
                danzi: {
                        @ferm::rule { 'dsa-postgres-danzi':
@@ -301,6 +311,7 @@ class ferm::per-host {
                        }
 
                }
+               default: {}
        }
        # vpn fu
        case $::hostname {
@@ -329,5 +340,6 @@ REJECT reject-with icmp-admin-prohibited
                                rule            => 'outerface !tun+ mod mark mark 1 MASQUERADE',
                        }
                }
+               default: {}
        }
 }
Unnamed repository; edit this file 'description' to name the repository.