make puppet-lint happy and make sure we are future proof for puppet 2.8 ( variable scoping )

1 files changed, 18 insertions, 19 deletions

diff --git a/deployment/websites/manifests/pkgcpan.pp b/deployment/websites/manifests/pkgcpan.pp
index 2e306a93..d4d1f8ed 100644
--- a/deployment/websites/manifests/pkgcpan.pp
+++ b/deployment/websites/manifests/pkgcpan.pp
@@ -1,24 +1,23 @@
-class websites { 
-    class pkgcpan inherits base {
-        $vhost = "pkgcpan.$domain"
-        $vhostdir = "$webdatadir/$vhost"
+class websites::pkgcpan {
+    include websites::base
+    $vhost = "pkgcpan.$::domain"
+    $vhostdir = "$websites::base::webdatadir/$vhost"
 
-        apache::vhost_base { "$vhost":
-            location => $vhostdir,
-            options => [ "Indexes" ],
-        }                
+    apache::vhost_base { $vhost:
+        location => $vhostdir,
+        options  => [ 'Indexes' ],
+    }
 
-        file { $vhostdir:
-            ensure => directory,
-        }
+    file { $vhostdir:
+        ensure => directory,
+    }
 
-        package { "perl-Module-Packaged-Generator": }
+    package { 'perl-Module-Packaged-Generator': }
 
-        # FIXME do not run as root ( apache or nobody should enough ) 
-        cron { "update cpanpkg":
-            hour => 23,
-            require => Package['perl-Module-Packaged-Generator'],
-            command => "pkgcpan -q -f $vhostdir/cpan_Mageia.db -d Mageia",
-        }
+    # FIXME do not run as root ( apache or nobody should enough )
+    cron { 'update cpanpkg':
+        hour    => 23,
+        require => Package['perl-Module-Packaged-Generator'],
+        command => "pkgcpan -q -f $vhostdir/cpan_Mageia.db -d Mageia",
     }
-} 
+}