X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Fmanifests%2Fper-host.pp;h=809a9e4249666e2961d2861c3dedb44c3b4453fc;hb=387dbef4074648d702a1d6c600585d85e4316f2f;hp=f7c7e865664c36c88f016f362b8b2996cca2300e;hpb=6a4e9c9d3d4cd25532343de1617dccf09f8fdb22;p=mirror%2Fdsa-puppet.git diff --git a/modules/ferm/manifests/per-host.pp b/modules/ferm/manifests/per-host.pp index f7c7e8656..809a9e424 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,gretchaninov] { - 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)', @@ -314,27 +193,6 @@ class ferm::per-host { rule => '&SERVICE_RANGE(tcp, 5433, ( $HOST_PGBACKUPHOST_V6 ))' } } - franck: { - @ferm::rule { 'dsa-postgres-franck': - description => 'Allow postgress access', - rule => '&SERVICE_RANGE(tcp, 5433, ( 5.153.231.10/32 ))' - } - @ferm::rule { 'dsa-postgres-franck6': - 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 ))' - } - } bmdb1: { @ferm::rule { 'dsa-postgres-main': description => 'Allow postgress access', @@ -347,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', @@ -355,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', @@ -524,7 +382,7 @@ REJECT reject-with icmp-admin-prohibited rule => 'outerface !tun+ mod mark mark 1 MASQUERADE', } } - ubc-enc2bl01,ubc-enc2bl02,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 ))',