Merge remote-tracking branch 'waldi-salsa/godard-apache' into HEAD

[mirror/dsa-puppet.git] / modules / systemd / manifests / override.pp

diff --git a/modules/systemd/manifests/override.pp b/modules/systemd/manifests/override.pp
index 337d0e4..24403f6 100644 (file)
--- a/modules/systemd/manifests/override.pp
+++ b/modules/systemd/manifests/override.pp
@@ -21,26 +21,29 @@ define systemd::override (
                                        ensure  => $ensure,
                                        content => $content,
                                        notify  => [ Exec['systemctl daemon-reload'],
-                                                    Service["{$name}"],
+                                                    Service["${name}"],
                                                    ]
-                                       }
                                }
                        } elsif $source {
                                file { "${dest}":
                                        ensure  => $ensure,
                                        source  => $source,
                                        notify  => [ Exec['systemctl daemon-reload'],
-                                                    Service["{$name}"],
-                                                   ]
+                                                    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