From: Peter Palfrader <peter@palfrader.org>
Date: Tue, 10 Sep 2019 08:00:00 +0000 (+0200)
Subject: move rsync stunnels also to dsa_systemd::socket_service.  This should be a nop
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;ds=inline;h=cfff8d7ad1e31e2a46e78952410f5cfde00401e5;p=mirror%2Fdsa-puppet.git

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 2ae703853..f5f412be9 100644
--- 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":