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

diff --git a/modules/apache2/manifests/site.pp b/modules/apache2/manifests/site.pp
index 6d5ec55f3..dc9b1ced1 100644
--- a/modules/apache2/manifests/site.pp
+++ b/modules/apache2/manifests/site.pp
@@ -46,15 +46,11 @@ define apache2::site (
 		}
 	}
 
-	if versioncmp($::lsbmajdistrelease, '7') <= 0 {
-		$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 {