aboutsummaryrefslogtreecommitdiffstats
path: root/modules/catdap
diff options
context:
space:
mode:
authorMichael Scherer <misc@mageia.org>2010-11-04 18:03:39 +0000
committerMichael Scherer <misc@mageia.org>2010-11-04 18:03:39 +0000
commit912e526de2a084df736704ea9336c1e0dd4842fd (patch)
tree11e8201a9b4566eb646ef122dd7cd4d2adf74b82 /modules/catdap
parentfa0b4e76d515b2c6fb4764600135c58e35810dbb (diff)
downloadpuppet-912e526de2a084df736704ea9336c1e0dd4842fd.tar
puppet-912e526de2a084df736704ea9336c1e0dd4842fd.tar.gz
puppet-912e526de2a084df736704ea9336c1e0dd4842fd.tar.bz2
puppet-912e526de2a084df736704ea9336c1e0dd4842fd.tar.xz
puppet-912e526de2a084df736704ea9336c1e0dd4842fd.zip
- move the call to extlookup before the template, not after
Diffstat (limited to 'modules/catdap')
-rw-r--r--modules/catdap/manifests/init.pp4
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/catdap/manifests/init.pp b/modules/catdap/manifests/init.pp
index 74abcffd..f69b3ffd 100644
--- a/modules/catdap/manifests/init.pp
+++ b/modules/catdap/manifests/init.pp
@@ -23,7 +23,8 @@ class catdap {
source => "svn://svn.mageia.org/soft/identity/CatDap/branches/live"
}
- # add a catdap config file
+ $catdap_password = extlookup('catdap_password')
+
file { "$catdap_location/catdap_local.yml":
ensure => present,
owner => apache,
@@ -32,7 +33,6 @@ class catdap {
require => Subversion::Snapshot[$catdap_location]
}
- $catdap_password = extlookup('catdap_password')
# add a apache vhost
file { "$catdap_vhost.conf":
path => "/etc/httpd/conf/vhosts.d/$catdap_vhost.conf",