X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Fmanifests%2Fper-host.pp;h=f6fe718f319bcf08ab953f6d2e6d36ecb62471a6;hb=a0ae58f07e1d5e2ed987ef4c50e559534796e300;hp=d6fbb0a1d34b35962c86f10590b8d7962906ea83;hpb=fac17147967cf162d1e2816273b491fd2bd85f14;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/manifests/per-host.pp b/modules/ferm/manifests/per-host.pp
index d6fbb0a1d..f6fe718f3 100644
--- a/modules/ferm/manifests/per-host.pp
+++ b/modules/ferm/manifests/per-host.pp
@@ -3,6 +3,14 @@ class ferm::per-host {
 		include ferm::zivit
 	}
 
+	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 {
 		piatti,samosa: {
 			@ferm::rule { 'dsa-udd-stunnel':
@@ -10,6 +18,17 @@ class ferm::per-host {
 				rule         => '&SERVICE_RANGE(tcp, http-alt, ( 192.25.206.16 70.103.162.29 217.196.43.134 ))'
 			}
 		}
+		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',
@@ -20,9 +39,13 @@ class ferm::per-host {
 				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':
@@ -216,8 +239,4 @@ REJECT reject-with icmp-admin-prohibited
 		}
 		default: {}
 	}
-
-	if $::rsyncd {
-		include ferm::rsync
-	}
 }