From 34d196bc7c3ff230acf6efa076ec5aba42b06f82 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Tue, 10 Sep 2019 09:34:29 +0200 Subject: [PATCH] rsync::site cleanup: move file and service names into variable --- modules/rsync/manifests/site.pp | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/modules/rsync/manifests/site.pp b/modules/rsync/manifests/site.pp index 45836dfff..d29413945 100644 --- a/modules/rsync/manifests/site.pp +++ b/modules/rsync/manifests/site.pp @@ -30,7 +30,11 @@ define rsync::site ( mode => '0444', } - file { "/etc/systemd/system/rsyncd-${name}@.service": + $service_file = "/etc/systemd/system/rsyncd-${name}@.service" + $socket_file = "/etc/systemd/system/rsyncd-${name}.socket" + $systemd_service = "rsyncd-${name}.socket" + + file { $service_file: ensure => $ensure, content => template('rsync/systemd-rsyncd.service.erb'), owner => 'root', @@ -40,7 +44,7 @@ define rsync::site ( notify => Exec['systemctl daemon-reload'], } - file { "/etc/systemd/system/rsyncd-${name}.socket": + file { $socket_file: ensure => $ensure, content => template('rsync/systemd-rsyncd.socket.erb'), owner => 'root', @@ -49,13 +53,13 @@ define rsync::site ( notify => Exec['systemctl daemon-reload'], } - service { "rsyncd-${name}.socket": + service { $systemd_service: ensure => $ensure_service, enable => $ensure_enable, notify => Exec['systemctl daemon-reload'], subscribe => [ - File["/etc/systemd/system/rsyncd-${name}@.service"], - File["/etc/systemd/system/rsyncd-${name}.socket"], + File[$service_file], + File[$socket_file], ], provider => systemd, } -- 2.20.1