X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fapache2%2Fmanifests%2Fconfig.pp;h=13697cba9cfc2af3c3a1a1e36ba1f5367ead067d;hb=1bb6f328d7592ff0b3a8b01dff469818a1cc924c;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..13697cba9 100644
--- a/modules/apache2/manifests/config.pp
+++ b/modules/apache2/manifests/config.pp
@@ -1,6 +1,7 @@
 define apache2::config (
 	$source=undef,
 	$content=undef,
+	$nocontentok=undef,
 	$ensure=present
 ) {
 
@@ -8,56 +9,43 @@ define apache2::config (
 
 	case $ensure {
 		present: {
-			if ! ($source or $content) {
+			if ! ($source or $content or $nocontentok) {
 				fail ( "No configuration found for ${name}" )
 			}
-		}
-		absent:  {}
-		default: { fail ( "Unknown ensure value: '$ensure'" ) }
-	}
 
-	if $::lsbmajdistrelease <= 7 {
-		if $content {
-			file { "/etc/apache2/conf.d/${name}":
-				ensure  => $ensure,
-				content => $content,
-				require => Package['apache2'],
-				notify  => Service['apache2'],
-			}
-		} else {
-			file { "/etc/apache2/conf.d/${name}":
-				ensure  => $ensure,
-				source  => $source,
-				require => Package['apache2'],
-				notify  => Service['apache2'],
+			if $content {
+				file { "/etc/apache2/conf-available/${name}.conf":
+					ensure  => $ensure,
+					content => $content,
+					require => Package['apache2'],
+					notify  => Exec['service apache2 reload'],
+				}
+			} elsif $source {
+				file { "/etc/apache2/conf-available/${name}.conf":
+					ensure  => $ensure,
+					source  => $source,
+					require => Package['apache2'],
+					notify  => Exec['service apache2 reload'],
+				}
 			}
 		}
-	} else {
-		if $content {
-			file { "/etc/apache2/conf-available/${name}.conf":
-				ensure  => $ensure,
-				content => $content,
-				require => Package['apache2'],
-				notify  => Service['apache2'],
-			}
-		} else {
+		absent:  {
 			file { "/etc/apache2/conf-available/${name}.conf":
 				ensure  => $ensure,
-				source  => $source,
 				require => Package['apache2'],
-				notify  => Service['apache2'],
+				notify  => Exec['service apache2 reload'],
 			}
 		}
+		default: { fail ( "Unknown ensure value: '$ensure'" ) }
+	}
+	$link_ensure = $ensure ? {
+		present => link,
+		absent  => absent
+	}
 
-		$link_ensure = $ensure == present ? {
-			present => 'link',
-			absent  => 'absent'
-		}
-
-		file { "/etc/apache2/conf-enabled/${name}":
-			ensure => $link_ensure,
-			target => "/etc/apache2/conf-available/${base}.conf",
-			notify => Service['apache2'],
-		}
+	file { "/etc/apache2/conf-enabled/${name}.conf":
+		ensure => $link_ensure,
+		target => "../conf-available/${name}.conf",
+		notify  => Exec['service apache2 reload'],
 	}
 }