Retire stockhausen/listsearch (RT#6848)

[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 952f52a..3118efc 100644 (file)
--- a/modules/ferm/manifests/per_host.pp
+++ b/modules/ferm/manifests/per_host.pp
@@ -8,6 +8,12 @@ class ferm::per_host {
        }
 
        case $::hostname {
+               vittoria: {
+                       @ferm::rule { 'debconf17':
+                               description     => 'temporarily allow DC17 access',
+                               rule            => '&SERVICE_RANGE(tcp, 5432, ( 206.167.44.99/32 206.167.36.195/32 ))'
+                       }
+               }
                czerny,clementi: {
                        @ferm::rule { 'dsa-upsmon':
                                description     => 'Allow upsmon access',
@@ -38,6 +44,10 @@ class ferm::per_host {
                                description     => 'Allow syslog access',
                                rule            => '&SERVICE_RANGE(tcp, 5140, $HOST_DEBIAN_V6)'
                        }
+                       @ferm::rule { 'fastly-syslog':
+                               description     => 'Allow syslog access',
+                               rule            => '&SERVICE_RANGE(tcp, 5141, $HOST_FASTLY)'
+                       }
                }
                kaufmann: {
                        @ferm::rule { 'dsa-hkp':
@@ -146,22 +156,6 @@ class ferm::per_host {
                default: {}
        }
 
-       # elasticsearch stuff
-       case $::hostname {
-               stockhausen: {
-                       @ferm::rule { 'dsa-elasticsearch-bendel':
-                               domain          => '(ip)',
-                               description     => 'Allow elasticsearch access from bendel',
-                               rule            => '&SERVICE_RANGE(tcp, 9200:9300, ( 82.195.75.100/32 ))'
-                       }
-                       @ferm::rule { 'dsa-elasticsearch-bendel6':
-                               domain          => '(ip6)',
-                               description     => 'Allow elasticsearch access from bendel',
-                               rule            => '&SERVICE_RANGE(tcp, 9200:9300, ( 2001:41b8:202:deb:216:36ff:fe40:4002/128 ))'
-                       }
-               }
-       }
-
        # postgres stuff
        case $::hostname {
                ullmann: {