Merge pull request #120 from cschwede/feature/master/configurable_pidfile

Add option to change pid_file setting

Author: binford2k

README.markdown

@@ -266,6 +266,10 @@ Rsync comment.
 
 File containing motd info.
 
+##### `pid_file`
+
+PID file. Defaults to /var/run/rsyncd.pid. The pid file parameter won't be applied if set to "UNSET"; rsyncd will not use a PID file in this case.
+
 ##### `read_only`
 
 yes||no 

manifests/server.pp

@@ -10,6 +10,7 @@
   $use_xinetd = true,
   $address    = '0.0.0.0',
   $motd_file  = 'UNSET',
+  Variant[Enum['UNSET'], Stdlib::Absolutepath] $pid_file = '/var/run/rsyncd.pid',
   $use_chroot = 'yes',
   $uid        = 'nobody',
   $gid        = 'nobody',

spec/classes/server_spec.rb

@@ -17,6 +17,7 @@
           })
           is_expected.to contain_concat__fragment('rsyncd_conf_header').with_content(/^use chroot\s*=\s*yes$/)
           is_expected.to contain_concat__fragment('rsyncd_conf_header').with_content(/^address\s*=\s*0.0.0.0$/)
+          is_expected.to contain_concat__fragment('rsyncd_conf_header').with_content(/^pid file\s*=\s*\/var\/run\/rsyncd.pid$/)
         }
       end
 
@@ -48,6 +49,16 @@
         }
       end
 
+      describe 'when unsetting pid file' do
+        let :params do
+          { :pid_file => 'UNSET' }
+        end
+
+        it {
+          is_expected.not_to contain_concat__fragment('rsyncd_conf_header').with_content(/^pid file\s*=/)
+        }
+      end
+
       describe 'when overriding use_chroot' do
         let :params do
           { :use_chroot => 'no' }

templates/header.erb

@@ -1,7 +1,9 @@
 # This file is being maintained by Puppet.
 # DO NOT EDIT
 
-pid file = /var/run/rsyncd.pid
+<% if @pid_file != 'UNSET' -%>
+pid file = <%= @pid_file %>
+<% end -%>
 uid = <%= @uid %>
 gid = <%= @gid %>
 use chroot = <%= @use_chroot %>