puppet 4 foo

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

diff --git a/modules/apache2/manifests/site.pp b/modules/apache2/manifests/site.pp
index 4588a60..ff1ee20 100644 (file)
--- a/modules/apache2/manifests/site.pp
+++ b/modules/apache2/manifests/site.pp
@@ -35,27 +35,38 @@ 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 $ensure == present {
+       if $::lsbmajdistrelease <= '7' {
+               $symlink = "/etc/apache2/sites-enabled/${name}"
+       } else {
+               $symlink = "/etc/apache2/sites-enabled/${name}.conf"
+
                file { "/etc/apache2/sites-enabled/${name}":
+                       ensure => absent,
+                       notify  => Exec['service apache2 reload'],
+               }
+       }
+
+       if $ensure == present {
+               file { $symlink:
                        ensure => link,
                        target => $link_target,
-                       notify => Service['apache2'],
+                       notify  => Exec['service apache2 reload'],
                }
        } else {
-               file { "/etc/apache2/sites-enabled/${name}":
+               file { $symlink:
                        ensure => absent,
-                       notify => Service['apache2'],
+                       notify  => Exec['service apache2 reload'],
                }
        }
 }