From: Peter Palfrader <peter@palfrader.org>
Date: Mon, 17 Jul 2017 13:13:31 +0000 (+0200)
Subject: only notify service if defined
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=25796b13e329fe9fa636c195aeaec518eb511541;p=mirror%2Fdsa-puppet.git

only notify service if defined
---

diff --git a/modules/systemd/manifests/override.pp b/modules/systemd/manifests/override.pp
index 117b16ea9..24403f602 100644
--- a/modules/systemd/manifests/override.pp
+++ b/modules/systemd/manifests/override.pp
@@ -25,25 +25,25 @@ define systemd::override (
 					            ]
 				}
 			} elsif $source {
-				if defined(Service["${name}"]) {
-					$notify = [ Exec['systemctl daemon-reload'], Service["${name}"] ]
-				} else {
-					$notify = [ Exec['systemctl daemon-reload'] ]
-				}
-
 				file { "${dest}":
 					ensure  => $ensure,
 					source  => $source,
-					notify  => $notify,
-				}
+					notify  => [ Exec['systemctl daemon-reload'],
+					             Service["${name}"],
+					           ]
+					}
 			}
 		}
 		absent:  {
+			if defined(Service["${name}"]) {
+				$notify = [ Exec['systemctl daemon-reload'], Service["${name}"] ]
+			} else {
+				$notify = [ Exec['systemctl daemon-reload'] ]
+			}
+
 			file { "${dest}":
 				ensure  => $ensure,
-				notify  => [ Exec['systemctl daemon-reload'],
-				             Service["${name}"],
-				           ]
+				notify  => $notify,
 			}
 			file { "${dir}":
 				ensure => $ensure