ganeti2.ubc.debian.org is born

[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 ba0f52b..b9ad487 100644 (file)
--- a/modules/ferm/manifests/per-host.pp
+++ b/modules/ferm/manifests/per-host.pp
@@ -473,10 +473,6 @@ class ferm::per-host {
                                description     => 'Allow postgress access',
                                rule            => '&SERVICE_RANGE(tcp, 5432, ( $HOST_PGBACKUPHOST_V6 ))'
                        }
-                       @ferm::rule { 'dc16-postgres':
-                               description     => 'Allow postgres access',
-                               rule            => '&SERVICE_RANGE(tcp, 5332, ( 137.158.82.4/31 ))'
-                       }
                }
                default: {}
        }
@@ -507,6 +503,12 @@ REJECT reject-with icmp-admin-prohibited
                                rule            => 'outerface !tun+ mod mark mark 1 MASQUERADE',
                        }
                }
+               ubc-enc2bl1,ubc-enc2bl2,ubc-enc2bl9,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 ))',
+                       }
+               }
                default: {}
        }
        # tftp