From: Peter Palfrader <peter@palfrader.org>
Date: Tue, 23 Dec 2014 12:19:19 +0000 (+0000)
Subject: Fix apache2/jessie conf-enabled symlinks
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=526bcad243bfa32638641b879e6857539a5656bb;p=mirror%2Fdsa-puppet.git

Fix apache2/jessie conf-enabled symlinks
---

diff --git a/modules/apache2/manifests/config.pp b/modules/apache2/manifests/config.pp
index f44dc019f..4faa33f15 100644
--- 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'],
 		}
 	}