Dedicated block for absent case

[mirror/dsa-puppet.git] / modules / apache2 / manifests / site.pp

diff --git a/modules/apache2/manifests/site.pp b/modules/apache2/manifests/site.pp
index 9ab7635..2a7257b 100644 (file)
--- a/modules/apache2/manifests/site.pp
+++ b/modules/apache2/manifests/site.pp
@@ -35,25 +35,25 @@ define apache2::site (
                        ensure  => $ensure,
                        content => $content,
                        require => Package['apache2'],
-                       notify  => Service['apache2'],
+                       notify  => Exec['service apache2 reload'],
                }
        } else {
                file { $target:
                        ensure  => $ensure,
                        source  => $source,
                        require => Package['apache2'],
-                       notify  => Service['apache2'],
+                       notify  => Exec['service apache2 reload'],
                }
        }
 
        if $::lsbmajdistrelease <= 7 {
-               $symlink = "/etc/apache2/sites-enabled/${name}":
+               $symlink = "/etc/apache2/sites-enabled/${name}"
        } else {
-               $symlink = "/etc/apache2/sites-enabled/${name}.conf":
+               $symlink = "/etc/apache2/sites-enabled/${name}.conf"
 
                file { "/etc/apache2/sites-enabled/${name}":
                        ensure => absent,
-                       notify => Service['apache2'],
+                       notify  => Exec['service apache2 reload'],
                }
        }
 
@@ -61,12 +61,12 @@ define apache2::site (
                file { $symlink:
                        ensure => link,
                        target => $link_target,
-                       notify => Service['apache2'],
+                       notify  => Exec['service apache2 reload'],
                }
        } else {
                file { $symlink:
                        ensure => absent,
-                       notify => Service['apache2'],
+                       notify  => Exec['service apache2 reload'],
                }
        }
 }