From: Stephen Gran <steve@lobefin.net>
Date: Thu, 3 May 2012 06:17:22 +0000 (+0100)
Subject: update for new idiom
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=3395dcb371c4b2200f14dfc3106b17d2957de3b9;p=mirror%2Fdsa-puppet.git

update for new idiom

Signed-off-by: Stephen Gran <steve@lobefin.net>
---

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index 082b8631c..d2e499837 100644
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -14,7 +14,7 @@ class apache2 {
 
 	apache2::site { '00-default':
 		site     => 'default-debian.org',
-		template => 'apache2/default-debian.org.erb',
+		content  => template('apache2/default-debian.org.erb'),
 	}
 
 	apache2::site { '000-default':
diff --git a/modules/apache2/manifests/site.pp b/modules/apache2/manifests/site.pp
index 8fa5fdf52..7acbfc649 100644
--- a/modules/apache2/manifests/site.pp
+++ b/modules/apache2/manifests/site.pp
@@ -1,16 +1,20 @@
 define apache2::site (
-	$config = undef,
-	$template = false,
-	$ensure = present,
-	$site = undef
+	$source=undef,
+	$content=false,
+	$ensure=present,
+	$site=undef
 ) {
 
 	include apache2
 
-	if $ensure == present {
-		if ! ($config or $template) {
-			fail ( "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 {
@@ -27,22 +31,19 @@ define apache2::site (
 		default => fail ( "Unknown ensure value: '$ensure'" ),
 	}
 
-	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  => Service['apache2'],
 		}
-		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  => Service['apache2'],
 		}
 	}
 
diff --git a/modules/roles/manifests/backports_mirror.pp b/modules/roles/manifests/backports_mirror.pp
index 2d794859a..90ba66b1d 100644
--- a/modules/roles/manifests/backports_mirror.pp
+++ b/modules/roles/manifests/backports_mirror.pp
@@ -1,12 +1,12 @@
 class roles::backports_mirror {
 	apache2::site { '010-backports.debian.org':
 		site   => 'backports.debian.org',
-		config => 'puppet:///modules/roles/backports_mirror/backports.debian.org',
+		source => 'puppet:///modules/roles/backports_mirror/backports.debian.org',
 	}
 
 	apache2::site { '010-www.backports.org':
 		site   => 'www.backports.org',
-		config => 'puppet:///modules/roles/backports_mirror/www.backports.org',
+		source => 'puppet:///modules/roles/backports_mirror/www.backports.org',
 	}
 
 	apache2::module { 'rewrite': }
diff --git a/modules/roles/manifests/ftp-upcoming_mirror.pp b/modules/roles/manifests/ftp-upcoming_mirror.pp
index 8c12dd3d1..02abb6f3a 100644
--- a/modules/roles/manifests/ftp-upcoming_mirror.pp
+++ b/modules/roles/manifests/ftp-upcoming_mirror.pp
@@ -2,6 +2,6 @@ class roles::ftp-upcoming_mirror {
 
 	apache2::site { '010-ftp-upcoming.debian.org':
 		site   => 'ftp-upcoming.debian.org',
-		config => 'puppet:///modules/roles/ftp-upcoming_mirror/ftp-upcoming.debian.org',
+		source => 'puppet:///modules/roles/ftp-upcoming_mirror/ftp-upcoming.debian.org',
 	}
 }
diff --git a/modules/roles/manifests/security_mirror.pp b/modules/roles/manifests/security_mirror.pp
index 9ed98409d..4608f6d5d 100644
--- a/modules/roles/manifests/security_mirror.pp
+++ b/modules/roles/manifests/security_mirror.pp
@@ -2,7 +2,7 @@ class roles::security_mirror {
 
 	apache2::site { '010-security.debian.org':
 		site   => 'security.debian.org',
-		config => 'puppet:///modules/roles/security_mirror/security.debian.org'
+		source => 'puppet:///modules/roles/security_mirror/security.debian.org'
 	}
 
 	vsftpd::site { 'security':
diff --git a/modules/roles/manifests/www_mirror.pp b/modules/roles/manifests/www_mirror.pp
index f89820806..a5d925f8a 100644
--- a/modules/roles/manifests/www_mirror.pp
+++ b/modules/roles/manifests/www_mirror.pp
@@ -2,6 +2,6 @@ class roles::www_mirror {
 
 	apache2::site { '010-www.debian.org':
 		site   => 'www.debian.org',
-		config => 'puppet:///modules/roles/www_mirror/www.debian.org',
+		source => 'puppet:///modules/roles/www_mirror/www.debian.org',
 	}
 }