X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Fmanifests%2Fper-host.pp;h=76e77a31dc8fda6197893325bc2e5f7e95435625;hb=3193d5e3eda80ee925e88997155a298dc6db81bc;hp=24a37b1bfe9fcfd1ce272424600e890211d1ca0d;hpb=a69bd934ad1354f6bba40dff8d8c0e8d2d053864;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/manifests/per-host.pp b/modules/ferm/manifests/per-host.pp
index 24a37b1bf..76e77a31d 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,ravel,rietz,senfl,sibelius] {
 		ferm::rule { 'dsa-rsync':
 			domain      => '(ip ip6)',
 			description => 'Allow rsync access',
@@ -19,6 +19,14 @@ 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-amqp':
 				description     => 'Allow rabbitmq access',
 				rule            => '&SERVICE_RANGE(tcp, 5672, ( 5.153.231.240/27 172.29.123.0/24 ))'
@@ -82,7 +90,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)'
@@ -163,34 +171,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: {}
@@ -413,13 +401,12 @@ class ferm::per-host {
 			}
 			@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 +414,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: {}
 	}
@@ -476,7 +468,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 ))'
 			}
 		}
 	}