add memcache to open ports

[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 ef5e6a445dde829d5cc2dd56bbc6e9af687dbc3d..3ab0d631ad6097933996415f1c4a3bdbac29758b 100644 (file)
--- a/modules/ferm/manifests/per-host.pp
+++ b/modules/ferm/manifests/per-host.pp
@@ -10,14 +10,6 @@ class ferm::per-host {
                        rule        => '&SERVICE(tcp, 873)'
                }
        }
-       case $::hostname {
-               adayevskaya: {
-                       @ferm::rule { 'dsa-iscsi':
-                               description     => 'Allow mfl (local admin) access',
-                               rule            => '&SERVICE_RANGE(tcp, 22, ( 130.83.226.60/32 ))'
-                       }
-               }
-       }
 
        case $::hostname {
                bm-bl9: {
@@ -27,6 +19,10 @@ class ferm::per-host {
                        }
                }
                oyens: {
+                       @ferm::rule { 'dsa-memcache':
+                               description     => 'Allow memcache access',
+                               rule            => '&SERVICE_RANGE(tcp, 11211, ( 5.153.231.240/27 172.29.123.0/24 ))'
+                       }
                        @ferm::rule { 'dsa-amqp':
                                description     => 'Allow rabbitmq access',
                                rule            => '&SERVICE_RANGE(tcp, 5672, ( 5.153.231.240/27 172.29.123.0/24 ))'
@@ -181,24 +177,14 @@ class ferm::per-host {
                                rule            => 'proto tcp daddr 206.12.19.150 dport 80 REDIRECT to-ports 6081',
                        }
                }
-               lw05: {
-                       @ferm::rule { 'dsa-snapshot-varnish':
-                               rule            => '&SERVICE(tcp, 6081)',
-                       }
-                       @ferm::rule { 'dsa-nat-snapshot-varnish':
-                               table           => 'nat',
-                               chain           => 'PREROUTING',
-                               rule            => 'proto tcp daddr 185.17.185.181 dport 80 REDIRECT to-ports 6081',
-                       }
-               }
-               lw06: {
+               lw07: {
                        @ferm::rule { 'dsa-snapshot-varnish':
                                rule            => '&SERVICE(tcp, 6081)',
                        }
                        @ferm::rule { 'dsa-nat-snapshot-varnish':
                                table           => 'nat',
                                chain           => 'PREROUTING',
-                               rule            => 'proto tcp daddr 185.17.185.182 dport 80 REDIRECT to-ports 6081',
+                               rule            => 'proto tcp daddr 185.17.185.185 dport 80 REDIRECT to-ports 6081',
                        }
                }
                default: {}
@@ -421,13 +407,13 @@ class ferm::per-host {
                        }
                        @ferm::rule { 'dsa-postgres-replication':
                                description     => 'Allow postgress access',
-                               rule            => '&SERVICE_RANGE(tcp, 5433, ( 185.17.185.180/32 ))'
+                               rule            => '&SERVICE_RANGE(tcp, 5433, ( 185.17.185.187/32 2001:1af8:4020:b030:deb::187/128 ))'
                        }
                }
-               lw04: {
+               lw07: {
                        @ferm::rule { 'dsa-postgres-snapshot':
                                description     => 'Allow postgress access',
-                               rule            => '&SERVICE_RANGE(tcp, 5439, ( 185.17.185.181/32 185.17.185.182/32 ))'
+                               rule            => '&SERVICE_RANGE(tcp, 5439, ( 185.17.185.176/28 2001:1af8:4020:b030::/64 ))'
                        }
                }
                default: {}
@@ -478,7 +464,7 @@ REJECT reject-with icmp-admin-prohibited
                master: {
                        @ferm::rule { 'dsa-tftp':
                                description     => 'Allow tftp access',
-                               rule            => '&SERVICE_RANGE(udp, 69, ( 82.195.75.64/26 ))'
+                               rule            => '&SERVICE_RANGE(udp, 69, ( 82.195.75.64/26 192.168.43.0/24 ))'
                        }
                }
        }