projects / mirror / dsa-puppet.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
retire oyens
[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 cc67dfb..c2954c8 100644 (file)
--- a/modules/ferm/manifests/per-host.pp
+++ b/modules/ferm/manifests/per-host.pp
@@ -3,7 +3,7 @@ class ferm::per-host {
                include ferm::zivit
        }
 
-       if $::hostname in [glinka] {
+       if $::hostname in [glinka,gretchaninov] {
                ferm::rule { 'dsa-rsync':
                        domain      => '(ip ip6)',
                        description => 'Allow rsync access',
@@ -11,119 +11,6 @@ class ferm::per-host {
                }
        }
 
-       case $::hostname {
-               bm-bl9: {
-                       @ferm::rule { 'dsa-iscsi':
-                               description     => 'Allow iscsi access',
-                               rule            => '&SERVICE_RANGE(tcp, 3260, ( 5.153.231.240/27 172.29.123.0/24 ))'
-                       }
-               }
-               oyens: {
-                       @ferm::rule { 'dsa-spice':
-                               description     => 'Allow spice-console access',
-                               rule            => '&SERVICE(tcp, 6082)'
-                       }
-                       @ferm::rule { 'dsa-memcache':
-                               description     => 'Allow memcache access',
-                               rule            => '&SERVICE_RANGE(tcp, 11211, ( 5.153.231.240/27 172.29.123.0/24 ))'
-                       }
-                       @ferm::rule { 'dsa-memcache6':
-                               domain          => 'ip6',
-                               description     => 'Allow memcache access',
-                               rule            => '&SERVICE_RANGE(tcp, 11211, ( 2001:41c8:1000::/48 ))'
-                       }
-                       @ferm::rule { 'dsa-amqp':
-                               description     => 'Allow rabbitmq access',
-                               rule            => '&SERVICE_RANGE(tcp, 5672, ( 5.153.231.240/27 172.29.123.0/24 ))'
-                       }
-                       @ferm::rule { 'dsa-amqp6':
-                               domain          => 'ip6',
-                               description     => 'Allow rabbitmq access',
-                               rule            => '&SERVICE_RANGE(tcp, 5672, ( 2001:41c8:1000::/48 ))'
-                       }
-                       @ferm::rule { 'dsa-keystone':
-                               description     => 'Allow keystone access',
-                               rule            => '&SERVICE_RANGE(tcp, 5000, ( 5.153.231.240/27 172.29.123.0/24 ))'
-                       }
-                       @ferm::rule { 'dsa-keystone6':
-                               domain          => 'ip6',
-                               description     => 'Allow keystone access',
-                               rule            => '&SERVICE_RANGE(tcp, 5000, ( 2001:41c8:1000::/48 ))'
-                       }
-                       @ferm::rule { 'dsa-keystone-admin':
-                               description     => 'Allow keystone access',
-                               rule            => '&SERVICE_RANGE(tcp, 35357, ( 5.153.231.240/27 172.29.123.0/24 ))'
-                       }
-                       @ferm::rule { 'dsa-keystone-admin6':
-                               domain          => 'ip6',
-                               description     => 'Allow keystone access',
-                               rule            => '&SERVICE_RANGE(tcp, 35357, ( 2001:41c8:1000::/48 ))'
-                       }
-                       @ferm::rule { 'dsa-glance-api':
-                               description     => 'Allow glance access',
-                               rule            => '&SERVICE_RANGE(tcp, 9292, ( 5.153.231.240/27 172.29.123.0/24 ))'
-                       }
-                       @ferm::rule { 'dsa-glance-api6':
-                               domain          => 'ip6',
-                               description     => 'Allow glance access',
-                               rule            => '&SERVICE_RANGE(tcp, 9292, ( 2001:41c8:1000::/48 ))'
-                       }
-                       @ferm::rule { 'dsa-glance-registry':
-                               description     => 'Allow glance access',
-                               rule            => '&SERVICE_RANGE(tcp, 9191, ( 5.153.231.240/27 172.29.123.0/24 ))'
-                       }
-                       @ferm::rule { 'dsa-glance-registry6':
-                               domain          => 'ip6',
-                               description     => 'Allow glance access',
-                               rule            => '&SERVICE_RANGE(tcp, 9191, ( 2001:41c8:1000::/48 ))'
-                       }
-                       @ferm::rule { 'dsa-neutron':
-                               description     => 'Allow glance access',
-                               rule            => '&SERVICE_RANGE(tcp, 9696, ( 5.153.231.240/27 172.29.123.0/24 ))'
-                       }
-                       @ferm::rule { 'dsa-neutron6':
-                               domain          => 'ip6',
-                               description     => 'Allow glance access',
-                               rule            => '&SERVICE_RANGE(tcp, 9696, ( 2001:41c8:1000::/48 ))'
-                       }
-                       @ferm::rule { 'dsa-nova-ec2':
-                               description     => 'Allow nova access',
-                               rule            => '&SERVICE_RANGE(tcp, 8773, ( 5.153.231.240/27 172.29.123.0/24 ))'
-                       }
-                       @ferm::rule { 'dsa-nova-ec26':
-                               domain          => 'ip6',
-                               description     => 'Allow nova access',
-                               rule            => '&SERVICE_RANGE(tcp, 8773, ( 2001:41c8:1000::/48 ))'
-                       }
-                       @ferm::rule { 'dsa-nova2':
-                               description     => 'Allow nova access',
-                               rule            => '&SERVICE_RANGE(tcp, 8774, ( 5.153.231.240/27 172.29.123.0/24 ))'
-                       }
-                       @ferm::rule { 'dsa-nova26':
-                               domain          => 'ip6',
-                               description     => 'Allow nova access',
-                               rule            => '&SERVICE_RANGE(tcp, 8774, ( 2001:41c8:1000::/48 ))'
-                       }
-                       @ferm::rule { 'dsa-nova-metadata':
-                               description     => 'Allow nova access',
-                               rule            => '&SERVICE_RANGE(tcp, 8775, ( 5.153.231.240/27 172.29.123.0/24 ))'
-                       }
-                       @ferm::rule { 'dsa-nova-metadata6':
-                               domain          => 'ip6',
-                               description     => 'Allow nova access',
-                               rule            => '&SERVICE_RANGE(tcp, 8775, ( 2001:41c8:1000::/48 ))'
-                       }
-                       @ferm::rule { 'dsa-cinder':
-                               description     => 'Allow nova access',
-                               rule            => '&SERVICE_RANGE(tcp, 8776, ( 5.153.231.240/27 172.29.123.0/24 ))'
-                       }
-                       @ferm::rule { 'dsa-cinder6':
-                               domain          => 'ip6',
-                               description     => 'Allow nova access',
-                               rule            => '&SERVICE_RANGE(tcp, 8776, ( 2001:41c8:1000::/48 ))'
-                       }
-               }
-       }
        case $::hostname {
                czerny,clementi: {
                        @ferm::rule { 'dsa-upsmon':
@@ -190,7 +77,7 @@ class ferm::per-host {
                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 206.12.19.140 ))'
+                               rule         => '&SERVICE_RANGE(tcp, 1978, ( 140.211.166.26 209.87.16.39 ))'
                        }
                }
                default: {}
@@ -284,8 +171,8 @@ class ferm::per-host {
                ullmann: {
                        @ferm::rule { 'dsa-postgres-udd':
                                description     => 'Allow postgress access',
-                               # quantz, moszumanska, master, coccia, franck
-                               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 138.16.160.12/32 ))'
+                               # 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)',
@@ -293,12 +180,12 @@ class ferm::per-host {
                                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 ))'
                        }
                }
-               franck: {
-                       @ferm::rule { 'dsa-postgres-franck':
+               fasolo: {
+                       @ferm::rule { 'dsa-postgres-fasolo':
                                description     => 'Allow postgress access',
                                rule            => '&SERVICE_RANGE(tcp, 5433, ( 5.153.231.10/32 ))'
                        }
-                       @ferm::rule { 'dsa-postgres-franck6':
+                       @ferm::rule { 'dsa-postgres-fasolo6':
                                domain          => 'ip6',
                                description     => 'Allow postgress access',
                                rule            => '&SERVICE_RANGE(tcp, 5433, ( 2001:41c8:1000:21::21:10/128 ))'
@@ -317,16 +204,16 @@ class ferm::per-host {
                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 206.12.19.141/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 ))'
+                               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:610:4000:6564:a62:ce0c:138d/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 ))'
+                               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 ))'
+                               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',
@@ -334,14 +221,14 @@ class ferm::per-host {
                                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, franck
+                               # wuiet, ullmann
                                description     => 'Allow postgress access',
-                               rule            => '&SERVICE_RANGE(tcp, 5436, ( 5.153.231.18/32 206.12.19.141/32 138.16.160.12/32 ))'
+                               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:610:4000:6564:a62:ce0c:138d/128 ))'
+                               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
@@ -390,25 +277,25 @@ class ferm::per-host {
                        @ferm::rule { 'dsa-postgres-danzi':
                                # ubc, wuit
                                description     => 'Allow postgress access',
-                               rule            => '&SERVICE_RANGE(tcp, 5433, ( 206.12.19.0/24 5.153.231.18/32 ))'
+                               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':
                                domain          => 'ip6',
                                description     => 'Allow postgress access',
-                               rule            => '&SERVICE_RANGE(tcp, 5433, ( 2607:f8f0:610:4000::/64 2001:41c8:1000:21::21:18/128 ))'
+                               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':
                                description     => 'Allow postgress access2',
-                               rule            => '&SERVICE_RANGE(tcp, 5437, ( 206.12.19.0/24 ))'
+                               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 ))'
+                               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 ))'
+                               rule            => '&SERVICE_RANGE(tcp, 5438, ( 206.12.19.0/24 209.87.16.0/24 ))'
                        }
 
                        @ferm::rule { 'dsa-postgres-backup':
@@ -503,7 +390,7 @@ REJECT reject-with icmp-admin-prohibited
                                rule            => 'outerface !tun+ mod mark mark 1 MASQUERADE',
                        }
                }
-               ubc-enc2bl1,ubc-enc2bl2,ubc-enc2bl9,ubc-enc2bl10: {
+               ubc-enc2bl01,ubc-enc2bl02,ubc-enc2bl09,ubc-enc2bl10: {
                        @ferm::rule { 'dsa-luca-fixme':
                                description     => 'Allow ssh access from mnt and vpn networks',
                                rule            => '&SERVICE_RANGE(tcp, 22, ( 172.29.40.0/22 172.29.203.0/24 ))',
@@ -519,12 +406,6 @@ REJECT reject-with icmp-admin-prohibited
                                rule            => '&SERVICE_RANGE(udp, 69, ( 172.28.17.0/24 ))'
                        }
                }
-               jenko: {
-                       @ferm::rule { 'dsa-tftp':
-                               description     => 'Allow tftp access',
-                               rule            => '&SERVICE_RANGE(udp, 69, ( 192.168.2.0/24 206.12.19.0/24 ))'
-                       }
-               }
                master: {
                        @ferm::rule { 'dsa-tftp':
                                description     => 'Allow tftp access',
Unnamed repository; edit this file 'description' to name the repository.