From: Peter Palfrader <peter@palfrader.org>
Date: Tue, 10 Sep 2019 07:37:56 +0000 (+0200)
Subject: rsync::site cleanup: try to fix ordering when we remove a service
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=f0de82d93ec4a3d41057d8c621a177f19900ee7d;p=mirror%2Fdsa-puppet.git

rsync::site cleanup: try to fix ordering when we remove a service
---

diff --git a/modules/rsync/manifests/site.pp b/modules/rsync/manifests/site.pp
index d29413945..96b1ef2e6 100644
--- a/modules/rsync/manifests/site.pp
+++ b/modules/rsync/manifests/site.pp
@@ -34,6 +34,24 @@ define rsync::site (
 	$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'),
@@ -57,11 +75,9 @@ define rsync::site (
 		ensure   => $ensure_service,
 		enable   => $ensure_enable,
 		notify   => Exec['systemctl daemon-reload'],
-		subscribe => [
-			File[$service_file],
-			File[$socket_file],
-		],
 		provider => systemd,
+		before    => $service_before,
+		subscribe => $service_subscribe,
 	}
 
 	if $sslname {