diff options
| author | Thomas Backlund <tmb@mageia.org> | 2016-02-07 19:30:09 +0200 |
|---|---|---|
| committer | Thomas Backlund <tmb@mageia.org> | 2016-02-07 19:30:09 +0200 |
| commit | b7a4146c22073ad8e8ee97267b8fe465cbef9dcf (patch) | |
| tree | a69c31fff87abb18fb21e19229aa875d147f7550 | |
| parent | 9b92d625f6f0372652d0517817317463f3940838 (diff) | |
| download | puppet-b7a4146c22073ad8e8ee97267b8fe465cbef9dcf.tar puppet-b7a4146c22073ad8e8ee97267b8fe465cbef9dcf.tar.gz puppet-b7a4146c22073ad8e8ee97267b8fe465cbef9dcf.tar.bz2 puppet-b7a4146c22073ad8e8ee97267b8fe465cbef9dcf.tar.xz puppet-b7a4146c22073ad8e8ee97267b8fe465cbef9dcf.zip | |
fix up bugzilla ldap/pgsql_password variable lookup
| -rw-r--r-- | modules/sympa/templates/auth.conf | 2 | ||||
| -rw-r--r-- | modules/sympa/templates/config | 2 | ||||
| -rw-r--r-- | modules/sympa/templates/data_sources/ldap_group.incl | 2 | ||||
| -rw-r--r-- | modules/sympa/templates/search_filters/group.ldap | 2 | ||||
| -rw-r--r-- | modules/sympa/templates/sympa.conf | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/modules/sympa/templates/auth.conf b/modules/sympa/templates/auth.conf index af998b68..203dfe7c 100644 --- a/modules/sympa/templates/auth.conf +++ b/modules/sympa/templates/auth.conf @@ -8,6 +8,6 @@ ldap scope sub use_ssl 1 bind_dn cn=sympa-<%= hostname %>,ou=System Accounts,<%= dc_suffix %> - bind_password <%= ldap_password %> + bind_password <%= scope.lookupvar("sympa::server::ldap_password") %> authentication_info_url <%= authentication_info_url %> diff --git a/modules/sympa/templates/config b/modules/sympa/templates/config index e55785bd..f1463362 100644 --- a/modules/sympa/templates/config +++ b/modules/sympa/templates/config @@ -69,7 +69,7 @@ include_ldap_query scope one use_ssl yes user cn=sympa-<%= hostname %>,ou=System Accounts,<%= dc_suffix %> - passwd <%= ldap_password %> + passwd <%= scope.lookupvar("sympa::server::ldap_password") %> <% end %> diff --git a/modules/sympa/templates/data_sources/ldap_group.incl b/modules/sympa/templates/data_sources/ldap_group.incl index daded0ff..ca0afbcc 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=sympa-<%= hostname %>,ou=System Accounts,<%= dc_suffix %> - passwd <%= ldap_password %> + passwd <%= scope.lookupvar("sympa::server::ldap_password") %> suffix1 ou=Group,<%= dc_suffix %> scope1 one filter1 (&(objectClass=groupOfNames)(cn=<%= name %>)) diff --git a/modules/sympa/templates/search_filters/group.ldap b/modules/sympa/templates/search_filters/group.ldap index fd1f28d9..b4dc7117 100644 --- a/modules/sympa/templates/search_filters/group.ldap +++ b/modules/sympa/templates/search_filters/group.ldap @@ -1,6 +1,6 @@ host ldap.<%= domain %>:636 bind_dn cn=sympa-<%= hostname %>,ou=System Accounts,<%= dc_suffix %> -bind_password <%= ldap_password %> +bind_password <%= scope.lookupvar("sympa::server::ldap_password") %> use_ssl yes suffix ou=People,<%= dc_suffix %> filter (&(mail=[sender])(memberOf=cn=<%= name %>,ou=Group,<%= dc_suffix %>)) diff --git a/modules/sympa/templates/sympa.conf b/modules/sympa/templates/sympa.conf index 43a1a6d2..4fb60941 100644 --- a/modules/sympa/templates/sympa.conf +++ b/modules/sympa/templates/sympa.conf @@ -265,7 +265,7 @@ db_user sympa ## Database password (associated to the db_user) ## What ever you use a password or not, you must protect the SQL server (is it a not a public internet service ?) -db_passwd <%= pgsql_password %> +db_passwd <%= scope.lookupvar("sympa::server::pgsql_password") %> ## Database private extention to user table ## You need to extend the database format with these fields |