X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Fmanifests%2Fper_host.pp;h=e04d66ff3684a9e04ef876304ab2aa0dabd3d323;hb=6f1ddb39c54970b5ca34a01fe6fce4a81c6ea12e;hp=5fd80d0e7ec8d02581fee16a3ea3cf2cddf4ee73;hpb=7b2364d71b9f5eddae1ea9bcf6185a5b9efee760;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/manifests/per_host.pp b/modules/ferm/manifests/per_host.pp
index 5fd80d0e7..e04d66ff3 100644
--- a/modules/ferm/manifests/per_host.pp
+++ b/modules/ferm/manifests/per_host.pp
@@ -133,59 +133,6 @@ class ferm::per_host {
           | EOF
       }
     }
-    danzi: {
-      ferm::rule { 'dsa-postgres-tracker':
-        description => 'Allow postgress access to cluster: tracker',
-        domain      => '(ip ip6)',
-        rule        => @("EOF"/$)
-          &SERVICE_RANGE(tcp, 5432, (
-            ${ join(getfromhash($deprecated::allnodeinfo, 'ticharich.debian.org', 'ipHostNumber'), " ") }
-          ))
-          | EOF
-      }
-      ferm::rule { 'dsa-postgres-main':
-        description => 'Allow postgress access to cluster: main',
-        domain      => '(ip ip6)',
-        rule        => @("EOF"/$)
-          &SERVICE_RANGE(tcp, 5433, (
-            ${ join(getfromhash($deprecated::allnodeinfo, 'diabelli.debian.org', 'ipHostNumber'), " ") }
-            ${ join(getfromhash($deprecated::allnodeinfo, 'nono.debian.org', 'ipHostNumber'), " ") }
-            ${ join(getfromhash($deprecated::allnodeinfo, 'reger.debian.org', 'ipHostNumber'), " ") }
-          ))
-          | EOF
-      }
-      ferm::rule { 'dsa-postgres-debconf':
-        description => 'Allow postgress access to cluster: debconf',
-        domain      => '(ip ip6)',
-        rule        => @("EOF"/$)
-          &SERVICE_RANGE(tcp, 5434, (
-            ${ join(getfromhash($deprecated::allnodeinfo, 'debussy.debian.org', 'ipHostNumber'), " ") }
-          ))
-          | EOF
-      }
-      ferm::rule { 'dsa-postgres-wannabuild':
-        description => 'Allow postgress access to cluster: wannabuild',
-        domain      => '(ip ip6)',
-        rule        => @("EOF"/$)
-          &SERVICE_RANGE(tcp, 5436, (
-            ${ join(getfromhash($deprecated::allnodeinfo, 'respighi.debian.org', 'ipHostNumber'), " ") }
-            ${ join(getfromhash($deprecated::allnodeinfo, 'wuiet.debian.org', 'ipHostNumber'), " ") }
-            ${ join(getfromhash($deprecated::allnodeinfo, 'ullmann.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, 'snapshotdb-manda-01.debian.org', 'ipHostNumber'), " ") }
-          ))
-          | EOF
-      }
-    }
     default: {}
   }
   # vpn fu