move rsync service/socket setup into a dsa_systemd::socket_service

[mirror/dsa-puppet.git] / modules / rsync / manifests / site.pp

diff --git a/modules/rsync/manifests/site.pp b/modules/rsync/manifests/site.pp
index c1e15c2..2ae7038 100644 (file)
--- a/modules/rsync/manifests/site.pp
+++ b/modules/rsync/manifests/site.pp
@@ -27,48 +27,11 @@ define rsync::site (
                source  => $source,
        }
 
-       $service_file = "/etc/systemd/system/rsyncd-${name}@.service"
-       $socket_file = "/etc/systemd/system/rsyncd-${name}.socket"
-       $systemd_service = "rsyncd-${name}.socket"
-
-       # if we enable the service, we want the files before the service.
-       # if we remove the service, we want the service disabled before the files
-       # go away.
-       $service_subscribe = $ensure ? {
-               present => [
-                       File[$service_file],
-                       File[$socket_file],
-               ],
-               default => [],
-       }
-       $service_before = $ensure ? {
-               present => [],
-               default => [
-                       File[$service_file],
-                       File[$socket_file],
-               ],
-       }
-
-       file { $service_file:
-               ensure  => $ensure,
-               content => template('rsync/systemd-rsyncd.service.erb'),
-               require => File[$fname_real_rsync],
-               notify  => Exec['systemctl daemon-reload'],
-       }
-
-       file { $socket_file:
-               ensure  => $ensure,
-               content => template('rsync/systemd-rsyncd.socket.erb'),
-               notify  => Exec['systemctl daemon-reload'],
-       }
-
-       service { $systemd_service:
-               ensure   => $ensure_service,
-               enable   => $ensure_enable,
-               notify   => Exec['systemctl daemon-reload'],
-               provider => systemd,
-               before    => $service_before,
-               subscribe => $service_subscribe,
+       dsa_systemd::socket_service { "rsyncd-${name}":
+               ensure          => $ensure,
+               service_content => template('rsync/systemd-rsyncd.service.erb'),
+               socket_content  => template('rsync/systemd-rsyncd.socket.erb'),
+               require         => File[$fname_real_rsync],
        }
 
        if $sslname {