X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fapache2%2Fmanifests%2Fconfig.pp;fp=modules%2Fapache2%2Fmanifests%2Fconfig.pp;h=9a11115012d3e6aa70bfaa1e5d18962d37d103a4;hb=2ddafbd75b7bde2fac3e5293b824c727c5b3105a;hp=b67ddbee75e5ccdb864abf8874dfab4ef81f20ad;hpb=3739a7ac3dbfcfbc7c26595b53c3da772c779de4;p=mirror%2Fdsa-puppet.git

diff --git a/modules/apache2/manifests/config.pp b/modules/apache2/manifests/config.pp
index b67ddbee7..9a1111501 100644
--- a/modules/apache2/manifests/config.pp
+++ b/modules/apache2/manifests/config.pp
@@ -1,10 +1,14 @@
-define apache2::config($config = undef, $template = undef, $ensure = present) {
+define apache2::config (
+	$source=undef,
+	$content=undef,
+	$ensure=present
+) {
 
 	include apache2
 
 	case $ensure {
 		present: {
-			if ! ($config or $template) {
+			if ! ($source or $content) {
 				fail ( "No configuration found for ${name}" )
 			}
 		}
@@ -12,17 +16,17 @@ define apache2::config($config = undef, $template = undef, $ensure = present) {
 		default: { fail ( "Unknown ensure value: '$ensure'" ) }
 	}
 
-	if $template {
+	if $content {
 		file { "/etc/apache2/conf.d/${name}":
 			ensure  => $ensure,
-			content => template($template),
+			content => $content,
 			require => Package['apache2'],
 			notify  => Service['apache2'],
 		}
 	} else {
 		file { "/etc/apache2/conf.d/${name}":
 			ensure  => $ensure,
-			source  => $config,
+			source  => $source,
 			require => Package['apache2'],
 			notify  => Service['apache2'],
 		}