X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnfs-server%2Fmanifests%2Finit.pp;h=a9e4758d7157afe8fa81e3521067e7c42af55482;hb=c782740723175d73c529507307982aae58b295ce;hp=b9ff8885ffd124ae30d3b3a83739bdeb865aa2df;hpb=3eb533e5499e66423bafdedaf6c7d08ead1772de;p=mirror%2Fdsa-puppet.git

diff --git a/modules/nfs-server/manifests/init.pp b/modules/nfs-server/manifests/init.pp
index b9ff8885f..a9e4758d7 100644
--- a/modules/nfs-server/manifests/init.pp
+++ b/modules/nfs-server/manifests/init.pp
@@ -4,18 +4,16 @@ class nfs-server {
 			'nfs-common',
 			'nfs-kernel-server'
 		]:
-			ensure => installed
+		ensure => installed
 	}
 
 	service { 'nfs-common':
 		hasstatus   => false,
 		status      => '/bin/true',
-		refreshonly => true,
 	}
 	service { 'nfs-kernel-server':
 		hasstatus   => false,
 		status      => '/bin/true',
-		refreshonly => true,
 	}
 
 	@ferm::rule { 'dsa-portmap':
@@ -46,15 +44,17 @@ class nfs-server {
 
 	file { '/etc/default/nfs-common':
 		source  => 'puppet:///modules/nfs-server/nfs-common.default',
-		require => Package['nfs-common'],
+		before  => Package['nfs-common'],
 		notify  => Service['nfs-common'],
 	}
 	file { '/etc/default/nfs-kernel-server':
 		source  => 'puppet:///modules/nfs-server/nfs-kernel-server.default',
-		require => Package['nfs-kernel-server'],
+		before  => Package['nfs-kernel-server'],
 		notify  => Service['nfs-kernel-server'],
 	}
 	file { '/etc/modprobe.d/lockd.local':
-		source => 'puppet:///modules/nfs-server/lockd.local.modprobe'
+		source => 'puppet:///modules/nfs-server/lockd.local.modprobe',
+		before => Package['nfs-common'],
+		notify => Service['nfs-common'],
 	}
 }