X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fferm%2Fmanifests%2Fper-host.pp;h=d41d2784e214a6929a2297bb27de3f2c6f09ba2d;hb=81a0b3f9c1e1418c77a5cc7ef84fffa2d7b46fa9;hp=9f642cae20baa044ca543158f7721b7c81d8b846;hpb=961d1e1e3be93623ae35887645724406fb44fab8;p=dsa-puppet.git diff --git a/modules/ferm/manifests/per-host.pp b/modules/ferm/manifests/per-host.pp index 9f642cae..d41d2784 100644 --- a/modules/ferm/manifests/per-host.pp +++ b/modules/ferm/manifests/per-host.pp @@ -3,8 +3,12 @@ class ferm::per-host { include ferm::zivit } - if $::hostname in [chopin,franck,gluck,kassia,klecker,lobos,morricone,ravel,ries,rietz,saens,schein,santoro,steffani,valente,villa,wieck,stabile,bizet] { - include ferm::ftp + if $::hostname in [klecker,merikanto,powell,ravel,rietz,senfl,sibelius,stabile] { + ferm::rule { 'dsa-rsync': + domain => '(ip ip6)', + description => 'Allow rsync access', + rule => '&SERVICE(tcp, 873)' + } } case $::hostname { @@ -14,19 +18,53 @@ class ferm::per-host { rule => '&SERVICE_RANGE(tcp, http-alt, ( 192.25.206.16 70.103.162.29 217.196.43.134 ))' } } + ullmann: { + @ferm::rule { 'dsa-postgres-udd': + description => 'Allow postgress access', + # quantz, wagner + rule => '&SERVICE_RANGE(tcp, 5452, ( 206.12.19.122/32 217.196.43.134/32 217.196.43.132/32 ))' + } + @ferm::rule { 'dsa-postgres-udd6': + domain => '(ip6)', + description => 'Allow postgress access', + # quantz + rule => '&SERVICE_RANGE(tcp, 5452, ( 2607:f8f0:610:4000:216:36ff:fe40:3860/128 ))' + } + } + grieg: { + @ferm::rule { 'dsa-postgres-ullmann': + description => 'Allow postgress access', + rule => '&SERVICE_RANGE(tcp, 5433, ( 206.12.19.141/32 ))' + } + @ferm::rule { 'dsa-postgres-ullmann6': + domain => '(ip6)', + description => 'Allow postgress access', + rule => '&SERVICE_RANGE(tcp, 5433, ( 2607:f8f0:610:4000:6564:a62:ce0c:138d/128 ))' + } + } danzi: { @ferm::rule { 'dsa-postgres-danzi': description => 'Allow postgress access', rule => '&SERVICE_RANGE(tcp, 5433, ( 206.12.19.0/24 ))' } + @ferm::rule { 'dsa-postgres-danzi6': + domain => 'ip6', + description => 'Allow postgress access', + rule => '&SERVICE_RANGE(tcp, 5433, ( 2607:f8f0:610:4000::/64 ))' + } + @ferm::rule { 'dsa-postgres2-danzi': description => 'Allow postgress access2', rule => '&SERVICE_RANGE(tcp, 5437, ( 206.12.19.0/24 ))' } @ferm::rule { 'dsa-postgres3-danzi': - description => 'Allow postgress access2', + description => 'Allow postgress access3', rule => '&SERVICE_RANGE(tcp, 5436, ( 206.12.19.0/24 ))' } + @ferm::rule { 'dsa-postgres4-danzi': + description => 'Allow postgress access4', + rule => '&SERVICE_RANGE(tcp, 5438, ( 206.12.19.0/24 ))' + } } abel,alwyn,rietz: { @ferm::rule { 'dsa-tftp': @@ -44,17 +82,6 @@ class ferm::per-host { rule => '&SERVICE(udp, 69)' } } - handel: { - @ferm::rule { 'dsa-puppet': - description => 'Allow puppet access', - rule => '&SERVICE_RANGE(tcp, 8140, $HOST_DEBIAN_V4)' - } - @ferm::rule { 'dsa-puppet-v6': - domain => 'ip6', - description => 'Allow puppet access', - rule => '&SERVICE_RANGE(tcp, 8140, $HOST_DEBIAN_V6)' - } - } powell: { @ferm::rule { 'dsa-powell-v6-tunnel': description => 'Allow powell to use V6 tunnel broker', @@ -66,7 +93,7 @@ class ferm::per-host { rule => 'proto tcp dport 8000:8100 jump ACCEPT' } } - heininen,lotti: { + lotti,lully: { @ferm::rule { 'dsa-syslog': description => 'Allow syslog access', rule => '&SERVICE_RANGE(tcp, 5140, $HOST_DEBIAN_V4)' @@ -128,17 +155,26 @@ class ferm::per-host { rule => '&TCP_UDP_SERVICE(5080)' } } - scelsi: { - @ferm::rule { 'dc11-icecast': - domain => '(ip ip6)', - description => 'Allow icecast access', - rule => '&SERVICE(tcp, 8000)' + unger: { + @ferm::rule { 'dsa-notrack-dns-diamond-in': + domain => 'ip', + description => 'NOTRACK for nameserver traffic', + table => 'raw', + chain => 'PREROUTING', + rule => 'destination 82.195.75.108 proto (tcp udp) dport 53 jump NOTRACK' + } + @ferm::rule { 'dsa-notrack-dns-diamond-out': + domain => 'ip', + description => 'NOTRACK for nameserver traffic', + table => 'raw', + chain => 'PREROUTING', + rule => 'source 82.195.75.108 proto (tcp udp) sport 53 jump NOTRACK' } } default: {} } - if $::hostname in [rautavaara,luchesi] { + if $::hostname in [rautavaara,luchesi,czerny] { @ferm::rule { 'dsa-to-kfreebsd': description => 'Traffic routed to kfreebsd hosts', chain => 'to-kfreebsd', @@ -157,7 +193,7 @@ source ($HOST_NAGIOS_V4) proto udp dport ntp ACCEPT proto tcp dport (21 22 80 53 443) ACCEPT; proto udp dport (53 123) ACCEPT; proto tcp dport 8140 daddr 82.195.75.104 ACCEPT; # puppethost -proto tcp dport 5140 daddr (82.195.75.98 206.12.19.121) ACCEPT; # loghost +proto tcp dport 5140 daddr (82.195.75.99 206.12.19.121) ACCEPT; # loghost proto tcp dport 11371 daddr 82.195.75.107 ACCEPT; # keyring host proto tcp dport (25 submission) daddr ($HOST_MAILRELAY_V4) ACCEPT ' @@ -187,7 +223,29 @@ REJECT reject-with icmp-admin-prohibited chain => 'FORWARD', rule => 'def $ADDRESS_FANO=206.12.19.110; def $ADDRESS_FINZI=206.12.19.111; -def $FREEBSD_HOSTS=($ADDRESS_FANO $ADDRESS_FINZI); +def $ADDRESS_FISCHER=206.12.19.112; +def $ADDRESS_FALLA=206.12.19.117; +def $FREEBSD_HOSTS=($ADDRESS_FANO $ADDRESS_FINZI $ADDRESS_FISCHER $ADDRESS_FALLA); + +policy ACCEPT; +mod state state (ESTABLISHED RELATED) ACCEPT; +interface br0 outerface br0 ACCEPT; +interface br1 outerface br1 ACCEPT; + +interface br2 outerface br0 jump from-kfreebsd; +interface br0 destination ($ADDRESS_FISCHER $ADDRESS_FALLA) proto tcp dport 22 ACCEPT; +interface br0 destination ($FREEBSD_HOSTS) jump to-kfreebsd; +ULOG ulog-prefix "REJECT FORWARD: "; +REJECT reject-with icmp-admin-prohibited +' + } + } + czerny: { + @ferm::rule { 'dsa-routing': + description => 'forward chain', + chain => 'FORWARD', + rule => 'def $ADDRESS_FILS=82.195.75.89; +def $FREEBSD_HOSTS=($ADDRESS_FILS); policy ACCEPT; mod state state (ESTABLISHED RELATED) ACCEPT; @@ -228,8 +286,4 @@ REJECT reject-with icmp-admin-prohibited } default: {} } - - if $::rsyncd { - include ferm::rsync - } }