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

diff --git a/modules/ferm/manifests/per_host.pp b/modules/ferm/manifests/per_host.pp
index 28e3c3079..5fd80d0e7 100644
--- 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',
@@ -197,13 +186,6 @@ class ferm::per_host {
           | EOF
       }
     }
-    snapshotdb-manda-01: {
-      ferm::rule { 'dsa-postgres-snapshot':
-        domain      => '(ip ip6)',
-        description => 'Allow postgress access from leaseweb (lw07 and friends)',
-        rule        => '&SERVICE_RANGE(tcp, 5442, ( 185.17.185.176/28 2001:1af8:4020:b030::/64 ))'
-      }
-    }
     default: {}
   }
   # vpn fu