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/sympa/templates | |
| 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/sympa/templates')
| -rw-r--r-- | modules/sympa/templates/auth.conf | 4 | ||||
| -rw-r--r-- | modules/sympa/templates/data_sources/ldap_group.incl | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/modules/sympa/templates/auth.conf b/modules/sympa/templates/auth.conf index f84c519f..93eade85 100644 --- a/modules/sympa/templates/auth.conf +++ b/modules/sympa/templates/auth.conf @@ -8,7 +8,5 @@ ldap scope sub use_ssl 1 bind_dn cn=alamut-sympa,ou=System Accounts,<%= dc_suffix %> - bind_password <%= ldap_passwd %> - - + bind_password <%= ldap_password %> diff --git a/modules/sympa/templates/data_sources/ldap_group.incl b/modules/sympa/templates/data_sources/ldap_group.incl index a320ef0d..2676ae3c 100644 --- a/modules/sympa/templates/data_sources/ldap_group.incl +++ b/modules/sympa/templates/data_sources/ldap_group.incl @@ -2,7 +2,7 @@ include_ldap_2level_query host ldap.<%= domain %> use_ssl yes user cn=alamut-sympa,ou=System Accounts,<%= dc_suffix %> - passwd <%= ldap_passwd %> + passwd <%= ldap_password %> suffix1 ou=Group,<%= dc_suffix %> scope1 one filter1 (&(objectClass=groupOfNames)(cn=<%= name %>)) |