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

diff --git a/modules/ferm/manifests/per_host.pp b/modules/ferm/manifests/per_host.pp
index e04d66ff3..49c7baacf 100644
--- a/modules/ferm/manifests/per_host.pp
+++ b/modules/ferm/manifests/per_host.pp
@@ -10,37 +10,6 @@ class ferm::per_host {
         rule        => '&SERVICE_RANGE(tcp, 3493, ( 82.195.75.64/26 192.168.43.0/24 ))'
       }
     }
-    kaufmann: {
-      ferm::rule { 'dsa-hkp':
-        domain      => '(ip ip6)',
-        description => 'Allow hkp access',
-        rule        => '&SERVICE(tcp, 11371)'
-      }
-    }
-    gombert: {
-      ferm::rule { 'dsa-infinoted':
-        domain      => '(ip ip6)',
-        description => 'Allow infinoted access',
-        rule        => '&SERVICE(tcp, 6523)'
-      }
-    }
-    draghi: {
-      ferm::rule { 'dsa-finger':
-        domain      => '(ip ip6)',
-        description => 'Allow finger access',
-        rule        => '&SERVICE(tcp, 79)'
-      }
-      ferm::rule { 'dsa-ldap':
-        domain      => '(ip ip6)',
-        description => 'Allow ldap access',
-        rule        => '&SERVICE(tcp, 389)'
-      }
-      ferm::rule { 'dsa-ldaps':
-        domain      => '(ip ip6)',
-        description => 'Allow ldaps access',
-        rule        => '&SERVICE(tcp, 636)'
-      }
-    }
     default: {}
   }
 
@@ -84,57 +53,6 @@ class ferm::per_host {
     default: {}
   }
 
-  # postgres stuff
-  case $::hostname {
-    ullmann: {
-      ferm::rule { 'dsa-postgres-udd':
-        description => 'Allow postgress access',
-        domain      => '(ip ip6)',
-        # quantz, master, coccia
-        rule        => @("EOF")
-          &SERVICE_RANGE(tcp, 5452, (
-            ${ join(getfromhash($deprecated::allnodeinfo, 'quantz.debian.org', 'ipHostNumber'), " ") }
-            ${ join(getfromhash($deprecated::allnodeinfo, 'master.debian.org', 'ipHostNumber'), " ") }
-            ${ join(getfromhash($deprecated::allnodeinfo, 'coccia.debian.org', 'ipHostNumber'), " ") }
-            ${ join(getfromhash($deprecated::allnodeinfo, 'respighi.debian.org', 'ipHostNumber'), " ") }
-            ${ join(getfromhash($deprecated::allnodeinfo, 'wuiet.debian.org', 'ipHostNumber'), " ") }
-          ))
-          | EOF
-      }
-    }
-    bmdb1: {
-      ferm::rule { 'dsa-postgres-main':
-        description => 'Allow postgress access to cluster: main',
-        domain      => '(ip ip6)',
-        rule        => @("EOF"/$)
-          &SERVICE_RANGE(tcp, 5435, (
-            ${ join(getfromhash($deprecated::allnodeinfo, 'petrova.debian.org', 'ipHostNumber'), " ") }
-            ${ join(getfromhash($deprecated::allnodeinfo, 'ullmann.debian.org', 'ipHostNumber'), " ") }
-            ${ 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, 'tate.debian.org', 'ipHostNumber'), " ") }
-          ))
-          | EOF
-      }
-      ferm::rule { 'dsa-postgres-dak':
-        description => 'Allow postgress access to cluster: dak',
-        domain      => '(ip ip6)',
-        rule        => @("EOF"/$)
-          &SERVICE_RANGE(tcp, 5434, (
-            ${ join(getfromhash($deprecated::allnodeinfo, 'coccia.debian.org', 'ipHostNumber'), " ") }
-            ${ join(getfromhash($deprecated::allnodeinfo, 'quantz.debian.org', 'ipHostNumber'), " ") }
-            ${ join(getfromhash($deprecated::allnodeinfo, 'nono.debian.org', 'ipHostNumber'), " ") }
-            ${ join(getfromhash($deprecated::allnodeinfo, 'wuiet.debian.org', 'ipHostNumber'), " ") }
-            ${ join(getfromhash($deprecated::allnodeinfo, 'respighi.debian.org', 'ipHostNumber'), " ") }
-            ${ join(getfromhash($deprecated::allnodeinfo, 'usper.debian.org', 'ipHostNumber'), " ") }
-            ${ join(getfromhash($deprecated::allnodeinfo, 'ullmann.debian.org', 'ipHostNumber'), " ") }
-          ))
-          | EOF
-      }
-    }
-    default: {}
-  }
   # vpn fu
   case $::hostname {
     draghi: {