X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fferm%2Fmanifests%2Fper-host.pp;h=3ab0d631ad6097933996415f1c4a3bdbac29758b;hb=7b062baee2e55c34f6c71a8f10919492de0bb2c5;hp=f87b97cbcbae61deb828542521209913738e7985;hpb=268a10826a93b3171857bfc3d8ae040d4ae45d37;p=dsa-puppet.git diff --git a/modules/ferm/manifests/per-host.pp b/modules/ferm/manifests/per-host.pp index f87b97cb..3ab0d631 100644 --- a/modules/ferm/manifests/per-host.pp +++ b/modules/ferm/manifests/per-host.pp @@ -12,7 +12,17 @@ class ferm::per-host { } case $::hostname { + bm-bl9: { + @ferm::rule { 'dsa-iscsi': + description => 'Allow iscsi access', + rule => '&SERVICE_RANGE(tcp, 3260, ( 5.153.231.240/27 172.29.123.0/24 ))' + } + } 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 ))' @@ -21,15 +31,15 @@ class ferm::per-host { description => 'Allow keystone access', rule => '&SERVICE_RANGE(tcp, 5000, ( 5.153.231.240/27 172.29.123.0/24 ))' } - @ferm::rule { 'dsa-keystone2': + @ferm::rule { 'dsa-keystone-admin': description => 'Allow keystone access', rule => '&SERVICE_RANGE(tcp, 35357, ( 5.153.231.240/27 172.29.123.0/24 ))' } - @ferm::rule { 'dsa-glance1': + @ferm::rule { 'dsa-glance-api': description => 'Allow glance access', - rule => '&SERVICE_RANGE(tcp, 9191, ( 5.153.231.240/27 172.29.123.0/24 ))' + rule => '&SERVICE_RANGE(tcp, 9292, ( 5.153.231.240/27 172.29.123.0/24 ))' } - @ferm::rule { 'dsa-glance2': + @ferm::rule { 'dsa-glance-registry': description => 'Allow glance access', rule => '&SERVICE_RANGE(tcp, 9191, ( 5.153.231.240/27 172.29.123.0/24 ))' } @@ -37,7 +47,7 @@ class ferm::per-host { description => 'Allow glance access', rule => '&SERVICE_RANGE(tcp, 9696, ( 5.153.231.240/27 172.29.123.0/24 ))' } - @ferm::rule { 'dsa-nova1': + @ferm::rule { 'dsa-nova-ec2': description => 'Allow nova access', rule => '&SERVICE_RANGE(tcp, 8773, ( 5.153.231.240/27 172.29.123.0/24 ))' } @@ -45,7 +55,7 @@ class ferm::per-host { description => 'Allow nova access', rule => '&SERVICE_RANGE(tcp, 8774, ( 5.153.231.240/27 172.29.123.0/24 ))' } - @ferm::rule { 'dsa-nova3': + @ferm::rule { 'dsa-nova-metadata': description => 'Allow nova access', rule => '&SERVICE_RANGE(tcp, 8775, ( 5.153.231.240/27 172.29.123.0/24 ))' } @@ -76,12 +86,6 @@ class ferm::per-host { rule => 'destination 78.8.208.246/32 proto tcp dport 25 jump DROP', } } - abel,alwyn,rietz,jenkins: { - @ferm::rule { 'dsa-tftp': - description => 'Allow tftp access', - rule => '&SERVICE(udp, 69)' - } - } lotti,lully: { @ferm::rule { 'dsa-syslog': description => 'Allow syslog access', @@ -124,21 +128,6 @@ class ferm::per-host { rule => '&SERVICE(tcp, 636)' } } - cilea: { - ferm::module { 'nf_conntrack_sip': } - ferm::module { 'nf_conntrack_h323': } - - @ferm::rule { 'dsa-sip': - domain => '(ip ip6)', - description => 'Allow sip access', - rule => '&TCP_UDP_SERVICE(5060)' - } - @ferm::rule { 'dsa-sipx': - domain => '(ip ip6)', - description => 'Allow sipx access', - rule => '&TCP_UDP_SERVICE(5080)' - } - } sonntag: { @ferm::rule { 'dsa-bugs-search': description => 'port 1978 for bugs-search from bug web frontends', @@ -188,6 +177,16 @@ class ferm::per-host { rule => 'proto tcp daddr 206.12.19.150 dport 80 REDIRECT to-ports 6081', } } + 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.185 dport 80 REDIRECT to-ports 6081', + } + } default: {} } case $::hostname { @@ -281,21 +280,21 @@ class ferm::per-host { bmdb1: { @ferm::rule { 'dsa-postgres-main': description => 'Allow postgress access', - rule => '&SERVICE_RANGE(tcp, 5435, ( 5.153.231.14/32 5.153.231.23/32 5.153.231.25/32 206.12.19.141/32 5.153.231.26/32 5.153.231.18/32 5.153.231.28/32 5.153.231.249/32 ))' + rule => '&SERVICE_RANGE(tcp, 5435, ( 5.153.231.14/32 5.153.231.23/32 5.153.231.25/32 206.12.19.141/32 5.153.231.26/32 5.153.231.18/32 5.153.231.28/32 5.153.231.249/32 5.153.231.29/32))' } @ferm::rule { 'dsa-postgres-main6': domain => 'ip6', description => 'Allow postgress access', - rule => '&SERVICE_RANGE(tcp, 5435, ( 2001:41c8:1000:21::21:14/128 2001:41c8:1000:21::21:23/128 2001:41c8:1000:21::21:25/128 2607:f8f0:610:4000:6564:a62:ce0c:138d/128 2001:41c8:1000:21::21:26/128 2001:41c8:1000:21::21:18/128 2001:41c8:1000:21::21:28/128 2001:41c8:1000:20::20:249/128))' + rule => '&SERVICE_RANGE(tcp, 5435, ( 2001:41c8:1000:21::21:14/128 2001:41c8:1000:21::21:23/128 2001:41c8:1000:21::21:25/128 2607:f8f0:610:4000:6564:a62:ce0c:138d/128 2001:41c8:1000:21::21:26/128 2001:41c8:1000:21::21:18/128 2001:41c8:1000:21::21:28/128 2001:41c8:1000:20::20:249/128 2001:41c8:1000:21::21:29/128))' } @ferm::rule { 'dsa-postgres-dak': description => 'Allow postgress access', - rule => '&SERVICE_RANGE(tcp, 5434, ( 5.153.231.11/32 5.153.231.28/32 206.12.19.123/32 206.12.19.134/32 5.153.231.21/32 ))' + rule => '&SERVICE_RANGE(tcp, 5434, ( 5.153.231.11/32 5.153.231.28/32 206.12.19.123/32 206.12.19.134/32 5.153.231.21/32 5.153.231.18/32 ))' } @ferm::rule { 'dsa-postgres-dak6': domain => 'ip6', description => 'Allow postgress access', - rule => '&SERVICE_RANGE(tcp, 5434, ( 2001:41c8:1000:21::21:11/128 2001:41c8:1000:21::21:28/128 2607:f8f0:610:4000:216:36ff:fe40:3861/128 2607:f8f0:610:4000:6564:a62:ce0c:1386/128 2001:41c8:1000:21::21:21/128 ))' + rule => '&SERVICE_RANGE(tcp, 5434, ( 2001:41c8:1000:21::21:11/128 2001:41c8:1000:21::21:28/128 2607:f8f0:610:4000:216:36ff:fe40:3861/128 2607:f8f0:610:4000:6564:a62:ce0c:1386/128 2001:41c8:1000:21::21:21/128 2001:41c8:1000:21::21:18/128 ))' } @ferm::rule { 'dsa-postgres-wanna-build': # wuiet, ullmann, franck @@ -307,6 +306,16 @@ class ferm::per-host { description => 'Allow postgress access', rule => '&SERVICE_RANGE(tcp, 5436, ( 2001:41c8:1000:21::21:18/128 2607:f8f0:610:4000:6564:a62:ce0c:138d/128 ))' } + @ferm::rule { 'dsa-postgres-wanna-build-ports': + # portman + description => 'Allow postgress access', + rule => '&SERVICE_RANGE(tcp, 5436, ( 5.153.231.29/32 ))' + } + @ferm::rule { 'dsa-postgres-wanna-build-ports6': + domain => 'ip6', + description => 'Allow postgress access', + rule => '&SERVICE_RANGE(tcp, 5436, ( 2001:41c8:1000:21::21:29/128 ))' + } @ferm::rule { 'dsa-postgres-bacula': # dinis description => 'Allow postgress access1', @@ -396,6 +405,16 @@ class ferm::per-host { description => 'Allow postgress access', rule => '&SERVICE_RANGE(tcp, 5433, ( 2001:41c8:1000:21::21:12/128 ))' } + @ferm::rule { 'dsa-postgres-replication': + description => 'Allow postgress access', + rule => '&SERVICE_RANGE(tcp, 5433, ( 185.17.185.187/32 2001:1af8:4020:b030:deb::187/128 ))' + } + } + lw07: { + @ferm::rule { 'dsa-postgres-snapshot': + description => 'Allow postgress access', + rule => '&SERVICE_RANGE(tcp, 5439, ( 185.17.185.176/28 2001:1af8:4020:b030::/64 ))' + } } default: {} } @@ -428,4 +447,25 @@ REJECT reject-with icmp-admin-prohibited } default: {} } + # tftp + case $::hostname { + abel: { + @ferm::rule { 'dsa-tftp': + description => 'Allow tftp access', + rule => '&SERVICE_RANGE(udp, 69, ( 172.28.17.0/24 ))' + } + } + jenkins: { + @ferm::rule { 'dsa-tftp': + description => 'Allow tftp access', + rule => '&SERVICE_RANGE(udp, 69, ( 192.168.2.0/24 206.12.19.0/24 ))' + } + } + master: { + @ferm::rule { 'dsa-tftp': + description => 'Allow tftp access', + rule => '&SERVICE_RANGE(udp, 69, ( 82.195.75.64/26 192.168.43.0/24 ))' + } + } + } }