diff --git a/data/os/Debian.yaml b/data/os/Debian.yaml index 96b9ef3..014956b 100644 --- a/data/os/Debian.yaml +++ b/data/os/Debian.yaml @@ -1,3 +1,4 @@ --- rsync::server::conf_file: '/etc/rsyncd.conf' +rsync::server::include_conf_dir: '/etc/rsync.d/' diff --git a/data/os/FreeBSD.yaml b/data/os/FreeBSD.yaml index 071ce09..302f1ef 100644 --- a/data/os/FreeBSD.yaml +++ b/data/os/FreeBSD.yaml @@ -2,3 +2,4 @@ rsync::server::conf_file: '/usr/local/etc/rsync/rsyncd.conf' rsync::server::servicename: 'rsyncd' +rsync::server::include_conf_dir: '/etc/rsync.d/' diff --git a/data/os/RedHat.yaml b/data/os/RedHat.yaml index fa28c7f..b8255f7 100644 --- a/data/os/RedHat.yaml +++ b/data/os/RedHat.yaml @@ -2,3 +2,4 @@ rsync::server::conf_file: '/etc/rsyncd.conf' rsync::server::servicename: 'rsyncd' +rsync::server::include_conf_dir: '/etc/rsync.d/' diff --git a/data/os/Suse.yaml b/data/os/Suse.yaml index fa28c7f..b8255f7 100644 --- a/data/os/Suse.yaml +++ b/data/os/Suse.yaml @@ -2,3 +2,4 @@ rsync::server::conf_file: '/etc/rsyncd.conf' rsync::server::servicename: 'rsyncd' +rsync::server::include_conf_dir: '/etc/rsync.d/' diff --git a/manifests/server.pp b/manifests/server.pp index 9496706..a3c2e89 100644 --- a/manifests/server.pp +++ b/manifests/server.pp @@ -17,6 +17,7 @@ $modules = {}, Optional[String[1]] $package_name = undef, String[1] $conf_file = '/etc/rsync.conf', + String[1] $include_conf_dir = '/etc/rsync.d/', String[1] $servicename = 'rsync', Stdlib::Ensure::Service $service_ensure = 'running', Variant[Boolean, Enum['mask']] $service_enable = true, @@ -80,4 +81,10 @@ create_resources(rsync::server::module, $modules) + concat::fragment { 'rsyncd_conf_footer': + target => $conf_file, + content => template('rsync/footer.erb'), + order => '99_footer', + } + } diff --git a/templates/footer.erb b/templates/footer.erb new file mode 100644 index 0000000..ba44c50 --- /dev/null +++ b/templates/footer.erb @@ -0,0 +1 @@ +&include <%= @include_conf_dir %>