move rsync stunnels also to dsa_systemd::socket_service. This should be a nop

diff --git a/modules/rsync/manifests/site.pp b/modules/rsync/manifests/site.pp
index 2ae7038..f5f412b 100644 (file)
--- a/modules/rsync/manifests/site.pp
+++ b/modules/rsync/manifests/site.pp
@@ -41,32 +41,11 @@ define rsync::site (
                        require => File["/etc/ssl/debian/certs/${sslname}.crt-chained"],
                }
 
-               file { "/etc/systemd/system/rsyncd-${name}-stunnel@.service":
-                       ensure  => $ensure,
-                       content => template('rsync/systemd-rsyncd-stunnel.service.erb'),
-                       require => File[$fname_real_stunnel],
-                       notify  => Exec['systemctl daemon-reload'],
-               }
-
-               file { "/etc/systemd/system/rsyncd-${name}-stunnel.socket":
-                       ensure  => $ensure,
-                       content => template('rsync/systemd-rsyncd-stunnel.socket.erb'),
-                       notify  => [
-                               Exec['systemctl daemon-reload'],
-                               Service["rsyncd-${name}-stunnel.socket"]
-                       ],
-               }
-
-               service { "rsyncd-${name}-stunnel.socket":
-                       ensure   => $ensure_service,
-                       enable   => $ensure_enable,
-                       require  => [
-                               Exec['systemctl daemon-reload'],
-                               File["/etc/systemd/system/rsyncd-${name}-stunnel@.service"],
-                               File["/etc/systemd/system/rsyncd-${name}-stunnel.socket"],
-                               Service["rsyncd-${name}.socket"],
-                       ],
-                       provider => systemd,
+               dsa_systemd::socket_service { "rsyncd-${name}-stunnel":
+                       ensure          => $ensure,
+                       service_content => template('rsync/systemd-rsyncd-stunnel.service.erb'),
+                       socket_content  => template('rsync/systemd-rsyncd-stunnel.socket.erb'),
+                       require         => File[$fname_real_stunnel],
                }
 
                ferm::rule { "rsync-${name}-ssl":