X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fapache2%2Fmanifests%2Fsite.pp;h=dc9b1ced1f796f00d6e547e391673275f11d43fe;hb=29cbe59430d1e7d7d5575579b48513c56227e2f7;hp=2a7257ba76e1cd543fa65ec8e1e594539cb0cfe8;hpb=8e104735c829bddd66c9f0aacfa0f41e92eed57d;p=mirror%2Fdsa-puppet.git

diff --git a/modules/apache2/manifests/site.pp b/modules/apache2/manifests/site.pp
index 2a7257ba7..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 {