X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Fmanifests%2Fper-host.pp;h=1d3aa5a819be11de45b2a71c475885c42a945697;hb=76edd18877c965044db5f2eb00277a56c572b6d0;hp=2401338063a1b6c26b47f87d3f37d556df8094e0;hpb=823568d2e4cad6f5b1a1a2fad73316f516601f62;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/manifests/per-host.pp b/modules/ferm/manifests/per-host.pp
index 240133806..1d3aa5a81 100644
--- a/modules/ferm/manifests/per-host.pp
+++ b/modules/ferm/manifests/per-host.pp
@@ -74,11 +74,6 @@ class ferm::per-host {
 			}
 		}
 		draghi: {
-			#@ferm::rule { 'dsa-bind':
-			#    domain          => '(ip ip6)',
-			#    description     => 'Allow nameserver access',
-			#    rule            => '&TCP_UDP_SERVICE(53)'
-			#}
 			@ferm::rule { 'dsa-finger':
 				domain          => '(ip ip6)',
 				description     => 'Allow finger access',
@@ -204,6 +199,16 @@ class ferm::per-host {
 		default: {}
 	}
 
+	# solr stuff
+	case $::hostname {
+		stockhausen: {
+			@ferm::rule { 'dsa-solr-jetty':
+				description     => 'Allow jetty access',
+				rule            => '&SERVICE_RANGE(tcp, 8080, ( 82.195.75.100/32 ))'
+			}
+		}
+	}
+
 	# postgres stuff
 	case $::hostname {
 		ullmann: {
@@ -218,17 +223,6 @@ class ferm::per-host {
 				rule            => '&SERVICE_RANGE(tcp, 5452, ( 2607:f8f0:610:4000:216:36ff:fe40:3860/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 ))'
 			}
 		}
-		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 ))'
-			}
-		}
 		franck: {
 			@ferm::rule { 'dsa-postgres-franck':
 				description     => 'Allow postgress access',
@@ -243,12 +237,12 @@ class ferm::per-host {
 		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 ))'
+				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 ))'
 			}
 			@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 ))'
+				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 ))'
 			}
 			@ferm::rule { 'dsa-postgres-dak':
 				description     => 'Allow postgress access',
@@ -304,6 +298,17 @@ class ferm::per-host {
 				description     => 'Allow postgress access4',
 				rule            => '&SERVICE_RANGE(tcp, 5438, ( 206.12.19.0/24 ))'
 			}
+		chopin: {
+			@ferm::rule { 'dsa-postgres-backup':
+				# ubc, wuit
+				description     => 'Allow postgress access',
+				rule            => '&SERVICE_RANGE(tcp, 5432, ( 5.153.231.12/32 ))'
+			}
+			@ferm::rule { 'dsa-postgres-backup6':
+				domain          => 'ip6',
+				description     => 'Allow postgress access',
+				rule            => '&SERVICE_RANGE(tcp, 5432, ( 2001:41c8:1000:21::21:12/128 ))'
+			}
 
 		}
 		default: {}