X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fferm%2Fmanifests%2Fper-host.pp;h=ca13174a0e3a68490b1feb654b5f156c02566e82;hb=12f7395f08350abd27fa112f75382caa1b1bd6a3;hp=24a37b1bfe9fcfd1ce272424600e890211d1ca0d;hpb=a69bd934ad1354f6bba40dff8d8c0e8d2d053864;p=dsa-puppet.git diff --git a/modules/ferm/manifests/per-host.pp b/modules/ferm/manifests/per-host.pp index 24a37b1b..ca13174a 100644 --- a/modules/ferm/manifests/per-host.pp +++ b/modules/ferm/manifests/per-host.pp @@ -1,9 +1,9 @@ class ferm::per-host { - if $::hostname in [ancina,zandonai,zelenka] { + if $::hostname in [zandonai,zelenka] { include ferm::zivit } - if $::hostname in [glinka,klecker,ravel,rietz,senfl,sibelius,stabile] { + if $::hostname in [glinka,klecker,rietz,sibelius] { ferm::rule { 'dsa-rsync': domain => '(ip ip6)', description => 'Allow rsync access', @@ -19,46 +19,109 @@ class ferm::per-host { } } 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 { @@ -82,7 +145,7 @@ class ferm::per-host { rule => 'destination 78.8.208.246/32 proto tcp dport 25 jump DROP', } } - lotti,lully: { + lotti,lully,loghost-grnet-01: { @ferm::rule { 'dsa-syslog': description => 'Allow syslog access', rule => '&SERVICE_RANGE(tcp, 5140, $HOST_DEBIAN_V4)' @@ -133,24 +196,6 @@ class ferm::per-host { default: {} } - if $::hostname in [rautavaara] { - @ferm::rule { 'dsa-from-mgmt': - description => 'Traffic routed from mgmt net vlan/bridge', - chain => 'INPUT', - rule => 'interface eth1 ACCEPT' - } - @ferm::rule { 'dsa-mgmt-mark': - table => 'mangle', - chain => 'PREROUTING', - rule => 'interface eth1 MARK set-mark 1', - } - @ferm::rule { 'dsa-mgmt-nat': - table => 'nat', - chain => 'POSTROUTING', - rule => 'outerface eth1 mod mark mark 1 MASQUERADE', - } - } - # redirect snapshot into varnish case $::hostname { sibelius: { @@ -163,34 +208,14 @@ class ferm::per-host { rule => 'proto tcp daddr 193.62.202.30 dport 80 REDIRECT to-ports 6081', } } - stabile: { - @ferm::rule { 'dsa-snapshot-varnish': - rule => '&SERVICE(tcp, 6081)', - } - @ferm::rule { 'dsa-nat-snapshot-varnish': - table => 'nat', - chain => 'PREROUTING', - 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', - } - } - lw06: { + 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.182 dport 80 REDIRECT to-ports 6081', + rule => 'proto tcp daddr 185.17.185.185 dport 80 REDIRECT to-ports 6081', } } default: {} @@ -238,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 ))' } } } @@ -253,13 +284,13 @@ 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 ))' } } franck: { @@ -275,49 +306,49 @@ class ferm::per-host { @ferm::rule { 'dsa-postgres-backup': description => 'Allow postgress access', - rule => '&SERVICE_RANGE(tcp, 5433, ( 5.153.231.12/32 ))' + rule => '&SERVICE_RANGE(tcp, 5433, ( $HOST_PGBACKUPHOST_V4 ))' } @ferm::rule { 'dsa-postgres-backup6': domain => 'ip6', description => 'Allow postgress access', - rule => '&SERVICE_RANGE(tcp, 5433, ( 2001:41c8:1000:21::21:12/128 ))' + rule => '&SERVICE_RANGE(tcp, 5433, ( $HOST_PGBACKUPHOST_V6 ))' } } 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 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 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: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 5.153.231.18/32 ))' + rule => '&SERVICE_RANGE(tcp, 5434, ( 5.153.231.11/32 5.153.231.28/32 206.12.19.123/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 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:610:4000:216:36ff:fe40:3861/128 2001:41c8:1000:21::21:21/128 2001:41c8:1000:21::21:18/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 ))' } - @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': + @ferm::rule { 'dsa-postgres-wannabuild-ports': # portman description => 'Allow postgress access', rule => '&SERVICE_RANGE(tcp, 5436, ( 5.153.231.29/32 ))' } - @ferm::rule { 'dsa-postgres-wanna-build-ports6': + @ferm::rule { 'dsa-postgres-wannabuild-ports6': domain => 'ip6', description => 'Allow postgress access', rule => '&SERVICE_RANGE(tcp, 5436, ( 2001:41c8:1000:21::21:29/128 ))' @@ -336,12 +367,12 @@ class ferm::per-host { @ferm::rule { 'dsa-postgres-backup': # ubc, wuit description => 'Allow postgress access', - rule => '&SERVICE_RANGE(tcp, (5435 5436), ( 5.153.231.12/32 ))' + rule => '&SERVICE_RANGE(tcp, (5435 5436), ( $HOST_PGBACKUPHOST_V4 ))' } @ferm::rule { 'dsa-postgres-backup6': domain => 'ip6', description => 'Allow postgress access', - rule => '&SERVICE_RANGE(tcp, (5435 5436), ( 2001:41c8:1000:21::21:12/128 ))' + rule => '&SERVICE_RANGE(tcp, (5435 5436), ( $HOST_PGBACKUPHOST_V6 ))' } @ferm::rule { 'dsa-postgres-dedup': @@ -354,6 +385,16 @@ class ferm::per-host { description => 'Allow postgress access', rule => '&SERVICE_RANGE(tcp, (5439), ( 2001:41c8:1000:21::21:17/128 ))' } + + @ferm::rule { 'dsa-postgres-debsources': + description => 'Allow postgress access', + rule => '&SERVICE_RANGE(tcp, (5440), ( 5.153.231.38/32 ))' + } + @ferm::rule { 'dsa-postgres-debsources6': + domain => 'ip6', + description => 'Allow postgress access', + rule => '&SERVICE_RANGE(tcp, (5440), ( 2001:41c8:1000:21::21:38/128 ))' + } } danzi: { @ferm::rule { 'dsa-postgres-danzi': @@ -382,44 +423,43 @@ class ferm::per-host { @ferm::rule { 'dsa-postgres-backup': description => 'Allow postgress access', - rule => '&SERVICE_RANGE(tcp, 5433, ( 5.153.231.12/32 ))' + rule => '&SERVICE_RANGE(tcp, 5433, ( $HOST_PGBACKUPHOST_V4 ))' } @ferm::rule { 'dsa-postgres-backup6': domain => 'ip6', description => 'Allow postgress access', - rule => '&SERVICE_RANGE(tcp, 5433, ( 2001:41c8:1000:21::21:12/128 ))' + rule => '&SERVICE_RANGE(tcp, 5433, ( $HOST_PGBACKUPHOST_V6 ))' } } - chopin: { + seger,chopin: { @ferm::rule { 'dsa-postgres-backup': description => 'Allow postgress access', - rule => '&SERVICE_RANGE(tcp, 5432, ( 5.153.231.12/32 ))' + rule => '&SERVICE_RANGE(tcp, 5432, ( $HOST_PGBACKUPHOST_V4 ))' } @ferm::rule { 'dsa-postgres-backup6': domain => 'ip6', description => 'Allow postgress access', - rule => '&SERVICE_RANGE(tcp, 5432, ( 2001:41c8:1000:21::21:12/128 ))' + rule => '&SERVICE_RANGE(tcp, 5432, ( $HOST_PGBACKUPHOST_V6 ))' } } sibelius: { @ferm::rule { 'dsa-postgres-backup': description => 'Allow postgress access', - rule => '&SERVICE_RANGE(tcp, 5433, ( 5.153.231.12/32 ))' + rule => '&SERVICE_RANGE(tcp, 5433, ( $HOST_PGBACKUPHOST_V4 ))' } @ferm::rule { 'dsa-postgres-backup6': domain => 'ip6', description => 'Allow postgress access', - rule => '&SERVICE_RANGE(tcp, 5433, ( 2001:41c8:1000:21::21:12/128 ))' + rule => '&SERVICE_RANGE(tcp, 5433, ( $HOST_PGBACKUPHOST_V6 ))' } @ferm::rule { 'dsa-postgres-replication': description => 'Allow postgress access', - rule => '&SERVICE_RANGE(tcp, 5433, ( 185.17.185.180/32 ))' + rule => '&SERVICE_RANGE(tcp, 5433, ( 185.17.185.187/32 ))' } - } - lw04: { - @ferm::rule { 'dsa-postgres-snapshot': + @ferm::rule { 'dsa-postgres-replication6': + domain => 'ip6', description => 'Allow postgress access', - rule => '&SERVICE_RANGE(tcp, 5439, ( 185.17.185.181/32 185.17.185.182/32 ))' + rule => '&SERVICE_RANGE(tcp, 5433, ( 2001:1af8:4020:b030:deb::187/128 ))' } } lw07: { @@ -427,6 +467,11 @@ class ferm::per-host { description => 'Allow postgress access', rule => '&SERVICE_RANGE(tcp, 5439, ( 185.17.185.176/28 ))' } + @ferm::rule { 'dsa-postgres-snapshot6': + domain => 'ip6', + description => 'Allow postgress access', + rule => '&SERVICE_RANGE(tcp, 5439, ( 2001:1af8:4020:b030::/64 ))' + } } default: {} } @@ -467,7 +512,7 @@ REJECT reject-with icmp-admin-prohibited rule => '&SERVICE_RANGE(udp, 69, ( 172.28.17.0/24 ))' } } - jenkins: { + jenko: { @ferm::rule { 'dsa-tftp': description => 'Allow tftp access', rule => '&SERVICE_RANGE(udp, 69, ( 192.168.2.0/24 206.12.19.0/24 ))' @@ -476,7 +521,7 @@ REJECT reject-with icmp-admin-prohibited master: { @ferm::rule { 'dsa-tftp': description => 'Allow tftp access', - rule => '&SERVICE_RANGE(udp, 69, ( 82.195.75.64/26 ))' + rule => '&SERVICE_RANGE(udp, 69, ( 82.195.75.64/26 192.168.43.0/24 ))' } } }