X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Fmanifests%2Fper_host.pp;h=10b99f8c9f5281cddb83a8b859da23963ee76d6f;hb=6849c0d133f88df75366cf25a663e52409eac389;hp=d139e87d29af023713e7bbe44067e1e71403a56e;hpb=9a69220cc9cf9388a8336e0c4fd65489e8933367;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/manifests/per_host.pp b/modules/ferm/manifests/per_host.pp
index d139e87d2..10b99f8c9 100644
--- a/modules/ferm/manifests/per_host.pp
+++ b/modules/ferm/manifests/per_host.pp
@@ -1,8 +1,4 @@
 class ferm::per_host {
-  if $::hostname in [zandonai,zelenka] {
-    include ferm::zivit
-  }
-
   if (getfromhash($deprecated::nodeinfo, 'hoster', 'name') == 'aql') {
     include ferm::aql
   }
@@ -130,7 +126,6 @@ class ferm::per_host {
             ${ join(getfromhash($deprecated::allnodeinfo, 'wuiet.debian.org', 'ipHostNumber'), " ") }
             ${ join(getfromhash($deprecated::allnodeinfo, 'quantz.debian.org', 'ipHostNumber'), " ") }
             ${ join(getfromhash($deprecated::allnodeinfo, 'respighi.debian.org', 'ipHostNumber'), " ") }
-            ${ join(getfromhash($deprecated::allnodeinfo, 'rusca.debian.org', 'ipHostNumber'), " ") }
             ${ join(getfromhash($deprecated::allnodeinfo, 'tate.debian.org', 'ipHostNumber'), " ") }
             \$HOST_PGBACKUPHOST
           ))
@@ -183,25 +178,31 @@ class ferm::per_host {
       }
     }
     danzi: {
-      ferm::rule { 'dsa-postgres-danzi':
-        # ubc, wuiet
-        description => 'Allow postgress access',
-        rule        => '&SERVICE_RANGE(tcp, 5433, ( 206.12.19.0/24 209.87.16.0/24 5.153.231.18/32 ))'
-      }
-      ferm::rule { 'dsa-postgres-danzi6':
-        domain      => 'ip6',
-        description => 'Allow postgress access',
-        rule        => '&SERVICE_RANGE(tcp, 5433, ( 2607:f8f0:610:4000::/64 2607:f8f0:614:1::/64 2001:41c8:1000:21::21:18/128 ))'
+      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'), " ") }
+            \$HOST_PGBACKUPHOST
+          ))
+          | EOF
       }
-
-      ferm::rule { 'dsa-postgres2-danzi':
-        description => 'Allow postgress access2',
-        rule        => '&SERVICE_RANGE(tcp, 5434, ( 209.87.16.0/24 ))'
+      ferm::rule { 'dsa-postgres-main':
+        # ubc, wuiet
+        description => 'Allow postgress access to cluster: main',
+        domain      => '(ip ip6)',
+        rule        => '&SERVICE_RANGE(tcp, 5433, ( 209.87.16.0/24 2607:f8f0:614:1::/64 ))'
       }
-      ferm::rule { 'dsa-postgres2-danzi6':
-        domain      => 'ip6',
-        description => 'Allow postgress access2',
-        rule        => '&SERVICE_RANGE(tcp, 5434, ( 2607:f8f0:614:1::/64 ))'
+      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'), " ") }
+            \$HOST_PGBACKUPHOST
+          ))
+          | EOF
       }
       ferm::rule { 'dsa-postgres-wannabuild':
         description => 'Allow postgress access to cluster: wannabuild',