X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fapache2%2Fmanifests%2Fconfig.pp;h=4faa33f156a3525eaa66c9bc2efac3c5bdf97c2c;hb=184619433f4bd137cef8fc1454516258dd6541b2;hp=f44dc019f11f52ada0d5b0c40d51e0e2b34844d1;hpb=e9682bb9443eb88a18425c2df56aa815d9621948;p=mirror%2Fdsa-puppet.git

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'],
 		}
 	}