retire paganini (RT#4407)

[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 7d257771ec3a79098a2c29f3876217824bb8083a..6f8b41860120b2259df03c253b7204fe5b1729c5 100644 (file)
--- a/modules/ferm/manifests/per-host.pp
+++ b/modules/ferm/manifests/per-host.pp
@@ -38,16 +38,6 @@ class ferm::per-host {
                                rule            => '&SERVICE(udp, 69)'
                        }
                }
-               #paganini: {
-               #       @ferm::rule { 'dsa-dhcp':
-               #               description     => 'Allow dhcp access',
-               #               rule            => '&SERVICE(udp, 67)'
-               #       }
-               #       @ferm::rule { 'dsa-tftp':
-               #               description     => 'Allow tftp access',
-               #               rule            => '&SERVICE(udp, 69)'
-               #       }
-               #}
                lotti,lully: {
                        @ferm::rule { 'dsa-syslog':
                                description     => 'Allow syslog access',
@@ -233,6 +223,16 @@ class ferm::per-host {
                                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, ( 5.153.231.12/32 ))'
+                       }
+                       @ferm::rule { 'dsa-postgres-backup6':
+                               domain          => 'ip6',
+                               description     => 'Allow postgress access',
+                               rule            => '&SERVICE_RANGE(tcp, 5433, ( 2001:41c8:1000:21::21:12/128 ))'
+                       }
                }
                bmdb1: {
                        @ferm::rule { 'dsa-postgres-main':
@@ -273,6 +273,17 @@ class ferm::per-host {
                                description     => 'Allow postgress access1',
                                rule            => '&SERVICE_RANGE(tcp, 5437, ( 2001:41c8:1000:21::21:19/128 ))'
                        }
+
+                       @ferm::rule { 'dsa-postgres-backup':
+                               # ubc, wuit
+                               description     => 'Allow postgress access',
+                               rule            => '&SERVICE_RANGE(tcp, (5435 5436), ( 5.153.231.12/32 ))'
+                       }
+                       @ferm::rule { 'dsa-postgres-backup6':
+                               domain          => 'ip6',
+                               description     => 'Allow postgress access',
+                               rule            => '&SERVICE_RANGE(tcp, (5435 5436), ( 2001:41c8:1000:21::21:12/128 ))'
+                       }
                }
                danzi: {
                        @ferm::rule { 'dsa-postgres-danzi':
@@ -299,6 +310,37 @@ class ferm::per-host {
                                rule            => '&SERVICE_RANGE(tcp, 5438, ( 206.12.19.0/24 ))'
                        }
 
+                       @ferm::rule { 'dsa-postgres-backup':
+                               description     => 'Allow postgress access',
+                               rule            => '&SERVICE_RANGE(tcp, 5433, ( 5.153.231.12/32 ))'
+                       }
+                       @ferm::rule { 'dsa-postgres-backup6':
+                               domain          => 'ip6',
+                               description     => 'Allow postgress access',
+                               rule            => '&SERVICE_RANGE(tcp, 5433, ( 2001:41c8:1000:21::21:12/128 ))'
+                       }
+               }
+               chopin: {
+                       @ferm::rule { 'dsa-postgres-backup':
+                               description     => 'Allow postgress access',
+                               rule            => '&SERVICE_RANGE(tcp, 5432, ( 5.153.231.12/32 ))'
+                       }
+                       @ferm::rule { 'dsa-postgres-backup6':
+                               domain          => 'ip6',
+                               description     => 'Allow postgress access',
+                               rule            => '&SERVICE_RANGE(tcp, 5432, ( 2001:41c8:1000:21::21:12/128 ))'
+                       }
+               }
+               sibelius: {
+                       @ferm::rule { 'dsa-postgres-backup':
+                               description     => 'Allow postgress access',
+                               rule            => '&SERVICE_RANGE(tcp, 5433, ( 5.153.231.12/32 ))'
+                       }
+                       @ferm::rule { 'dsa-postgres-backup6':
+                               domain          => 'ip6',
+                               description     => 'Allow postgress access',
+                               rule            => '&SERVICE_RANGE(tcp, 5433, ( 2001:41c8:1000:21::21:12/128 ))'
+                       }
                }
                default: {}
        }