X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Fmanifests%2Fper-host.pp;h=e7016c8960dcc4f59317aad6e1ff4204c8c29981;hb=09a1d7f58dd757a6d861cdfdfbecd56b5f622d62;hp=3ab0d631ad6097933996415f1c4a3bdbac29758b;hpb=7b062baee2e55c34f6c71a8f10919492de0bb2c5;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/manifests/per-host.pp b/modules/ferm/manifests/per-host.pp
index 3ab0d631a..e7016c896 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,10 @@ 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 ))'
@@ -86,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)'
@@ -167,16 +171,6 @@ 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',
-			}
-		}
 		lw07: {
 			@ferm::rule { 'dsa-snapshot-varnish':
 				rule            => '&SERVICE(tcp, 6081)',
@@ -269,12 +263,12 @@ 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: {
@@ -330,12 +324,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':
@@ -376,44 +370,54 @@ 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: {
 			@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.187/32 2001:1af8:4020:b030:deb::187/128 ))'
+				rule            => '&SERVICE_RANGE(tcp, 5433, ( 185.17.185.187/32 ))'
+			}
+			@ferm::rule { 'dsa-postgres-replication6':
+				domain          => 'ip6',
+				description     => 'Allow postgress access',
+				rule            => '&SERVICE_RANGE(tcp, 5433, ( 2001:1af8:4020:b030:deb::187/128 ))'
 			}
 		}
 		lw07: {
 			@ferm::rule { 'dsa-postgres-snapshot':
 				description     => 'Allow postgress access',
-				rule            => '&SERVICE_RANGE(tcp, 5439, ( 185.17.185.176/28 2001:1af8:4020:b030::/64 ))'
+				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: {}