X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fapache2%2Fmanifests%2Fsite.pp;h=dc9b1ced1f796f00d6e547e391673275f11d43fe;hb=17593e407b232569513785262043a0e0bda75e0f;hp=263c6d8a692a82327ca864fd52f11a681e6c32f2;hpb=e79a66a57ac3dfef9e1d6c37e82692f3483e2646;p=mirror%2Fdsa-puppet.git

diff --git a/modules/apache2/manifests/site.pp b/modules/apache2/manifests/site.pp
index 263c6d8a6..dc9b1ced1 100644
--- a/modules/apache2/manifests/site.pp
+++ b/modules/apache2/manifests/site.pp
@@ -1,14 +1,20 @@
 define apache2::site (
-	$config = undef,
-	$template = false,
-	$ensure = present,
-	$site = undef
+	$source=undef,
+	$content=undef,
+	$ensure=present,
+	$site=undef
 ) {
 
 	include apache2
 
-	if ! ($config or $template) {
-		err ( "No configuration found for ${name}" )
+	case $ensure {
+		present: {
+			if ! ($source or $content) {
+				fail ( "No configuration found for ${name}" )
+			}
+		}
+		absent:  {}
+		default: { fail ( "Unknown ensure value: '$ensure'" ) }
 	}
 
 	if $site {
@@ -21,39 +27,42 @@ define apache2::site (
 
 	$link_target = $ensure ? {
 		present => $target,
-		absent  => absent,
-		default => err ( "Unknown ensure value: '$ensure'" ),
+		absent  => absent
 	}
 
-	case $template {
-		false: {
-			file { $target:
-				ensure  => $ensure,
-				source  => $config,
-				require => Package['apache2'],
-				notify  => Service['apache2'],
-			}
+	if $content {
+		file { $target:
+			ensure  => $ensure,
+			content => $content,
+			require => Package['apache2'],
+			notify  => Exec['service apache2 reload'],
 		}
-		default: {
-			file { $target:
-				ensure  => $ensure,
-				content => template($template),
-				require => Package['apache2'],
-				notify  => Service['apache2'],
-			}
+	} else {
+		file { $target:
+			ensure  => $ensure,
+			source  => $source,
+			require => Package['apache2'],
+			notify  => Exec['service apache2 reload'],
 		}
 	}
 
+	$symlink = "/etc/apache2/sites-enabled/${name}.conf"
+
+	file { "/etc/apache2/sites-enabled/${name}":
+		ensure => absent,
+		notify  => Exec['service apache2 reload'],
+	}
+
 	if $ensure == present {
-		file { "/etc/apache2/sites-enabled/${name}":
+		file { $symlink:
 			ensure => link,
 			target => $link_target,
-			notify => Service['apache2'],
+			notify  => Exec['service apache2 reload'],
 		}
 	} else {
-		file { "/etc/apache2/sites-enabled/${name}":
+		file { $symlink:
 			ensure => absent,
-			notify => Service['apache2'],
+			notify  => Exec['service apache2 reload'],
 		}
 	}
 }