aboutsummaryrefslogtreecommitdiffstats
path: root/deployment
diff options
context:
space:
mode:
authorMichael Scherer <misc@mageia.org>2012-03-15 22:55:01 +0000
committerMichael Scherer <misc@mageia.org>2012-03-15 22:55:01 +0000
commit2c78d7ca44f19d375a063aa612f7fc8b911e1e79 (patch)
tree595a8eb680699e1c05ffa18c6889329fac7ce23a /deployment
parent0e36bef771e5936d72fd4f80a6dae9c1de474f6c (diff)
downloadpuppet-2c78d7ca44f19d375a063aa612f7fc8b911e1e79.tar
puppet-2c78d7ca44f19d375a063aa612f7fc8b911e1e79.tar.gz
puppet-2c78d7ca44f19d375a063aa612f7fc8b911e1e79.tar.bz2
puppet-2c78d7ca44f19d375a063aa612f7fc8b911e1e79.tar.xz
puppet-2c78d7ca44f19d375a063aa612f7fc8b911e1e79.zip
remove prefix on variable, as this only make thing harder to read, proper scoping should be enough
Diffstat (limited to 'deployment')
-rw-r--r--deployment/websites/manifests/pkgcpan.pp18
1 files changed, 9 insertions, 9 deletions
diff --git a/deployment/websites/manifests/pkgcpan.pp b/deployment/websites/manifests/pkgcpan.pp
index 01d2b8b8..592ea92b 100644
--- a/deployment/websites/manifests/pkgcpan.pp
+++ b/deployment/websites/manifests/pkgcpan.pp
@@ -2,12 +2,12 @@ class websites::pkgcpan {
include websites::base
$vhost = "pkgcpan.$::domain"
$vhostdir = "$websites::base::webdatadir/$vhost"
- $pkgcpan_login = 'pkgcpan'
- $pkgcpan_homedir = "/var/lib/$pkgcpan_login"
+ $login = 'pkgcpan'
+ $homedir = "/var/lib/$login"
- user { $pkgcpan_login:
+ user { $login:
managehome => true,
- home => $pkgcpan_homedir,
+ home => $homedir,
}
apache::vhost_base { $vhost:
@@ -17,8 +17,8 @@ class websites::pkgcpan {
file { $vhostdir:
ensure => directory,
- owner => $pkgcpan_login,
- group => $pkgcpan_login,
+ owner => $login,
+ group => $login,
}
package { 'perl-Module-Packaged-Generator': }
@@ -27,11 +27,11 @@ class websites::pkgcpan {
hour => 23,
require => Package['perl-Module-Packaged-Generator'],
command => "pkgcpan -q -f $vhostdir/cpan_Mageia.db -d Mageia",
- user => $pkgcpan_login,
+ user => $login,
}
file { "$vhostdir/cpan_Mageia.db":
- owner => $pkgcpan_login,
- group => $pkgcpan_login,
+ owner => $login,
+ group => $login,
}
}