X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnfs_server%2Fmanifests%2Finit.pp;h=e5b25e5691adedb667e02d5d4ab672911c6074b2;hb=a7016fcb7d27ba652c9bbcf800021000c2c17420;hp=5545114f61cb8847f4222915de9e1eff4d416bdf;hpb=c836c2a80e2fd64e4f18cdbba39a7eda1f241e89;p=mirror%2Fdsa-puppet.git

diff --git a/modules/nfs_server/manifests/init.pp b/modules/nfs_server/manifests/init.pp
index 5545114f6..e5b25e569 100644
--- a/modules/nfs_server/manifests/init.pp
+++ b/modules/nfs_server/manifests/init.pp
@@ -17,8 +17,8 @@ class nfs_server {
 	}
 
 	case $::hostname {
-		lw01,lw02,lw03,lw04: {
-			$client_range    = '10.0.0.0/8'
+		lw01,lw02,lw03,lw04,lw09,lw10: {
+			$client_range    = '(172.29.188.0/24)'
 		}
 		milanollo,senfter: {
 			$client_range    = '172.29.122.0/24'
@@ -29,6 +29,9 @@ class nfs_server {
 		gretchaninov: {
 			$client_range    = '172.29.40.0/22'
 		}
+		sibelius: {
+			$client_range    = '192.168.0.14/32'
+		}
 		default: {
 			# Better than 0.0.0.0/0 - we really ought to configure a
 			# client range for them all instead of exporting to the world.
@@ -36,23 +39,23 @@ class nfs_server {
 		}
 	}
 
-	@ferm::rule { 'dsa-portmap':
+	ferm::rule { 'dsa-portmap':
 		description => 'Allow portmap access',
 		rule        => "&TCP_UDP_SERVICE_RANGE(111, $client_range)"
 	}
-	@ferm::rule { 'dsa-nfs':
+	ferm::rule { 'dsa-nfs':
 		description => 'Allow nfsd access',
 		rule        => "&TCP_UDP_SERVICE_RANGE(2049, $client_range)"
 	}
-	@ferm::rule { 'dsa-status':
+	ferm::rule { 'dsa-status':
 		description => 'Allow statd access',
 		rule        => "&TCP_UDP_SERVICE_RANGE(10000, $client_range)"
 	}
-	@ferm::rule { 'dsa-mountd':
+	ferm::rule { 'dsa-mountd':
 		description => 'Allow mountd access',
 		rule        => "&TCP_UDP_SERVICE_RANGE(10002, $client_range)"
 	}
-	@ferm::rule { 'dsa-lockd':
+	ferm::rule { 'dsa-lockd':
 		description => 'Allow lockd access',
 		rule        => "&TCP_UDP_SERVICE_RANGE(10003, $client_range)"
 	}