Remove wheezy-supporting cruft

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

diff --git a/modules/apache2/manifests/site.pp b/modules/apache2/manifests/site.pp
index 7acbfc6..dc9b1ce 100644 (file)
--- a/modules/apache2/manifests/site.pp
+++ b/modules/apache2/manifests/site.pp
@@ -1,6 +1,6 @@
 define apache2::site (
        $source=undef,
-       $content=false,
+       $content=undef,
        $ensure=present,
        $site=undef
 ) {
@@ -27,8 +27,7 @@ define apache2::site (
 
        $link_target = $ensure ? {
                present => $target,
-               absent  => absent,
-               default => fail ( "Unknown ensure value: '$ensure'" ),
+               absent  => absent
        }
 
        if $content {
@@ -36,27 +35,34 @@ 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'],
                }
        }
 
+       $symlink = "/etc/apache2/sites-enabled/${name}.conf"
+
+       file { "/etc/apache2/sites-enabled/${name}":
+               ensure => absent,
+               notify  => Exec['service apache2 reload'],
+       }
+
        if $ensure == present {
-               file { "/etc/apache2/sites-enabled/${name}":
+               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'],
                }
        }
 }