apache 2.4 sites stuff

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

diff --git a/modules/apache2/manifests/site.pp b/modules/apache2/manifests/site.pp
index 7acbfc6495509bb046868f904f2844b9da36a3d3..9ab7635159c0d02f089d349b88017910df73ccb9 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 {
@@ -47,14 +46,25 @@ define apache2::site (
                }
        }
 
-       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 => Service['apache2'],
+               }
+       }
+
+       if $ensure == present {
+               file { $symlink:
                        ensure => link,
                        target => $link_target,
                        notify => Service['apache2'],
                }
        } else {
-               file { "/etc/apache2/sites-enabled/${name}":
+               file { $symlink:
                        ensure => absent,
                        notify => Service['apache2'],
                }