X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fapache2%2Fmanifests%2Fsite.pp;h=dc9b1ced1f796f00d6e547e391673275f11d43fe;hb=2d1ec427e3c71ed97101e3dc53b8ece95624d67f;hp=ff1ee20e1d44a1da3d92c2466cbd9bd26b90c35f;hpb=6f2e5fc86e49c12b12eef39fc69e0e810a32c318;p=mirror%2Fdsa-puppet.git

diff --git a/modules/apache2/manifests/site.pp b/modules/apache2/manifests/site.pp
index ff1ee20e1..dc9b1ced1 100644
--- a/modules/apache2/manifests/site.pp
+++ b/modules/apache2/manifests/site.pp
@@ -46,15 +46,11 @@ define apache2::site (
 		}
 	}
 
-	if $::lsbmajdistrelease <= '7' {
-		$symlink = "/etc/apache2/sites-enabled/${name}"
-	} else {
-		$symlink = "/etc/apache2/sites-enabled/${name}.conf"
+	$symlink = "/etc/apache2/sites-enabled/${name}.conf"
 
-		file { "/etc/apache2/sites-enabled/${name}":
-			ensure => absent,
-			notify  => Exec['service apache2 reload'],
-		}
+	file { "/etc/apache2/sites-enabled/${name}":
+		ensure => absent,
+		notify  => Exec['service apache2 reload'],
 	}
 
 	if $ensure == present {