X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnfs-server%2Fmanifests%2Finit.pp;h=a9e4758d7157afe8fa81e3521067e7c42af55482;hb=445298485a519129343f5009d74cb2b28a697b67;hp=586bcb53030f864aa95487355c52661a8dc421b1;hpb=86b076a671944fa76ee3fe291be16a93982798e0;p=mirror%2Fdsa-puppet.git

diff --git a/modules/nfs-server/manifests/init.pp b/modules/nfs-server/manifests/init.pp
index 586bcb530..a9e4758d7 100644
--- a/modules/nfs-server/manifests/init.pp
+++ b/modules/nfs-server/manifests/init.pp
@@ -1,31 +1,60 @@
 class nfs-server {
 
-    include ferm::nfs-server
+	package { [
+			'nfs-common',
+			'nfs-kernel-server'
+		]:
+		ensure => installed
+	}
 
-    package {
-        nfs-common: ensure => installed;
-        nfs-kernel-server: ensure => installed;
-    }
+	service { 'nfs-common':
+		hasstatus   => false,
+		status      => '/bin/true',
+	}
+	service { 'nfs-kernel-server':
+		hasstatus   => false,
+		status      => '/bin/true',
+	}
 
-    file {
-        "/etc/default/nfs-common":
-            source  => "puppet:///nfs-server/nfs-common.default"),
-            require => Package["nfs-common"],
-            notify  => Exec["nfs-common restart"];
-        "/etc/default/nfs-kernel-server":
-            source  => "puppet:///nfs-server/nfs-kernel-server.default"),
-            require => Package["nfs-kernel-server"],
-            notify  => Exec["nfs-kernel-server restart"];
-        "/etc/modprobe.d/lockd.local":
-            source  => "puppet:///nfs-server/lockd.local.modprobe");
-    }
+	@ferm::rule { 'dsa-portmap':
+		domain      => '(ip ip6)',
+		description => 'Allow portmap access',
+		rule        => '&TCP_UDP_SERVICE(111)'
+	}
+	@ferm::rule { 'dsa-nfs':
+		domain      => '(ip ip6)',
+		description => 'Allow nfsd access',
+		rule        => '&TCP_UDP_SERVICE(2049)'
+	}
+	@ferm::rule { 'dsa-status':
+		domain      => '(ip ip6)',
+		description => 'Allow statd access',
+		rule        => '&TCP_UDP_SERVICE(10000)'
+	}
+	@ferm::rule { 'dsa-mountd':
+		domain      => '(ip ip6)',
+		description => 'Allow mountd access',
+		rule        => '&TCP_UDP_SERVICE(10002)'
+	}
+	@ferm::rule { 'dsa-lockd':
+		domain      => '(ip ip6)',
+		description => 'Allow lockd access',
+		rule        => '&TCP_UDP_SERVICE(10003)'
+	}
 
-    exec {
-        "nfs-common restart":
-            path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
-            refreshonly => true;
-        "nfs-kernel-server restart":
-            path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
-            refreshonly => true;
-    }
+	file { '/etc/default/nfs-common':
+		source  => 'puppet:///modules/nfs-server/nfs-common.default',
+		before  => Package['nfs-common'],
+		notify  => Service['nfs-common'],
+	}
+	file { '/etc/default/nfs-kernel-server':
+		source  => 'puppet:///modules/nfs-server/nfs-kernel-server.default',
+		before  => Package['nfs-kernel-server'],
+		notify  => Service['nfs-kernel-server'],
+	}
+	file { '/etc/modprobe.d/lockd.local':
+		source => 'puppet:///modules/nfs-server/lockd.local.modprobe',
+		before => Package['nfs-common'],
+		notify => Service['nfs-common'],
+	}
 }