Merge pull request camptocamp#6 from saz/enable-service

raphink · raphink · commit 290524157010 · 2012-12-11T08:06:36.000-08:00
change reload and service behavior
diff --git a/manifests/server.pp b/manifests/server.pp
@@ -1,4 +1,6 @@
-class nfs::server {
+class nfs::server(
+  $service_enable = true,
+) {
   case $operatingsystem {
     Debian,Ubuntu:  { include nfs::server::debian}
     default:        { notice "Unsupported operatingsystem ${operatingsystem}" }
diff --git a/manifests/server/debian.pp b/manifests/server/debian.pp
@@ -8,12 +8,13 @@
   
   exec {"reload_nfs_srv":
     command     => "/etc/init.d/nfs-kernel-server reload",
+    onlyif      => '/etc/init.d/nfs-kernel-server status',
     refreshonly => true,
     require     => Package["nfs-kernel-server"]
   }
 
   service {"nfs-kernel-server":
-    enable  => "true",
+    enable  => $nfs::server::service_enable,
     pattern => "nfsd"
   }
 

Original file line number	Diff line number	Diff line change
`@@ -8,12 +8,13 @@`
`8`	`8`
`9`	`9`	`exec {"reload_nfs_srv":`
`10`	`10`	`command => "/etc/init.d/nfs-kernel-server reload",`
	`11`	`+ onlyif => '/etc/init.d/nfs-kernel-server status',`
`11`	`12`	`refreshonly => true,`
`12`	`13`	`require => Package["nfs-kernel-server"]`
`13`	`14`	`}`
`14`	`15`
`15`	`16`	`service {"nfs-kernel-server":`
`16`		`- enable => "true",`
	`17`	`+ enable => $nfs::server::service_enable,`
`17`	`18`	`pattern => "nfsd"`
`18`	`19`	`}`
`19`	`20`