X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fferm%2Fmanifests%2Fper-host.pp;h=3df1beeedcf86ad37f9745339759449fd27f1590;hb=b3b81b8c7700d5680372a5ebcdcde9a5b255d52e;hp=2ce281b2a5925f39498622127e05d26a2d476f01;hpb=458e5d3e3e5503b0ad0fc46d5e8ebbbcc8308922;p=dsa-puppet.git diff --git a/modules/ferm/manifests/per-host.pp b/modules/ferm/manifests/per-host.pp index 2ce281b2..3df1beee 100644 --- a/modules/ferm/manifests/per-host.pp +++ b/modules/ferm/manifests/per-host.pp @@ -12,6 +12,12 @@ 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-amqp': description => 'Allow rabbitmq access', @@ -21,15 +27,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-glance1': + @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 +43,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 +51,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,7 +82,7 @@ class ferm::per-host { rule => 'destination 78.8.208.246/32 proto tcp dport 25 jump DROP', } } - abel,alwyn,rietz,jenkins: { + abel,rietz,jenkins: { @ferm::rule { 'dsa-tftp': description => 'Allow tftp access', rule => '&SERVICE(udp, 69)' @@ -124,21 +130,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 +179,16 @@ 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', + } + } default: {} } case $::hostname { @@ -281,21 +282,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 ))' + 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 ))' } @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))' + 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))' } @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 @@ -396,6 +397,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.180/32 ))' + } + } + lw04: { + @ferm::rule { 'dsa-postgres-snapshot': + description => 'Allow postgress access', + rule => '&SERVICE_RANGE(tcp, 5439, ( 185.17.185.181/32 185.17.185.182/32 ))' + } } default: {} }