Try to avoid reserved site keyword
[mirror/dsa-puppet.git] / modules / ferm / manifests / per_host.pp
index 952f52a..fb38cb3 100644 (file)
@@ -3,115 +3,57 @@ class ferm::per_host {
                include ferm::zivit
        }
 
-       if (getfromhash($site::nodeinfo, 'hoster', 'name') == "aql") {
+       if (getfromhash($deprecated::nodeinfo, 'hoster', 'name') == "aql") {
                include ferm::aql
        }
 
        case $::hostname {
                czerny,clementi: {
-                       @ferm::rule { 'dsa-upsmon':
+                       ferm::rule { 'dsa-upsmon':
                                description     => 'Allow upsmon access',
                                rule            => '&SERVICE_RANGE(tcp, 3493, ( 82.195.75.64/26 192.168.43.0/24 ))'
                        }
                }
-               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',
-                       }
-                       @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',
-                       }
-               }
-               lotti,lully,loghost-grnet-01: {
-                       @ferm::rule { 'dsa-syslog':
-                               description     => 'Allow syslog access',
-                               rule            => '&SERVICE_RANGE(tcp, 5140, $HOST_DEBIAN_V4)'
-                       }
-                       @ferm::rule { 'dsa-syslog-v6':
-                               domain          => 'ip6',
-                               description     => 'Allow syslog access',
-                               rule            => '&SERVICE_RANGE(tcp, 5140, $HOST_DEBIAN_V6)'
-                       }
-               }
                kaufmann: {
-                       @ferm::rule { 'dsa-hkp':
+                       ferm::rule { 'dsa-hkp':
                                domain          => '(ip ip6)',
                                description     => 'Allow hkp access',
                                rule            => '&SERVICE(tcp, 11371)'
                        }
                }
                gombert: {
-                       @ferm::rule { 'dsa-infinoted':
+                       ferm::rule { 'dsa-infinoted':
                                domain          => '(ip ip6)',
                                description     => 'Allow infinoted access',
                                rule            => '&SERVICE(tcp, 6523)'
                        }
                }
                draghi: {
-                       @ferm::rule { 'dsa-finger':
+                       ferm::rule { 'dsa-finger':
                                domain          => '(ip ip6)',
                                description     => 'Allow finger access',
                                rule            => '&SERVICE(tcp, 79)'
                        }
-                       @ferm::rule { 'dsa-ldap':
+                       ferm::rule { 'dsa-ldap':
                                domain          => '(ip ip6)',
                                description     => 'Allow ldap access',
                                rule            => '&SERVICE(tcp, 389)'
                        }
-                       @ferm::rule { 'dsa-ldaps':
+                       ferm::rule { 'dsa-ldaps':
                                domain          => '(ip ip6)',
                                description     => 'Allow ldaps access',
                                rule            => '&SERVICE(tcp, 636)'
                        }
                }
-               sonntag: {
-                       @ferm::rule { 'dsa-bugs-search':
-                               description  => 'port 1978 for bugs-search from bug web frontends',
-                               rule         => '&SERVICE_RANGE(tcp, 1978, ( 140.211.166.26 209.87.16.39 ))'
-                       }
-               }
                default: {}
        }
 
-       # redirect snapshot into varnish
-       case $::hostname {
-               sibelius: {
-                       @ferm::rule { 'dsa-snapshot-varnish':
-                               rule            => '&SERVICE(tcp, 6081)',
-                       }
-                       @ferm::rule { 'dsa-nat-snapshot-varnish':
-                               table           => 'nat',
-                               chain           => 'PREROUTING',
-                               rule            => 'proto tcp daddr 193.62.202.30 dport 80 REDIRECT to-ports 6081',
-                       }
-               }
-               lw07: {
-                       @ferm::rule { 'dsa-snapshot-varnish':
-                               rule            => '&SERVICE(tcp, 6081)',
-                       }
-                       @ferm::rule { 'dsa-nat-snapshot-varnish':
-                               table           => 'nat',
-                               chain           => 'PREROUTING',
-                               rule            => 'proto tcp daddr 185.17.185.185 dport 80 REDIRECT to-ports 6081',
-                       }
-               }
-               default: {}
-       }
        case $::hostname {
                bm-bl1,bm-bl2: {
-                       @ferm::rule { 'dsa-vrrp':
+                       ferm::rule { 'dsa-vrrp':
                                rule            => 'proto vrrp daddr 224.0.0.18 jump ACCEPT',
                        }
-                       @ferm::rule { 'dsa-conntrackd':
-                               rule            => 'interface vlan2 daddr 225.0.0.50 jump ACCEPT',
-                       }
-                       @ferm::rule { 'dsa-bind-notrack-in':
+                       ferm::rule { 'dsa-bind-notrack-in':
                                domain      => 'ip',
                                description => 'NOTRACK for nameserver traffic',
                                table       => 'raw',
@@ -119,7 +61,7 @@ class ferm::per_host {
                                rule        => 'proto (tcp udp) daddr 5.153.231.24 dport 53 jump NOTRACK'
                        }
 
-                       @ferm::rule { 'dsa-bind-notrack-out':
+                       ferm::rule { 'dsa-bind-notrack-out':
                                domain      => 'ip',
                                description => 'NOTRACK for nameserver traffic',
                                table       => 'raw',
@@ -127,7 +69,7 @@ class ferm::per_host {
                                rule        => 'proto (tcp udp) saddr 5.153.231.24 sport 53 jump NOTRACK'
                        }
 
-                       @ferm::rule { 'dsa-bind-notrack-in6':
+                       ferm::rule { 'dsa-bind-notrack-in6':
                                domain      => 'ip6',
                                description => 'NOTRACK for nameserver traffic',
                                table       => 'raw',
@@ -135,7 +77,7 @@ class ferm::per_host {
                                rule        => 'proto (tcp udp) daddr 2001:41c8:1000:21::21:24 dport 53 jump NOTRACK'
                        }
 
-                       @ferm::rule { 'dsa-bind-notrack-out6':
+                       ferm::rule { 'dsa-bind-notrack-out6':
                                domain      => 'ip6',
                                description => 'NOTRACK for nameserver traffic',
                                table       => 'raw',
@@ -146,225 +88,174 @@ class ferm::per_host {
                default: {}
        }
 
-       # elasticsearch stuff
-       case $::hostname {
-               stockhausen: {
-                       @ferm::rule { 'dsa-elasticsearch-bendel':
-                               domain          => '(ip)',
-                               description     => 'Allow elasticsearch access from bendel',
-                               rule            => '&SERVICE_RANGE(tcp, 9200:9300, ( 82.195.75.100/32 ))'
-                       }
-                       @ferm::rule { 'dsa-elasticsearch-bendel6':
-                               domain          => '(ip6)',
-                               description     => 'Allow elasticsearch access from bendel',
-                               rule            => '&SERVICE_RANGE(tcp, 9200:9300, ( 2001:41b8:202:deb:216:36ff:fe40:4002/128 ))'
-                       }
-               }
-       }
-
        # postgres stuff
        case $::hostname {
                ullmann: {
-                       @ferm::rule { 'dsa-postgres-udd':
-                               description     => 'Allow postgress access',
-                               # quantz, moszumanska, master, coccia
-                               rule            => '&SERVICE_RANGE(tcp, 5452, ( 5.153.231.28/32 5.153.231.21/32 82.195.75.110/32 5.153.231.11/32 ))'
-                       }
-                       @ferm::rule { 'dsa-postgres-udd6':
-                               domain          => '(ip6)',
+                       ferm::rule { 'dsa-postgres-udd':
                                description     => 'Allow postgress access',
-                               rule            => '&SERVICE_RANGE(tcp, 5452, ( 2001:41c8:1000:21::21:28/128 2001:41b8:202:deb:216:36ff:fe40:4001/128 2001:41c8:1000:21::21:11/32 2001:41c8:1000:21::21:21/128 ))'
+                               domain          => '(ip ip6)',
+                               # quantz, master, coccia
+                               rule            => @("EOF")
+                                       &SERVICE_RANGE(tcp, 5452, (
+                                               ${ join(getfromhash($deprecated::allnodeinfo, 'quantz.debian.org', 'ipHostNumber'), " ") }
+                                               ${ join(getfromhash($deprecated::allnodeinfo, 'master.debian.org', 'ipHostNumber'), " ") }
+                                               ${ join(getfromhash($deprecated::allnodeinfo, 'coccia.debian.org', 'ipHostNumber'), " ") }
+                                               ${ join(getfromhash($deprecated::allnodeinfo, 'respighi.debian.org', 'ipHostNumber'), " ") }
+                                               ${ join(getfromhash($deprecated::allnodeinfo, 'wuiet.debian.org', 'ipHostNumber'), " ") }
+                                       ))
+                                       | EOF
                        }
                }
                fasolo: {
-                       @ferm::rule { 'dsa-postgres-fasolo':
+                       ferm::rule { 'dsa-postgres':
                                description     => 'Allow postgress access',
-                               rule            => '&SERVICE_RANGE(tcp, 5433, ( 5.153.231.10/32 ))'
-                       }
-                       @ferm::rule { 'dsa-postgres-fasolo6':
-                               domain          => 'ip6',
-                               description     => 'Allow postgress access',
-                               rule            => '&SERVICE_RANGE(tcp, 5433, ( 2001:41c8:1000:21::21:10/128 ))'
-                       }
-
-                       @ferm::rule { 'dsa-postgres-backup':
-                               description     => 'Allow postgress access',
-                               rule            => '&SERVICE_RANGE(tcp, 5433, ( $HOST_PGBACKUPHOST_V4 ))'
-                       }
-                       @ferm::rule { 'dsa-postgres-backup6':
-                               domain          => 'ip6',
-                               description     => 'Allow postgress access',
-                               rule            => '&SERVICE_RANGE(tcp, 5433, ( $HOST_PGBACKUPHOST_V6 ))'
+                               domain          => '(ip ip6)',
+                               rule            => @("EOF"/$)
+                                       &SERVICE_RANGE(tcp, 5433, (
+                                               ${ join(getfromhash($deprecated::allnodeinfo, 'bmdb1.debian.org', 'ipHostNumber'), " ") }
+                                               \$HOST_PGBACKUPHOST
+                                       ))
+                                       | EOF
                        }
                }
                bmdb1: {
-                       @ferm::rule { 'dsa-postgres-main':
-                               description     => 'Allow postgress access',
-                               rule            => '&SERVICE_RANGE(tcp, 5435, ( 5.153.231.23/32 5.153.231.25/32 209.87.16.38/32 5.153.231.26/32 5.153.231.18/32 5.153.231.28/32 5.153.231.249/32 5.153.231.29/32 5.153.231.43/32 5.153.231.33/32 ))'
-                       }
-                       @ferm::rule { 'dsa-postgres-main6':
-                               domain          => 'ip6',
-                               description     => 'Allow postgress access',
-                               rule            => '&SERVICE_RANGE(tcp, 5435, ( 2001:41c8:1000:21::21:23/128 2001:41c8:1000:21::21:25/128 2607:f8f0:614:1::1274:38/128 2001:41c8:1000:21::21:26/128 2001:41c8:1000:21::21:18/128 2001:41c8:1000:21::21:28/128 2001:41c8:1000:20::20:249/128 2001:41c8:1000:21::21:29/128 2001:41c8:1000:21::21:43/128 2001:41c8:1000:21::21:33/128 ))'
-                       }
-                       @ferm::rule { 'dsa-postgres-dak':
-                               description     => 'Allow postgress access',
-                               rule            => '&SERVICE_RANGE(tcp, 5434, ( 5.153.231.11/32 5.153.231.28/32 209.87.16.26/32 5.153.231.21/32 5.153.231.18/32 5.153.231.29/32 128.31.0.69/32 ))'
-                       }
-                       @ferm::rule { 'dsa-postgres-dak6':
-                               domain          => 'ip6',
-                               description     => 'Allow postgress access',
-                               rule            => '&SERVICE_RANGE(tcp, 5434, ( 2001:41c8:1000:21::21:11/128 2001:41c8:1000:21::21:28/128 2607:f8f0:614:1::1274:26/128 2001:41c8:1000:21::21:21/128 2001:41c8:1000:21::21:18/128 2001:41c8:1000:21::21:29/128 ))'
-                       }
-                       @ferm::rule { 'dsa-postgres-wannabuild':
-                               # wuiet, ullmann
-                               description     => 'Allow postgress access',
-                               rule            => '&SERVICE_RANGE(tcp, 5436, ( 5.153.231.18/32 209.87.16.38/32 ))'
-                       }
-                       @ferm::rule { 'dsa-postgres-wannabuild6':
-                               domain          => 'ip6',
-                               description     => 'Allow postgress access',
-                               rule            => '&SERVICE_RANGE(tcp, 5436, ( 2001:41c8:1000:21::21:18/128 2607:f8f0:614:1::1274:38/128 ))'
-                       }
-                       @ferm::rule { 'dsa-postgres-bacula':
-                               # dinis
-                               description     => 'Allow postgress access1',
-                               rule            => '&SERVICE_RANGE(tcp, 5437, ( 5.153.231.19/32 93.94.130.161/32 ))'
-                       }
-                       @ferm::rule { 'dsa-postgres-bacula6':
-                               domain          => 'ip6',
-                               description     => 'Allow postgress access1',
-                               rule            => '&SERVICE_RANGE(tcp, 5437, ( 2001:41c8:1000:21::21:19/128 2a02:158:380:280::161/128 ))'
-                       }
-
-                       @ferm::rule { 'dsa-postgres-backup':
-                               description     => 'Allow postgress access',
-                               rule            => '&SERVICE_RANGE(tcp, (5435 5436 5440), ( $HOST_PGBACKUPHOST_V4 ))'
-                       }
-                       @ferm::rule { 'dsa-postgres-backup6':
-                               domain          => 'ip6',
-                               description     => 'Allow postgress access',
-                               rule            => '&SERVICE_RANGE(tcp, (5435 5436 5440), ( $HOST_PGBACKUPHOST_V6 ))'
-                       }
-
-                       @ferm::rule { 'dsa-postgres-dedup':
-                               # ubc, wuit
-                               description     => 'Allow postgress access',
-                               rule            => '&SERVICE_RANGE(tcp, (5439), ( 5.153.231.17/32 ))'
-                       }
-                       @ferm::rule { 'dsa-postgres-dedup6':
-                               domain          => 'ip6',
-                               description     => 'Allow postgress access',
-                               rule            => '&SERVICE_RANGE(tcp, (5439), ( 2001:41c8:1000:21::21:17/128 ))'
-                       }
-
-                       @ferm::rule { 'dsa-postgres-debsources':
-                               description     => 'Allow postgress access',
-                               rule            => '&SERVICE_RANGE(tcp, (5440), ( 5.153.231.38/32 ))'
-                       }
-                       @ferm::rule { 'dsa-postgres-debsources6':
-                               domain          => 'ip6',
-                               description     => 'Allow postgress access',
-                               rule            => '&SERVICE_RANGE(tcp, (5440), ( 2001:41c8:1000:21::21:38/128 ))'
+                       ferm::rule { 'dsa-postgres-main':
+                               description     => 'Allow postgress access to cluster: main',
+                               domain          => '(ip ip6)',
+                               rule            => @("EOF"/$)
+                                       &SERVICE_RANGE(tcp, 5435, (
+                                               ${ join(getfromhash($deprecated::allnodeinfo, 'ticharich.debian.org', 'ipHostNumber'), " ") }
+                                               ${ join(getfromhash($deprecated::allnodeinfo, 'petrova.debian.org', 'ipHostNumber'), " ") }
+                                               ${ join(getfromhash($deprecated::allnodeinfo, 'ullmann.debian.org', 'ipHostNumber'), " ") }
+                                               ${ join(getfromhash($deprecated::allnodeinfo, 'wuiet.debian.org', 'ipHostNumber'), " ") }
+                                               ${ join(getfromhash($deprecated::allnodeinfo, 'quantz.debian.org', 'ipHostNumber'), " ") }
+                                               ${ join(getfromhash($deprecated::allnodeinfo, 'respighi.debian.org', 'ipHostNumber'), " ") }
+                                               ${ join(getfromhash($deprecated::allnodeinfo, 'rusca.debian.org', 'ipHostNumber'), " ") }
+                                               ${ join(getfromhash($deprecated::allnodeinfo, 'tate.debian.org', 'ipHostNumber'), " ") }
+                                               \$HOST_PGBACKUPHOST
+                                       ))
+                                       | EOF
+                       }
+                       ferm::rule { 'dsa-postgres-dak':
+                               description     => 'Allow postgress access to cluster: dak',
+                               domain          => '(ip ip6)',
+                               rule            => @("EOF"/$)
+                                       &SERVICE_RANGE(tcp, 5434, (
+                                               ${ join(getfromhash($deprecated::allnodeinfo, 'coccia.debian.org', 'ipHostNumber'), " ") }
+                                               ${ join(getfromhash($deprecated::allnodeinfo, 'quantz.debian.org', 'ipHostNumber'), " ") }
+                                               ${ join(getfromhash($deprecated::allnodeinfo, 'nono.debian.org', 'ipHostNumber'), " ") }
+                                               ${ join(getfromhash($deprecated::allnodeinfo, 'wuiet.debian.org', 'ipHostNumber'), " ") }
+                                               ${ join(getfromhash($deprecated::allnodeinfo, 'respighi.debian.org', 'ipHostNumber'), " ") }
+                                               ${ join(getfromhash($deprecated::allnodeinfo, 'usper.debian.org', 'ipHostNumber'), " ") }
+                                               ${ join(getfromhash($deprecated::allnodeinfo, 'ullmann.debian.org', 'ipHostNumber'), " ") }
+                                       ))
+                                       | EOF
+                       }
+                       ferm::rule { 'dsa-postgres-wannabuild':
+                               description     => 'Allow postgress access to cluster: wannabuild',
+                               domain          => '(ip ip6)',
+                               rule            => @("EOF"/$)
+                                       &SERVICE_RANGE(tcp, 5436, (
+                                               ${ join(getfromhash($deprecated::allnodeinfo, 'respighi.debian.org', 'ipHostNumber'), " ") }
+                                               ${ join(getfromhash($deprecated::allnodeinfo, 'wuiet.debian.org', 'ipHostNumber'), " ") }
+                                               ${ join(getfromhash($deprecated::allnodeinfo, 'ullmann.debian.org', 'ipHostNumber'), " ") }
+                                               \$HOST_PGBACKUPHOST
+                                       ))
+                                       | EOF
+                       }
+                       ferm::rule { 'dsa-postgres-bacula':
+                               description     => 'Allow postgress access to cluster: bacula',
+                               domain          => '(ip ip6)',
+                               rule            => @("EOF"/$)
+                                       &SERVICE_RANGE(tcp, 5437, (
+                                               ${ join(getfromhash($deprecated::allnodeinfo, 'dinis.debian.org', 'ipHostNumber'), " ") }
+                                               ${ join(getfromhash($deprecated::allnodeinfo, 'storace.debian.org', 'ipHostNumber'), " ") }
+                                               \$HOST_PGBACKUPHOST
+                                       ))
+                                       | EOF
+                       }
+                       ferm::rule { 'dsa-postgres-dedup':
+                               description     => 'Allow postgress access to cluster: dedup',
+                               domain          => '(ip ip6)',
+                               rule            => @("EOF"/$)
+                                       &SERVICE_RANGE(tcp, 5439, (
+                                               ${ join(getfromhash($deprecated::allnodeinfo, 'delfin.debian.org', 'ipHostNumber'), " ") }
+                                       ))
+                                       | EOF
+                       }
+                       ferm::rule { 'dsa-postgres-debsources':
+                               description     => 'Allow postgress access to cluster: debsources',
+                               domain          => '(ip ip6)',
+                               rule            => @("EOF"/$)
+                                       &SERVICE_RANGE(tcp, 5440, (
+                                               ${ join(getfromhash($deprecated::allnodeinfo, 'sor.debian.org', 'ipHostNumber'), " ") }
+                                               \$HOST_PGBACKUPHOST
+                                       ))
+                                       | EOF
                        }
                }
                danzi: {
-                       @ferm::rule { 'dsa-postgres-danzi':
-                               # ubc, wuit
+                       ferm::rule { 'dsa-postgres-danzi':
+                               # ubc, wuiet
                                description     => 'Allow postgress access',
                                rule            => '&SERVICE_RANGE(tcp, 5433, ( 206.12.19.0/24 209.87.16.0/24 5.153.231.18/32 ))'
                        }
-                       @ferm::rule { 'dsa-postgres-danzi6':
+                       ferm::rule { 'dsa-postgres-danzi6':
                                domain          => 'ip6',
                                description     => 'Allow postgress access',
                                rule            => '&SERVICE_RANGE(tcp, 5433, ( 2607:f8f0:610:4000::/64 2607:f8f0:614:1::/64 2001:41c8:1000:21::21:18/128 ))'
                        }
 
-                       @ferm::rule { 'dsa-postgres2-danzi':
+                       ferm::rule { 'dsa-postgres2-danzi':
                                description     => 'Allow postgress access2',
-                               rule            => '&SERVICE_RANGE(tcp, 5437, ( 206.12.19.0/24 209.87.16.0/24 ))'
-                       }
-                       @ferm::rule { 'dsa-postgres3-danzi':
-                               description     => 'Allow postgress access3',
-                               rule            => '&SERVICE_RANGE(tcp, 5436, ( 206.12.19.0/24 209.87.16.0/24 ))'
-                       }
-                       @ferm::rule { 'dsa-postgres4-danzi':
-                               description     => 'Allow postgress access4',
-                               rule            => '&SERVICE_RANGE(tcp, 5438, ( 206.12.19.0/24 209.87.16.0/24 ))'
-                       }
-
-                       @ferm::rule { 'dsa-postgres-backup':
-                               description     => 'Allow postgress access',
-                               rule            => '&SERVICE_RANGE(tcp, 5433, ( $HOST_PGBACKUPHOST_V4 ))'
+                               rule            => '&SERVICE_RANGE(tcp, 5434, ( 209.87.16.0/24 ))'
                        }
-                       @ferm::rule { 'dsa-postgres-backup6':
-                               domain          => 'ip6',
-                               description     => 'Allow postgress access',
-                               rule            => '&SERVICE_RANGE(tcp, 5433, ( $HOST_PGBACKUPHOST_V6 ))'
+                       ferm::rule { 'dsa-postgres2-danzi6':
+                               domain          => 'ip6',
+                               description     => 'Allow postgress access2',
+                               rule            => '&SERVICE_RANGE(tcp, 5434, ( 2607:f8f0:614:1::/64 ))'
                        }
                }
                seger: {
-                       @ferm::rule { 'dsa-postgres-backup':
+                       ferm::rule { 'dsa-postgres-backup':
                                description     => 'Allow postgress access',
                                rule            => '&SERVICE_RANGE(tcp, 5432, ( $HOST_PGBACKUPHOST_V4 ))'
                        }
-                       @ferm::rule { 'dsa-postgres-backup6':
+                       ferm::rule { 'dsa-postgres-backup6':
                                domain          => 'ip6',
                                description     => 'Allow postgress access',
                                rule            => '&SERVICE_RANGE(tcp, 5432, ( $HOST_PGBACKUPHOST_V6 ))'
                        }
                }
-               sibelius: {
-                       @ferm::rule { 'dsa-postgres-backup':
-                               description     => 'Allow postgress access',
-                               rule            => '&SERVICE_RANGE(tcp, 5433, ( $HOST_PGBACKUPHOST_V4 ))'
-                       }
-                       @ferm::rule { 'dsa-postgres-backup6':
-                               domain          => 'ip6',
+               sallinen: {
+                       ferm::rule { 'dsa-postgres':
                                description     => 'Allow postgress access',
-                               rule            => '&SERVICE_RANGE(tcp, 5433, ( $HOST_PGBACKUPHOST_V6 ))'
-                       }
-                       @ferm::rule { 'dsa-postgres-replication':
-                               description     => 'Allow postgress access',
-                               rule            => '&SERVICE_RANGE(tcp, 5433, ( 185.17.185.187/32 ))'
-                       }
-                       @ferm::rule { 'dsa-postgres-replication6':
-                               domain          => 'ip6',
-                               description     => 'Allow postgress access',
-                               rule            => '&SERVICE_RANGE(tcp, 5433, ( 2001:1af8:4020:b030:deb::187/128 ))'
+                               domain          => '(ip ip6)',
+                               rule            => @("EOF"/$)
+                                       &SERVICE_RANGE(tcp, 5473, (
+                                               ${ join(getfromhash($deprecated::allnodeinfo, 'lw07.debian.org', 'ipHostNumber'), " ") }
+                                               ${ join(getfromhash($deprecated::allnodeinfo, 'snapshotdb-manda-01.debian.org', 'ipHostNumber'), " ") }
+                                               \$HOST_PGBACKUPHOST
+                                       ))
+                                       | EOF
                        }
                }
                lw07: {
-                       @ferm::rule { 'dsa-postgres-snapshot':
+                       ferm::rule { 'dsa-postgres-snapshot':
                                description     => 'Allow postgress access',
                                rule            => '&SERVICE_RANGE(tcp, 5439, ( 185.17.185.176/28 ))'
                        }
-                       @ferm::rule { 'dsa-postgres-snapshot6':
+                       ferm::rule { 'dsa-postgres-snapshot6':
                                domain          => 'ip6',
                                description     => 'Allow postgress access',
                                rule            => '&SERVICE_RANGE(tcp, 5439, ( 2001:1af8:4020:b030::/64 ))'
                        }
                }
-               melartin,vittoria: {
-                       @ferm::rule { 'dsa-postgres-backup':
-                               description     => 'Allow postgress access',
-                               rule            => '&SERVICE_RANGE(tcp, 5432, ( $HOST_PGBACKUPHOST_V4 ))'
-                       }
-                       @ferm::rule { 'dsa-postgres-backup6':
-                               domain          => 'ip6',
-                               description     => 'Allow postgress access',
-                               rule            => '&SERVICE_RANGE(tcp, 5432, ( $HOST_PGBACKUPHOST_V6 ))'
-                       }
-               }
-               buxtehude: {
-                       @ferm::rule { 'dsa-postgres-backup':
-                               description     => 'Allow postgress access',
-                               rule            => '&SERVICE_RANGE(tcp, (5433 5441), ( $HOST_PGBACKUPHOST_V4 ))'
-                       }
-                       @ferm::rule { 'dsa-postgres-backup6':
-                               domain          => 'ip6',
-                               description     => 'Allow postgress access',
-                               rule            => '&SERVICE_RANGE(tcp, (5433 5441), ( $HOST_PGBACKUPHOST_V6 ))'
+               snapshotdb-manda-01: {
+                       ferm::rule { 'dsa-postgres-snapshot':
+                               domain          => '(ip ip6)',
+                               description     => 'Allow postgress access from leaseweb (lw07 and friends)',
+                               rule            => '&SERVICE_RANGE(tcp, 5442, ( 185.17.185.176/28 2001:1af8:4020:b030::/64 ))'
                        }
                }
                default: {}
@@ -372,11 +263,11 @@ class ferm::per_host {
        # vpn fu
        case $::hostname {
                draghi: {
-                       @ferm::rule { 'dsa-vpn':
+                       ferm::rule { 'dsa-vpn':
                                description     => 'Allow openvpn access',
                                rule            => '&SERVICE(udp, 17257)'
                        }
-                       @ferm::rule { 'dsa-routing':
+                       ferm::rule { 'dsa-routing':
                                description     => 'forward chain',
                                chain           => 'FORWARD',
                                rule            => 'policy ACCEPT;
@@ -385,35 +276,41 @@ interface tun+ ACCEPT;
 REJECT reject-with icmp-admin-prohibited
 '
                        }
-                       @ferm::rule { 'dsa-vpn-mark':
+                       ferm::rule { 'dsa-vpn-mark':
                                table           => 'mangle',
                                chain           => 'PREROUTING',
                                rule            => 'interface tun+ MARK set-mark 1',
                        }
-                       @ferm::rule { 'dsa-vpn-nat':
+                       ferm::rule { 'dsa-vpn-nat':
                                table           => 'nat',
                                chain           => 'POSTROUTING',
                                rule            => 'outerface !tun+ mod mark mark 1 MASQUERADE',
                        }
                }
                ubc-enc2bl01,ubc-enc2bl02,ubc-enc2bl09,ubc-enc2bl10: {
-                       @ferm::rule { 'dsa-luca-fixme':
-                               description     => 'Allow ssh access from mnt and vpn networks',
+                       ferm::rule { 'dsa-ssh-priv':
+                               description     => 'Allow ssh access',
                                rule            => '&SERVICE_RANGE(tcp, 22, ( 172.29.40.0/22 172.29.203.0/24 ))',
                        }
                }
+               ubc-node-arm01,ubc-node-arm02,ubc-node-arm03: {
+                       ferm::rule { 'dsa-ssh-priv':
+                               description     => 'Allow ssh access',
+                               rule            => '&SERVICE_RANGE(tcp, 22, ( 172.29.43.240 ))',
+                       }
+               }
                default: {}
        }
        # tftp
        case $::hostname {
                abel: {
-                       @ferm::rule { 'dsa-tftp':
+                       ferm::rule { 'dsa-tftp':
                                description     => 'Allow tftp access',
                                rule            => '&SERVICE_RANGE(udp, 69, ( 172.28.17.0/24 ))'
                        }
                }
                master: {
-                       @ferm::rule { 'dsa-tftp':
+                       ferm::rule { 'dsa-tftp':
                                description     => 'Allow tftp access',
                                rule            => '&SERVICE_RANGE(udp, 69, ( 82.195.75.64/26 192.168.43.0/24 ))'
                        }