From 7c6f5c000a748c0e25bfce6af632dac81fde99d0 Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Mon, 17 Jul 2017 15:22:23 +0200
Subject: [PATCH] Use systemd::override instead of manual
 bacula-fd.service.d/user.conf

---
 modules/bacula/files/bacula-fd-systemd |  3 ---
 modules/bacula/manifests/client.pp     | 23 ++++++++++++-----------
 2 files changed, 12 insertions(+), 14 deletions(-)
 delete mode 100644 modules/bacula/files/bacula-fd-systemd

diff --git a/modules/bacula/files/bacula-fd-systemd b/modules/bacula/files/bacula-fd-systemd
deleted file mode 100644
index ff6ca2498..000000000
--- a/modules/bacula/files/bacula-fd-systemd
+++ /dev/null
@@ -1,3 +0,0 @@
-[Service]
-ExecStart=
-ExecStart=/usr/sbin/bacula-fd -c $CONFIG -f -u bacula -k
diff --git a/modules/bacula/manifests/client.pp b/modules/bacula/manifests/client.pp
index 2918a7938..d016e0d0d 100644
--- a/modules/bacula/manifests/client.pp
+++ b/modules/bacula/manifests/client.pp
@@ -51,23 +51,24 @@ class bacula::client inherits bacula {
 		notify  => Service['bacula-fd'],
 	}
 	if (versioncmp($::lsbmajdistrelease, '9') >= 0 and $systemd) {
-		file { '/etc/systemd/system/bacula-fd.service.d':
-			ensure	=> directory,
-			mode	=> '0755',
-			owner	=> root,
-			group	=> root,
-		}
+		# old name for the override content
 		file { '/etc/systemd/system/bacula-fd.service.d/user.conf':
-			source	=> 'puppet:///modules/bacula/bacula-fd-systemd',
-			mode	=> '0400',
-			owner	=> root,
-			group	=> root,
-			notify	=> Exec['systemctl daemon-reload'],
+			ensure	=> absent,
+		}
+		systemd::override { 'bacula-fd':
+			content => @(EOT)
+				[Service]
+				ExecStart=
+				ExecStart=/usr/sbin/bacula-fd -c $CONFIG -f -u bacula -k
+				| EOT
 		}
 	} else {
 		file { '/etc/systemd/system/bacula-fd.service.d/user.conf':
 			ensure	=> absent,
 		}
+		systemd::override { 'bacula-fd':
+			ensure	=> absent,
+		}
 	}
 
 	@ferm::rule { 'dsa-bacula-fd-v4':
-- 
2.20.1