X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fapache2%2Fmanifests%2Fconfig.pp;h=15238a9f30751feb2abeb11d1ef337bece215f2f;hb=43573e9dd5c646169b4d5ecee3f0137b9467c537;hp=4faa33f156a3525eaa66c9bc2efac3c5bdf97c2c;hpb=526bcad243bfa32638641b879e6857539a5656bb;p=mirror%2Fdsa-puppet.git

diff --git a/modules/apache2/manifests/config.pp b/modules/apache2/manifests/config.pp
index 4faa33f15..15238a9f3 100644
--- a/modules/apache2/manifests/config.pp
+++ b/modules/apache2/manifests/config.pp
@@ -1,63 +1,41 @@
+# Install and enable (or disable) an apache config snippet
+#
+# @param source  source of the apache conf file
+# @param content content of the apache conf file
+# @param ensure  present or absent
 define apache2::config (
-	$source=undef,
-	$content=undef,
-	$ensure=present
+  Optional[String] $source = undef,
+  Optional[String] $content = undef,
+  Enum['present','absent'] $ensure = 'present',
 ) {
+  include apache2
 
-	include apache2
+  case $ensure {
+    present: {
+      if ! ($source or $content) {
+        fail ( "No configuration found for ${name}" )
+      }
+    }
+    absent:  {}
+    default: { fail ( "Unknown ensure value: ${ensure}" ) }
+  }
 
-	case $ensure {
-		present: {
-			if ! ($source or $content) {
-				fail ( "No configuration found for ${name}" )
-			}
-		}
-		absent:  {}
-		default: { fail ( "Unknown ensure value: '$ensure'" ) }
-	}
+  file { "/etc/apache2/conf-available/${name}.conf":
+    ensure  => $ensure,
+    content => $content,
+    source  => $source,
+    require => Package['apache2'],
+    notify  => Exec['service apache2 reload'],
+  }
 
-	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'],
-			}
-		}
-	} else {
-		if $content {
-			file { "/etc/apache2/conf-available/${name}.conf":
-				ensure  => $ensure,
-				content => $content,
-				require => Package['apache2'],
-				notify  => Service['apache2'],
-			}
-		} else {
-			file { "/etc/apache2/conf-available/${name}.conf":
-				ensure  => $ensure,
-				source  => $source,
-				require => Package['apache2'],
-				notify  => Service['apache2'],
-			}
-		}
+  $link_ensure = $ensure ? {
+    present => link,
+    absent  => absent
+  }
 
-		$link_ensure = $ensure ? {
-			present => link,
-			absent  => absent
-		}
-
-		file { "/etc/apache2/conf-enabled/${name}.conf":
-			ensure => $link_ensure,
-			target => "../conf-available/${name}.conf",
-			notify => Service['apache2'],
-		}
-	}
+  file { "/etc/apache2/conf-enabled/${name}.conf":
+    ensure => $link_ensure,
+    target => "../conf-available/${name}.conf",
+    notify => Exec['service apache2 reload'],
+  }
 }