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 082b8631ccf5252eeab193e18c66271be3fa35b9..d2e499837db7d2e0379f8081d3f11529a10cc3b6 100644 (file)
--- 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 8fa5fdf526097df06ce8a681d4acb282848c0c5c..7acbfc6495509bb046868f904f2844b9da36a3d3 100644 (file)
--- 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 2d794859a7546b0a26089ded4a8aea5492ef34c9..90ba66b1d4d2b07017c87de9457a61569c511558 100644 (file)
--- 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 8c12dd3d1d02d321dca38731839f06165fe46129..02abb6f3a64c78bb8faad5c4feaae5670cc0eda0 100644 (file)
--- 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 9ed98409d57c2f9bc19271e743954a8e17fcc910..4608f6d5ded616425cc5e6543d9e97174e14341a 100644 (file)
--- 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 f898208068ade94ca0b5bca290018f7187c33e38..a5d925f8acf2ecdb10d1b53b82ac5e210653fb6c 100644 (file)
--- 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',
        }
 }