stop using virtual resources for ferm::rule

[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 ee1a665..79dce40 100644 (file)
--- a/modules/ferm/manifests/per_host.pp
+++ b/modules/ferm/manifests/per_host.pp
@@ -9,37 +9,37 @@ class ferm::per_host {
 
        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 ))'
                        }
                }
                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)'
@@ -50,10 +50,10 @@ class ferm::per_host {
 
        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-bind-notrack-in':
+                       ferm::rule { 'dsa-bind-notrack-in':
                                domain      => 'ip',
                                description => 'NOTRACK for nameserver traffic',
                                table       => 'raw',
@@ -61,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',
@@ -69,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',
@@ -77,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',
@@ -91,7 +91,7 @@ class ferm::per_host {
        # postgres stuff
        case $::hostname {
                ullmann: {
-                       @ferm::rule { 'dsa-postgres-udd':
+                       ferm::rule { 'dsa-postgres-udd':
                                description     => 'Allow postgress access',
                                domain          => '(ip ip6)',
                                # quantz, master, coccia
@@ -107,7 +107,7 @@ class ferm::per_host {
                        }
                }
                fasolo: {
-                       @ferm::rule { 'dsa-postgres':
+                       ferm::rule { 'dsa-postgres':
                                description     => 'Allow postgress access',
                                domain          => '(ip ip6)',
                                rule            => @("EOF"/$)
@@ -119,7 +119,7 @@ class ferm::per_host {
                        }
                }
                bmdb1: {
-                       @ferm::rule { 'dsa-postgres-main':
+                       ferm::rule { 'dsa-postgres-main':
                                description     => 'Allow postgress access to cluster: main',
                                domain          => '(ip ip6)',
                                rule            => @("EOF"/$)
@@ -136,7 +136,7 @@ class ferm::per_host {
                                        ))
                                        | EOF
                        }
-                       @ferm::rule { 'dsa-postgres-dak':
+                       ferm::rule { 'dsa-postgres-dak':
                                description     => 'Allow postgress access to cluster: dak',
                                domain          => '(ip ip6)',
                                rule            => @("EOF"/$)
@@ -151,7 +151,7 @@ class ferm::per_host {
                                        ))
                                        | EOF
                        }
-                       @ferm::rule { 'dsa-postgres-wannabuild':
+                       ferm::rule { 'dsa-postgres-wannabuild':
                                description     => 'Allow postgress access to cluster: wannabuild',
                                domain          => '(ip ip6)',
                                rule            => @("EOF"/$)
@@ -163,7 +163,7 @@ class ferm::per_host {
                                        ))
                                        | EOF
                        }
-                       @ferm::rule { 'dsa-postgres-bacula':
+                       ferm::rule { 'dsa-postgres-bacula':
                                description     => 'Allow postgress access to cluster: bacula',
                                domain          => '(ip ip6)',
                                rule            => @("EOF"/$)
@@ -174,7 +174,7 @@ class ferm::per_host {
                                        ))
                                        | EOF
                        }
-                       @ferm::rule { 'dsa-postgres-dedup':
+                       ferm::rule { 'dsa-postgres-dedup':
                                description     => 'Allow postgress access to cluster: dedup',
                                domain          => '(ip ip6)',
                                rule            => @("EOF"/$)
@@ -183,7 +183,7 @@ class ferm::per_host {
                                        ))
                                        | EOF
                        }
-                       @ferm::rule { 'dsa-postgres-debsources':
+                       ferm::rule { 'dsa-postgres-debsources':
                                description     => 'Allow postgress access to cluster: debsources',
                                domain          => '(ip ip6)',
                                rule            => @("EOF"/$)
@@ -195,40 +195,40 @@ class ferm::per_host {
                        }
                }
                danzi: {
-                       @ferm::rule { 'dsa-postgres-danzi':
+                       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, 5434, ( 209.87.16.0/24 ))'
                        }
-                       @ferm::rule { 'dsa-postgres2-danzi6':
+                       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 ))'
                        }
                }
                sallinen: {
-                       @ferm::rule { 'dsa-postgres':
+                       ferm::rule { 'dsa-postgres':
                                description     => 'Allow postgress access',
                                domain          => '(ip ip6)',
                                rule            => @("EOF"/$)
@@ -241,18 +241,18 @@ class ferm::per_host {
                        }
                }
                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 ))'
                        }
                }
                snapshotdb-manda-01: {
-                       @ferm::rule { 'dsa-postgres-snapshot':
+                       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 ))'
@@ -263,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;
@@ -276,25 +276,25 @@ 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-ssh-priv':
+                       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':
+                       ferm::rule { 'dsa-ssh-priv':
                                description     => 'Allow ssh access',
                                rule            => '&SERVICE_RANGE(tcp, 22, ( 172.29.43.240 ))',
                        }
@@ -304,13 +304,13 @@ REJECT reject-with icmp-admin-prohibited
        # 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 ))'
                        }