aboutsummaryrefslogtreecommitdiffstats
path: root/modules/mga-mirrors
diff options
context:
space:
mode:
authorMichael Scherer <misc@mageia.org>2010-12-15 12:24:46 +0000
committerMichael Scherer <misc@mageia.org>2010-12-15 12:24:46 +0000
commit75e79d222aeaa7be5c774a4218655c4ba2ffe6ab (patch)
treeb45e7c5ce363bb552de16bb7bddbcefd1be070b2 /modules/mga-mirrors
parenta0d62a41b9b21e44ae561e8ec0fa4457c7cfcc2a (diff)
downloadpuppet-75e79d222aeaa7be5c774a4218655c4ba2ffe6ab.tar
puppet-75e79d222aeaa7be5c774a4218655c4ba2ffe6ab.tar.gz
puppet-75e79d222aeaa7be5c774a4218655c4ba2ffe6ab.tar.bz2
puppet-75e79d222aeaa7be5c774a4218655c4ba2ffe6ab.tar.xz
puppet-75e79d222aeaa7be5c774a4218655c4ba2ffe6ab.zip
uniformisation of the name of variable used for password, so we know if this is ldap or postgresql at the first glance
Diffstat (limited to 'modules/mga-mirrors')
-rw-r--r--modules/mga-mirrors/manifests/init.pp2
-rw-r--r--modules/mga-mirrors/templates/mga-mirrors.ini2
2 files changed, 2 insertions, 2 deletions
diff --git a/modules/mga-mirrors/manifests/init.pp b/modules/mga-mirrors/manifests/init.pp
index 2b7def29..b41ed53c 100644
--- a/modules/mga-mirrors/manifests/init.pp
+++ b/modules/mga-mirrors/manifests/init.pp
@@ -11,7 +11,7 @@ class mga-mirrors {
require => Package['mga-mirrors']
}
- $password = extlookup("mga_mirror_password",'x')
+ $pgsql_password = extlookup("mga_mirror_pgsql",'x')
file { "mga-mirrors.ini":
path => "/etc/mga-mirrors.ini",
diff --git a/modules/mga-mirrors/templates/mga-mirrors.ini b/modules/mga-mirrors/templates/mga-mirrors.ini
index 973c65fd..ce7ee911 100644
--- a/modules/mga-mirrors/templates/mga-mirrors.ini
+++ b/modules/mga-mirrors/templates/mga-mirrors.ini
@@ -1,4 +1,4 @@
[db]
pgconn=host=pgsql.<%= domain %>;dbname=mirrors
user=mirrors
-password=<%= password %>
+password=<%= pgsql_password %>