diff options
| author | Michael Scherer <misc@mageia.org> | 2010-12-15 12:24:46 +0000 |
|---|---|---|
| committer | Michael Scherer <misc@mageia.org> | 2010-12-15 12:24:46 +0000 |
| commit | 75e79d222aeaa7be5c774a4218655c4ba2ffe6ab (patch) | |
| tree | b45e7c5ce363bb552de16bb7bddbcefd1be070b2 /modules/catdap | |
| parent | a0d62a41b9b21e44ae561e8ec0fa4457c7cfcc2a (diff) | |
| download | puppet-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/catdap')
| -rw-r--r-- | modules/catdap/manifests/init.pp | 2 | ||||
| -rw-r--r-- | modules/catdap/templates/catdap_local.yml | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/modules/catdap/manifests/init.pp b/modules/catdap/manifests/init.pp index 01709618..634a9d7f 100644 --- a/modules/catdap/manifests/init.pp +++ b/modules/catdap/manifests/init.pp @@ -21,7 +21,7 @@ class catdap { source => "svn://svn.mageia.org/svn/soft/identity/CatDap/branches/live" } - $catdap_password = extlookup('catdap_password','x') + $ldap_password = extlookup('catdap_ldap','x') file { "$catdap_location/catdap_local.yml": ensure => present, diff --git a/modules/catdap/templates/catdap_local.yml b/modules/catdap/templates/catdap_local.yml index 50f43601..c134ee22 100644 --- a/modules/catdap/templates/catdap_local.yml +++ b/modules/catdap/templates/catdap_local.yml @@ -1,8 +1,6 @@ <% ldap_server = 'ldap.' + domain -ldap_password = catdap_password - ldap_account = 'cn=catdap-valstar,ou=System Accounts,' + dc_suffix %> |