X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Fmanifests%2Fper-host.pp;h=7db3c2dbd1db7b2aa5f81e37f269d92f635a00dd;hb=d55193d32bcface5935ae2a6acc2cdc6eed71a80;hp=84dcb72c330e4f1bddfa727f3735b75234970b3d;hpb=f13b336d949d336b087e41741c2787d21696747c;p=mirror%2Fdsa-puppet.git diff --git a/modules/ferm/manifests/per-host.pp b/modules/ferm/manifests/per-host.pp index 84dcb72c3..7db3c2dbd 100644 --- a/modules/ferm/manifests/per-host.pp +++ b/modules/ferm/manifests/per-host.pp @@ -3,127 +3,6 @@ class ferm::per-host { include ferm::zivit } - if $::hostname in [glinka] { - ferm::rule { 'dsa-rsync': - domain => '(ip ip6)', - description => 'Allow rsync access', - rule => '&SERVICE(tcp, 873)' - } - } - - 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-spice': - description => 'Allow spice-console access', - rule => '&SERVICE(tcp, 6082)' - } - @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-memcache6': - domain => 'ip6', - description => 'Allow memcache access', - rule => '&SERVICE_RANGE(tcp, 11211, ( 2001:41c8:1000::/48 ))' - } - @ferm::rule { 'dsa-amqp': - description => 'Allow rabbitmq access', - rule => '&SERVICE_RANGE(tcp, 5672, ( 5.153.231.240/27 172.29.123.0/24 ))' - } - @ferm::rule { 'dsa-amqp6': - domain => 'ip6', - description => 'Allow rabbitmq access', - rule => '&SERVICE_RANGE(tcp, 5672, ( 2001:41c8:1000::/48 ))' - } - @ferm::rule { 'dsa-keystone': - description => 'Allow keystone access', - rule => '&SERVICE_RANGE(tcp, 5000, ( 5.153.231.240/27 172.29.123.0/24 ))' - } - @ferm::rule { 'dsa-keystone6': - domain => 'ip6', - description => 'Allow keystone access', - rule => '&SERVICE_RANGE(tcp, 5000, ( 2001:41c8:1000::/48 ))' - } - @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-keystone-admin6': - domain => 'ip6', - description => 'Allow keystone access', - rule => '&SERVICE_RANGE(tcp, 35357, ( 2001:41c8:1000::/48 ))' - } - @ferm::rule { 'dsa-glance-api': - description => 'Allow glance access', - rule => '&SERVICE_RANGE(tcp, 9292, ( 5.153.231.240/27 172.29.123.0/24 ))' - } - @ferm::rule { 'dsa-glance-api6': - domain => 'ip6', - description => 'Allow glance access', - rule => '&SERVICE_RANGE(tcp, 9292, ( 2001:41c8:1000::/48 ))' - } - @ferm::rule { 'dsa-glance-registry': - description => 'Allow glance access', - rule => '&SERVICE_RANGE(tcp, 9191, ( 5.153.231.240/27 172.29.123.0/24 ))' - } - @ferm::rule { 'dsa-glance-registry6': - domain => 'ip6', - description => 'Allow glance access', - rule => '&SERVICE_RANGE(tcp, 9191, ( 2001:41c8:1000::/48 ))' - } - @ferm::rule { 'dsa-neutron': - description => 'Allow glance access', - rule => '&SERVICE_RANGE(tcp, 9696, ( 5.153.231.240/27 172.29.123.0/24 ))' - } - @ferm::rule { 'dsa-neutron6': - domain => 'ip6', - description => 'Allow glance access', - rule => '&SERVICE_RANGE(tcp, 9696, ( 2001:41c8:1000::/48 ))' - } - @ferm::rule { 'dsa-nova-ec2': - description => 'Allow nova access', - rule => '&SERVICE_RANGE(tcp, 8773, ( 5.153.231.240/27 172.29.123.0/24 ))' - } - @ferm::rule { 'dsa-nova-ec26': - domain => 'ip6', - description => 'Allow nova access', - rule => '&SERVICE_RANGE(tcp, 8773, ( 2001:41c8:1000::/48 ))' - } - @ferm::rule { 'dsa-nova2': - description => 'Allow nova access', - rule => '&SERVICE_RANGE(tcp, 8774, ( 5.153.231.240/27 172.29.123.0/24 ))' - } - @ferm::rule { 'dsa-nova26': - domain => 'ip6', - description => 'Allow nova access', - rule => '&SERVICE_RANGE(tcp, 8774, ( 2001:41c8:1000::/48 ))' - } - @ferm::rule { 'dsa-nova-metadata': - description => 'Allow nova access', - rule => '&SERVICE_RANGE(tcp, 8775, ( 5.153.231.240/27 172.29.123.0/24 ))' - } - @ferm::rule { 'dsa-nova-metadata6': - domain => 'ip6', - description => 'Allow nova access', - rule => '&SERVICE_RANGE(tcp, 8775, ( 2001:41c8:1000::/48 ))' - } - @ferm::rule { 'dsa-cinder': - description => 'Allow nova access', - rule => '&SERVICE_RANGE(tcp, 8776, ( 5.153.231.240/27 172.29.123.0/24 ))' - } - @ferm::rule { 'dsa-cinder6': - domain => 'ip6', - description => 'Allow nova access', - rule => '&SERVICE_RANGE(tcp, 8776, ( 2001:41c8:1000::/48 ))' - } - } - } case $::hostname { czerny,clementi: { @ferm::rule { 'dsa-upsmon': @@ -284,8 +163,8 @@ class ferm::per-host { ullmann: { @ferm::rule { 'dsa-postgres-udd': description => 'Allow postgress access', - # 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 ))' + # quantz, moszumanska, master, coccia + 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 ))' } @ferm::rule { 'dsa-postgres-udd6': domain => '(ip6)', @@ -293,12 +172,12 @@ class ferm::per-host { 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 ))' } } - franck: { - @ferm::rule { 'dsa-postgres-franck': + fasolo: { + @ferm::rule { 'dsa-postgres-fasolo': description => 'Allow postgress access', rule => '&SERVICE_RANGE(tcp, 5433, ( 5.153.231.10/32 ))' } - @ferm::rule { 'dsa-postgres-franck6': + @ferm::rule { 'dsa-postgres-fasolo6': domain => 'ip6', description => 'Allow postgress access', rule => '&SERVICE_RANGE(tcp, 5433, ( 2001:41c8:1000:21::21:10/128 ))' @@ -326,7 +205,7 @@ class ferm::per-host { } @ferm::rule { 'dsa-postgres-dak': description => 'Allow postgress access', - 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 ))' + 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 128.31.0.69/32 ))' } @ferm::rule { 'dsa-postgres-dak6': domain => 'ip6', @@ -334,9 +213,9 @@ class ferm::per-host { 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-wannabuild': - # wuiet, ullmann, franck + # wuiet, ullmann description => 'Allow postgress access', - rule => '&SERVICE_RANGE(tcp, 5436, ( 5.153.231.18/32 209.87.16.38/32 138.16.160.12/32 ))' + rule => '&SERVICE_RANGE(tcp, 5436, ( 5.153.231.18/32 209.87.16.38/32 ))' } @ferm::rule { 'dsa-postgres-wannabuild6': domain => 'ip6', @@ -355,14 +234,13 @@ class ferm::per-host { } @ferm::rule { 'dsa-postgres-backup': - # ubc, wuit description => 'Allow postgress access', - rule => '&SERVICE_RANGE(tcp, (5435 5436), ( $HOST_PGBACKUPHOST_V4 ))' + rule => '&SERVICE_RANGE(tcp, (5435 5436 5440), ( $HOST_PGBACKUPHOST_V4 ))' } @ferm::rule { 'dsa-postgres-backup6': domain => 'ip6', description => 'Allow postgress access', - rule => '&SERVICE_RANGE(tcp, (5435 5436), ( $HOST_PGBACKUPHOST_V6 ))' + rule => '&SERVICE_RANGE(tcp, (5435 5436 5440), ( $HOST_PGBACKUPHOST_V6 ))' } @ferm::rule { 'dsa-postgres-dedup': @@ -463,7 +341,7 @@ class ferm::per-host { rule => '&SERVICE_RANGE(tcp, 5439, ( 2001:1af8:4020:b030::/64 ))' } } - vittoria: { + melartin,vittoria: { @ferm::rule { 'dsa-postgres-backup': description => 'Allow postgress access', rule => '&SERVICE_RANGE(tcp, 5432, ( $HOST_PGBACKUPHOST_V4 ))' @@ -474,6 +352,17 @@ class ferm::per-host { rule => '&SERVICE_RANGE(tcp, 5432, ( $HOST_PGBACKUPHOST_V6 ))' } } + buxtehude: { + @ferm::rule { 'dsa-postgres-backup': + description => 'Allow postgress access', + rule => '&SERVICE_RANGE(tcp, (5433 5441), ( $HOST_PGBACKUPHOST_V4 ))' + } + @ferm::rule { 'dsa-postgres-backup6': + domain => 'ip6', + description => 'Allow postgress access', + rule => '&SERVICE_RANGE(tcp, (5433 5441), ( $HOST_PGBACKUPHOST_V6 ))' + } + } default: {} } # vpn fu @@ -503,7 +392,7 @@ REJECT reject-with icmp-admin-prohibited rule => 'outerface !tun+ mod mark mark 1 MASQUERADE', } } - ubc-enc2bl1,ubc-enc2bl2,ubc-enc2bl9,ubc-enc2bl10: { + ubc-enc2bl01,ubc-enc2bl02,ubc-enc2bl09,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 ))',