remove manual firewall allow bmdb1->fasolo

[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 4a0fe13..a1cfe2b 100644 (file)
--- a/modules/ferm/manifests/per_host.pp
+++ b/modules/ferm/manifests/per_host.pp
@@ -102,17 +102,6 @@ class ferm::per_host {
           | EOF
       }
     }
-    fasolo: {
-      ferm::rule { 'dsa-postgres':
-        description => 'Allow postgress access',
-        domain      => '(ip ip6)',
-        rule        => @("EOF"/$)
-          &SERVICE_RANGE(tcp, 5433, (
-            ${ join(getfromhash($deprecated::allnodeinfo, 'bmdb1.debian.org', 'ipHostNumber'), " ") }
-          ))
-          | EOF
-      }
-    }
     bmdb1: {
       ferm::rule { 'dsa-postgres-main':
         description => 'Allow postgress access to cluster: main',
@@ -143,16 +132,6 @@ class ferm::per_host {
           ))
           | EOF
       }
-      ferm::rule { 'dsa-postgres-debsources':
-        description => 'Allow postgress access to cluster: debsources',
-        domain      => '(ip ip6)',
-        rule        => @("EOF"/$)
-          &SERVICE_RANGE(tcp, 5440, (
-            ${ join(getfromhash($deprecated::allnodeinfo, 'sor.debian.org', 'ipHostNumber'), " ") }
-            \$HOST_PGBACKUPHOST
-          ))
-          | EOF
-      }
     }
     danzi: {
       ferm::rule { 'dsa-postgres-tracker':
@@ -196,41 +175,17 @@ class ferm::per_host {
           | EOF
       }
     }
-    postgresql-manda-01: {
-      ferm::rule { 'dsa-postgres-bacula':
-        description => 'Allow postgress access to cluster: bacula',
-        domain      => '(ip ip6)',
-        rule        => @("EOF"/$)
-          &SERVICE_RANGE(tcp, 5432, (
-            ${ join(getfromhash($deprecated::allnodeinfo, 'dinis.debian.org', 'ipHostNumber'), " ") }
-            ${ join(getfromhash($deprecated::allnodeinfo, 'storace.debian.org', 'ipHostNumber'), " ") }
-          ))
-          | EOF
-      }
-    }
     sallinen: {
       ferm::rule { 'dsa-postgres':
         description => 'Allow postgress access',
         domain      => '(ip ip6)',
         rule        => @("EOF"/$)
           &SERVICE_RANGE(tcp, 5473, (
-            ${ join(getfromhash($deprecated::allnodeinfo, 'lw07.debian.org', 'ipHostNumber'), " ") }
             ${ join(getfromhash($deprecated::allnodeinfo, 'snapshotdb-manda-01.debian.org', 'ipHostNumber'), " ") }
           ))
           | EOF
       }
     }
-    lw07: {
-      ferm::rule { 'dsa-postgres-snapshot':
-        description => 'Allow postgress access',
-        rule        => '&SERVICE_RANGE(tcp, 5439, ( 185.17.185.176/28 ))'
-      }
-      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':
         domain      => '(ip ip6)',