From a39666e3ee3a1946cbfb2782990dcc536f24badb Mon Sep 17 00:00:00 2001 From: Tomas Barton Date: Wed, 15 Jul 2020 14:33:01 +0200 Subject: [PATCH] Group nobody doesn't exist on Debian --- manifests/server.pp | 28 ++++++++++++++++++++++------ templates/header.erb | 2 +- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/manifests/server.pp b/manifests/server.pp index 999e662..3e13155 100644 --- a/manifests/server.pp +++ b/manifests/server.pp @@ -12,7 +12,7 @@ $motd_file = 'UNSET', $use_chroot = 'yes', $uid = 'nobody', - $gid = 'nobody', + $gid = undef, $modules = {}, ) inherits rsync { @@ -20,22 +20,38 @@ 'Debian': { $conf_file = '/etc/rsyncd.conf' $servicename = 'rsync' + if $gid { + $mygid = $gid + } else { + $mygid = 'nogroup' + } } - 'Suse': { - $conf_file = '/etc/rsyncd.conf' - $servicename = 'rsyncd' - } - 'RedHat': { + 'Suse', 'RedHat': { $conf_file = '/etc/rsyncd.conf' $servicename = 'rsyncd' + if $gid { + $mygid = $gid + } else { + $mygid = 'nobody' + } } 'FreeBSD': { $conf_file = '/usr/local/etc/rsync/rsyncd.conf' $servicename = 'rsyncd' + if $gid { + $mygid = $gid + } else { + $mygid = 'nobody' + } } default: { $conf_file = '/etc/rsync.conf' $servicename = 'rsync' + if $gid { + $mygid = $gid + } else { + $mygid = 'nobody' + } } } diff --git a/templates/header.erb b/templates/header.erb index 9068847..6f5c3ad 100644 --- a/templates/header.erb +++ b/templates/header.erb @@ -3,7 +3,7 @@ pid file = /var/run/rsyncd.pid uid = <%= @uid %> -gid = <%= @gid %> +gid = <%= @mygid %> use chroot = <%= @use_chroot %> log format = %t %a %m %f %b syslog facility = local3