X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Fmanifests%2Fper-host.pp;h=fa7f295bdef3a6563ef78d4340b5403947c1d03f;hb=169cb77932b427c80d2731ca5938ecd617a5ad57;hp=00537576cd87d947bb827faa4b961f5e3f201caa;hpb=88f2467d50cf475f304e6c806693438f8d599b24;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/manifests/per-host.pp b/modules/ferm/manifests/per-host.pp
index 00537576c..fa7f295bd 100644
--- a/modules/ferm/manifests/per-host.pp
+++ b/modules/ferm/manifests/per-host.pp
@@ -3,7 +3,7 @@ class ferm::per-host {
 		include ferm::zivit
 	}
 
-	if $::hostname in [glinka,klecker,ravel,rietz,senfl,sibelius] {
+	if $::hostname in [glinka,klecker,rietz,sibelius] {
 		ferm::rule { 'dsa-rsync':
 			domain      => '(ip ip6)',
 			description => 'Allow rsync access',
@@ -263,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 ))'
 			}
 		}
 	}
@@ -320,29 +326,29 @@ class ferm::per-host {
 			}
 			@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 ))'