aboutsummaryrefslogtreecommitdiffstats
path: root/deployment/websites
diff options
context:
space:
mode:
authorMichael Scherer <misc@mageia.org>2012-02-10 14:20:15 +0000
committerMichael Scherer <misc@mageia.org>2012-02-10 14:20:15 +0000
commit5c53dd98d51378c8aab0c8d5bfece2b075191edb (patch)
tree3076b31771f30c8662417588e72daec0760cf373 /deployment/websites
parent3e297d2715935bbb0ee3071665240761868f6d80 (diff)
downloadpuppet-5c53dd98d51378c8aab0c8d5bfece2b075191edb.tar
puppet-5c53dd98d51378c8aab0c8d5bfece2b075191edb.tar.gz
puppet-5c53dd98d51378c8aab0c8d5bfece2b075191edb.tar.bz2
puppet-5c53dd98d51378c8aab0c8d5bfece2b075191edb.tar.xz
puppet-5c53dd98d51378c8aab0c8d5bfece2b075191edb.zip
make puppet-lint happy and make sure we are future proof for puppet 2.8 ( variable scoping )
Diffstat (limited to 'deployment/websites')
-rw-r--r--deployment/websites/manifests/pkgcpan.pp37
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",
}
-}
+}