projects / mirror / dsa-puppet.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
fix munin 1
[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 dd76d4d..7db3c2d 100644 (file)
--- a/modules/ferm/manifests/per-host.pp
+++ b/modules/ferm/manifests/per-host.pp
@@ -3,127 +3,6 @@ class ferm::per-host {
                include ferm::zivit
        }
 
-       if $::hostname in [glinka,gretchaninov] {
-               ferm::rule { 'dsa-rsync':
-                       domain      => '(ip ip6)',
-                       description => 'Allow rsync access',
-                       rule        => '&SERVICE(tcp, 873)'
-               }
-       }
-
-       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':
@@ -284,8 +163,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)',
@@ -314,27 +193,6 @@ class ferm::per-host {
                                rule            => '&SERVICE_RANGE(tcp, 5433, ( $HOST_PGBACKUPHOST_V6 ))'
                        }
                }
-               franck: {
-                       @ferm::rule { 'dsa-postgres-franck':
-                               description     => 'Allow postgress access',
-                               rule            => '&SERVICE_RANGE(tcp, 5433, ( 5.153.231.10/32 ))'
-                       }
-                       @ferm::rule { 'dsa-postgres-franck6':
-                               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 ))'
-                       }
-               }
                bmdb1: {
                        @ferm::rule { 'dsa-postgres-main':
                                description     => 'Allow postgress access',
@@ -355,9 +213,9 @@ 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 209.87.16.38/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',
@@ -376,14 +234,13 @@ class ferm::per-host {
                        }
 
                        @ferm::rule { 'dsa-postgres-backup':
-                               # ubc, wuit
                                description     => 'Allow postgress access',
-                               rule            => '&SERVICE_RANGE(tcp, (5435 5436), ( $HOST_PGBACKUPHOST_V4 ))'
+                               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), ( $HOST_PGBACKUPHOST_V6 ))'
+                               rule            => '&SERVICE_RANGE(tcp, (5435 5436 5440), ( $HOST_PGBACKUPHOST_V6 ))'
                        }
 
                        @ferm::rule { 'dsa-postgres-dedup':
@@ -484,7 +341,7 @@ class ferm::per-host {
                                rule            => '&SERVICE_RANGE(tcp, 5439, ( 2001:1af8:4020:b030::/64 ))'
                        }
                }
-               vittoria: {
+               melartin,vittoria: {
                        @ferm::rule { 'dsa-postgres-backup':
                                description     => 'Allow postgress access',
                                rule            => '&SERVICE_RANGE(tcp, 5432, ( $HOST_PGBACKUPHOST_V4 ))'
@@ -495,6 +352,17 @@ class ferm::per-host {
                                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 ))'
+                       }
+               }
                default: {}
        }
        # vpn fu
Unnamed repository; edit this file 'description' to name the repository.