X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Fmanifests%2Fper-host.pp;h=f7c7e865664c36c88f016f362b8b2996cca2300e;hb=6a4e9c9d3d4cd25532343de1617dccf09f8fdb22;hp=19964e8972df3e7bc88126591b7eb29dc28fca39;hpb=d29233de3db679803f992485b44ba8abaf01502a;p=mirror%2Fdsa-puppet.git diff --git a/modules/ferm/manifests/per-host.pp b/modules/ferm/manifests/per-host.pp index 19964e897..f7c7e8656 100644 --- a/modules/ferm/manifests/per-host.pp +++ b/modules/ferm/manifests/per-host.pp @@ -3,7 +3,7 @@ class ferm::per-host { include ferm::zivit } - if $::hostname in [glinka,klecker,ravel,rietz,senfl,sibelius] { + if $::hostname in [glinka,gretchaninov] { ferm::rule { 'dsa-rsync': domain => '(ip ip6)', description => 'Allow rsync access', @@ -27,7 +27,7 @@ class ferm::per-host { description => 'Allow memcache access', rule => '&SERVICE_RANGE(tcp, 11211, ( 5.153.231.240/27 172.29.123.0/24 ))' } - @ferm::rule { 'dsa-memcache': + @ferm::rule { 'dsa-memcache6': domain => 'ip6', description => 'Allow memcache access', rule => '&SERVICE_RANGE(tcp, 11211, ( 2001:41c8:1000::/48 ))' @@ -36,7 +36,7 @@ class ferm::per-host { description => 'Allow rabbitmq access', rule => '&SERVICE_RANGE(tcp, 5672, ( 5.153.231.240/27 172.29.123.0/24 ))' } - @ferm::rule { 'dsa-amqp': + @ferm::rule { 'dsa-amqp6': domain => 'ip6', description => 'Allow rabbitmq access', rule => '&SERVICE_RANGE(tcp, 5672, ( 2001:41c8:1000::/48 ))' @@ -45,7 +45,7 @@ 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-keystone': + @ferm::rule { 'dsa-keystone6': domain => 'ip6', description => 'Allow keystone access', rule => '&SERVICE_RANGE(tcp, 5000, ( 2001:41c8:1000::/48 ))' @@ -54,7 +54,7 @@ class ferm::per-host { description => 'Allow keystone access', rule => '&SERVICE_RANGE(tcp, 35357, ( 5.153.231.240/27 172.29.123.0/24 ))' } - @ferm::rule { 'dsa-keystone-admin': + @ferm::rule { 'dsa-keystone-admin6': domain => 'ip6', description => 'Allow keystone access', rule => '&SERVICE_RANGE(tcp, 35357, ( 2001:41c8:1000::/48 ))' @@ -63,7 +63,7 @@ class ferm::per-host { description => 'Allow glance access', rule => '&SERVICE_RANGE(tcp, 9292, ( 5.153.231.240/27 172.29.123.0/24 ))' } - @ferm::rule { 'dsa-glance-api': + @ferm::rule { 'dsa-glance-api6': domain => 'ip6', description => 'Allow glance access', rule => '&SERVICE_RANGE(tcp, 9292, ( 2001:41c8:1000::/48 ))' @@ -72,7 +72,7 @@ class ferm::per-host { description => 'Allow glance access', rule => '&SERVICE_RANGE(tcp, 9191, ( 5.153.231.240/27 172.29.123.0/24 ))' } - @ferm::rule { 'dsa-glance-registry': + @ferm::rule { 'dsa-glance-registry6': domain => 'ip6', description => 'Allow glance access', rule => '&SERVICE_RANGE(tcp, 9191, ( 2001:41c8:1000::/48 ))' @@ -81,7 +81,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-neutron': + @ferm::rule { 'dsa-neutron6': domain => 'ip6', description => 'Allow glance access', rule => '&SERVICE_RANGE(tcp, 9696, ( 2001:41c8:1000::/48 ))' @@ -90,7 +90,7 @@ class ferm::per-host { description => 'Allow nova access', rule => '&SERVICE_RANGE(tcp, 8773, ( 5.153.231.240/27 172.29.123.0/24 ))' } - @ferm::rule { 'dsa-nova-ec2': + @ferm::rule { 'dsa-nova-ec26': domain => 'ip6', description => 'Allow nova access', rule => '&SERVICE_RANGE(tcp, 8773, ( 2001:41c8:1000::/48 ))' @@ -99,7 +99,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-nova2': + @ferm::rule { 'dsa-nova26': domain => 'ip6', description => 'Allow nova access', rule => '&SERVICE_RANGE(tcp, 8774, ( 2001:41c8:1000::/48 ))' @@ -108,7 +108,7 @@ class ferm::per-host { description => 'Allow nova access', rule => '&SERVICE_RANGE(tcp, 8775, ( 5.153.231.240/27 172.29.123.0/24 ))' } - @ferm::rule { 'dsa-nova-metadata': + @ferm::rule { 'dsa-nova-metadata6': domain => 'ip6', description => 'Allow nova access', rule => '&SERVICE_RANGE(tcp, 8775, ( 2001:41c8:1000::/48 ))' @@ -117,7 +117,7 @@ class ferm::per-host { description => 'Allow nova access', rule => '&SERVICE_RANGE(tcp, 8776, ( 5.153.231.240/27 172.29.123.0/24 ))' } - @ferm::rule { 'dsa-cinder': + @ferm::rule { 'dsa-cinder6': domain => 'ip6', description => 'Allow nova access', rule => '&SERVICE_RANGE(tcp, 8776, ( 2001:41c8:1000::/48 ))' @@ -190,7 +190,7 @@ class ferm::per-host { sonntag: { @ferm::rule { 'dsa-bugs-search': description => 'port 1978 for bugs-search from bug web frontends', - rule => '&SERVICE_RANGE(tcp, 1978, ( 140.211.166.26 206.12.19.140 ))' + rule => '&SERVICE_RANGE(tcp, 1978, ( 140.211.166.26 209.87.16.39 ))' } } default: {} @@ -263,12 +263,18 @@ class ferm::per-host { default: {} } - # solr stuff + # elasticsearch stuff case $::hostname { stockhausen: { - @ferm::rule { 'dsa-solr-jetty': - description => 'Allow jetty access', - rule => '&SERVICE_RANGE(tcp, 8080, ( 82.195.75.100/32 ))' + @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 ))' } } } @@ -278,13 +284,34 @@ class ferm::per-host { ullmann: { @ferm::rule { 'dsa-postgres-udd': description => 'Allow postgress access', - # quantz, moszumanska, master, couper, coccia, franck - rule => '&SERVICE_RANGE(tcp, 5452, ( 5.153.231.28/32 5.153.231.21/32 82.195.75.110/32 5.153.231.14/32 5.153.231.11/32 138.16.160.12/32 ))' + # quantz, moszumanska, master, coccia, franck + rule => '&SERVICE_RANGE(tcp, 5452, ( 5.153.231.28/32 5.153.231.21/32 82.195.75.110/32 5.153.231.11/32 138.16.160.12/32 ))' } @ferm::rule { 'dsa-postgres-udd6': domain => '(ip6)', description => 'Allow postgress access', - rule => '&SERVICE_RANGE(tcp, 5452, ( 2001:41c8:1000:21::21:28/128 2001:41b8:202:deb:216:36ff:fe40:4001/128 2001:41c8:1000:21::21:14/128 2001:41c8:1000:21::21:11/32 2001:41c8:1000:21::21:21/128 ))' + rule => '&SERVICE_RANGE(tcp, 5452, ( 2001:41c8:1000:21::21:28/128 2001:41b8:202:deb:216:36ff:fe40:4001/128 2001:41c8:1000:21::21:11/32 2001:41c8:1000:21::21:21/128 ))' + } + } + fasolo: { + @ferm::rule { 'dsa-postgres-fasolo': + description => 'Allow postgress access', + rule => '&SERVICE_RANGE(tcp, 5433, ( 5.153.231.10/32 ))' + } + @ferm::rule { 'dsa-postgres-fasolo6': + domain => 'ip6', + description => 'Allow postgress access', + rule => '&SERVICE_RANGE(tcp, 5433, ( 2001:41c8:1000:21::21:10/128 ))' + } + + @ferm::rule { 'dsa-postgres-backup': + description => 'Allow postgress access', + rule => '&SERVICE_RANGE(tcp, 5433, ( $HOST_PGBACKUPHOST_V4 ))' + } + @ferm::rule { 'dsa-postgres-backup6': + domain => 'ip6', + description => 'Allow postgress access', + rule => '&SERVICE_RANGE(tcp, 5433, ( $HOST_PGBACKUPHOST_V6 ))' } } franck: { @@ -311,41 +338,31 @@ 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 5.153.231.29/32))' + rule => '&SERVICE_RANGE(tcp, 5435, ( 5.153.231.23/32 5.153.231.25/32 209.87.16.38/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 5.153.231.43/32 5.153.231.33/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 2001:41c8:1000:21::21:29/128))' + rule => '&SERVICE_RANGE(tcp, 5435, ( 2001:41c8:1000:21::21:23/128 2001:41c8:1000:21::21:25/128 2607:f8f0:614:1::1274:38/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 2001:41c8:1000:21::21:43/128 2001:41c8:1000:21::21:33/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 5.153.231.18/32 ))' + rule => '&SERVICE_RANGE(tcp, 5434, ( 5.153.231.11/32 5.153.231.28/32 209.87.16.26/32 5.153.231.21/32 5.153.231.18/32 5.153.231.29/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 2001:41c8:1000:21::21:18/128 ))' + rule => '&SERVICE_RANGE(tcp, 5434, ( 2001:41c8:1000:21::21:11/128 2001:41c8:1000:21::21:28/128 2607:f8f0:614:1::1274:26/128 2001:41c8:1000:21::21:21/128 2001:41c8:1000:21::21:18/128 2001:41c8:1000:21::21:29/128 ))' } - @ferm::rule { 'dsa-postgres-wanna-build': + @ferm::rule { 'dsa-postgres-wannabuild': # wuiet, ullmann, franck description => 'Allow postgress access', - rule => '&SERVICE_RANGE(tcp, 5436, ( 5.153.231.18/32 206.12.19.141/32 138.16.160.12/32 ))' + rule => '&SERVICE_RANGE(tcp, 5436, ( 5.153.231.18/32 209.87.16.38/32 138.16.160.12/32 ))' } - @ferm::rule { 'dsa-postgres-wanna-build6': + @ferm::rule { 'dsa-postgres-wannabuild6': domain => 'ip6', 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 ))' + rule => '&SERVICE_RANGE(tcp, 5436, ( 2001:41c8:1000:21::21:18/128 2607:f8f0:614:1::1274:38/128 ))' } @ferm::rule { 'dsa-postgres-bacula': # dinis @@ -394,25 +411,25 @@ class ferm::per-host { @ferm::rule { 'dsa-postgres-danzi': # ubc, wuit description => 'Allow postgress access', - rule => '&SERVICE_RANGE(tcp, 5433, ( 206.12.19.0/24 5.153.231.18/32 ))' + rule => '&SERVICE_RANGE(tcp, 5433, ( 206.12.19.0/24 209.87.16.0/24 5.153.231.18/32 ))' } @ferm::rule { 'dsa-postgres-danzi6': domain => 'ip6', description => 'Allow postgress access', - rule => '&SERVICE_RANGE(tcp, 5433, ( 2607:f8f0:610:4000::/64 2001:41c8:1000:21::21:18/128 ))' + rule => '&SERVICE_RANGE(tcp, 5433, ( 2607:f8f0:610:4000::/64 2607:f8f0:614:1::/64 2001:41c8:1000:21::21:18/128 ))' } @ferm::rule { 'dsa-postgres2-danzi': description => 'Allow postgress access2', - rule => '&SERVICE_RANGE(tcp, 5437, ( 206.12.19.0/24 ))' + rule => '&SERVICE_RANGE(tcp, 5437, ( 206.12.19.0/24 209.87.16.0/24 ))' } @ferm::rule { 'dsa-postgres3-danzi': description => 'Allow postgress access3', - rule => '&SERVICE_RANGE(tcp, 5436, ( 206.12.19.0/24 ))' + rule => '&SERVICE_RANGE(tcp, 5436, ( 206.12.19.0/24 209.87.16.0/24 ))' } @ferm::rule { 'dsa-postgres4-danzi': description => 'Allow postgress access4', - rule => '&SERVICE_RANGE(tcp, 5438, ( 206.12.19.0/24 ))' + rule => '&SERVICE_RANGE(tcp, 5438, ( 206.12.19.0/24 209.87.16.0/24 ))' } @ferm::rule { 'dsa-postgres-backup': @@ -425,7 +442,7 @@ class ferm::per-host { rule => '&SERVICE_RANGE(tcp, 5433, ( $HOST_PGBACKUPHOST_V6 ))' } } - chopin: { + seger: { @ferm::rule { 'dsa-postgres-backup': description => 'Allow postgress access', rule => '&SERVICE_RANGE(tcp, 5432, ( $HOST_PGBACKUPHOST_V4 ))' @@ -467,11 +484,22 @@ class ferm::per-host { rule => '&SERVICE_RANGE(tcp, 5439, ( 2001:1af8:4020:b030::/64 ))' } } + vittoria: { + @ferm::rule { 'dsa-postgres-backup': + description => 'Allow postgress access', + rule => '&SERVICE_RANGE(tcp, 5432, ( $HOST_PGBACKUPHOST_V4 ))' + } + @ferm::rule { 'dsa-postgres-backup6': + domain => 'ip6', + description => 'Allow postgress access', + rule => '&SERVICE_RANGE(tcp, 5432, ( $HOST_PGBACKUPHOST_V6 ))' + } + } default: {} } # vpn fu case $::hostname { - draghi,eysler: { + draghi: { @ferm::rule { 'dsa-vpn': description => 'Allow openvpn access', rule => '&SERVICE(udp, 17257)' @@ -496,6 +524,12 @@ REJECT reject-with icmp-admin-prohibited rule => 'outerface !tun+ mod mark mark 1 MASQUERADE', } } + ubc-enc2bl01,ubc-enc2bl02,ubc-enc2bl9,ubc-enc2bl10: { + @ferm::rule { 'dsa-luca-fixme': + description => 'Allow ssh access from mnt and vpn networks', + rule => '&SERVICE_RANGE(tcp, 22, ( 172.29.40.0/22 172.29.203.0/24 ))', + } + } default: {} } # tftp @@ -506,12 +540,6 @@ REJECT reject-with icmp-admin-prohibited 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',