Fix apache2/jessie conf-enabled symlinks

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

diff --git a/modules/apache2/manifests/config.pp b/modules/apache2/manifests/config.pp
index f44dc019f11f52ada0d5b0c40d51e0e2b34844d1..4faa33f156a3525eaa66c9bc2efac3c5bdf97c2c 100644 (file)
--- a/modules/apache2/manifests/config.pp
+++ b/modules/apache2/manifests/config.pp
@@ -49,14 +49,14 @@ define apache2::config (
                        }
                }
 
-               $link_ensure = $ensure == present ? {
-                       present => 'link',
-                       absent  => 'absent'
+               $link_ensure = $ensure ? {
+                       present => link,
+                       absent  => absent
                }
 
-               file { "/etc/apache2/conf-enabled/${name}":
+               file { "/etc/apache2/conf-enabled/${name}.conf":
                        ensure => $link_ensure,
-                       target => "/etc/apache2/conf-available/${base}.conf",
+                       target => "../conf-available/${name}.conf",
                        notify => Service['apache2'],
                }
        }