diff options
| author | Michael Scherer <misc@mageia.org> | 2011-03-08 15:50:16 +0000 |
|---|---|---|
| committer | Michael Scherer <misc@mageia.org> | 2011-03-08 15:50:16 +0000 |
| commit | 92dd221e8d084ab92682ff8ae215f9b76128e852 (patch) | |
| tree | 363994d064f181b1e10ee8c46fc74e2df4c95b0c | |
| parent | 47701f5f1d7e26095f06203489c98747d36e281e (diff) | |
| download | puppet-92dd221e8d084ab92682ff8ae215f9b76128e852.tar puppet-92dd221e8d084ab92682ff8ae215f9b76128e852.tar.gz puppet-92dd221e8d084ab92682ff8ae215f9b76128e852.tar.bz2 puppet-92dd221e8d084ab92682ff8ae215f9b76128e852.tar.xz puppet-92dd221e8d084ab92682ff8ae215f9b76128e852.zip | |
- do not hardcode the hostname of the server, in case we need to change it
( for example if the service is migrated to another one )
| -rw-r--r-- | modules/bugzilla/templates/params | 2 | ||||
| -rw-r--r-- | modules/sympa/templates/auth.conf | 2 | ||||
| -rw-r--r-- | modules/sympa/templates/data_sources/ldap_group.incl | 2 | ||||
| -rw-r--r-- | modules/transifex/templates/45-ldap.conf | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/modules/bugzilla/templates/params b/modules/bugzilla/templates/params index 6a9bedfc..d76a44c4 100644 --- a/modules/bugzilla/templates/params +++ b/modules/bugzilla/templates/params @@ -1,6 +1,6 @@ %param = ( 'LDAPBaseDN' => 'ou=People,<%= dc_suffix %>', - 'LDAPbinddn' => 'cn=bugzilla-alamut,ou=System Accounts,<%= dc_suffix %>:<%= ldap_password %>', + 'LDAPbinddn' => 'cn=bugzilla-<%= hostname %>,ou=System Accounts,<%= dc_suffix %>:<%= ldap_password %>', 'LDAPfilter' => '', 'LDAPmailattribute' => 'mail', 'LDAPserver' => 'ldap.<%= domain %>', diff --git a/modules/sympa/templates/auth.conf b/modules/sympa/templates/auth.conf index 94f3ee35..64256253 100644 --- a/modules/sympa/templates/auth.conf +++ b/modules/sympa/templates/auth.conf @@ -7,7 +7,7 @@ ldap email_attribute mail scope sub use_ssl 1 - bind_dn cn=sympa-alamut,ou=System Accounts,<%= dc_suffix %> + bind_dn cn=sympa-<%= hostname %>,ou=System Accounts,<%= dc_suffix %> bind_password <%= ldap_password %> authentication_info_url https://identity.<%= domain %>/ diff --git a/modules/sympa/templates/data_sources/ldap_group.incl b/modules/sympa/templates/data_sources/ldap_group.incl index dc9addd8..4517fe26 100644 --- a/modules/sympa/templates/data_sources/ldap_group.incl +++ b/modules/sympa/templates/data_sources/ldap_group.incl @@ -1,7 +1,7 @@ include_ldap_2level_query host ldap.<%= domain %> use_ssl yes - user cn=sympa-alamut,ou=System Accounts,<%= dc_suffix %> + user cn=sympa-<%= hostname %>,ou=System Accounts,<%= dc_suffix %> passwd <%= ldap_password %> suffix1 ou=Group,<%= dc_suffix %> scope1 one diff --git a/modules/transifex/templates/45-ldap.conf b/modules/transifex/templates/45-ldap.conf index 9ee198ca..a07b3724 100644 --- a/modules/transifex/templates/45-ldap.conf +++ b/modules/transifex/templates/45-ldap.conf @@ -19,7 +19,7 @@ from django_auth_ldap.config import LDAPSearch, GroupOfNamesType # Baseline configuration. AUTH_LDAP_SERVER_URI = "ldap://ldap.<%= domain %>" -AUTH_LDAP_BIND_DN = "cn=transifex-alamut,ou=System Accounts,<%= dc_suffix %>" +AUTH_LDAP_BIND_DN = "cn=transifex-<%= hostname %>,ou=System Accounts,<%= dc_suffix %>" AUTH_LDAP_BIND_PASSWORD = "<%= ldap_password %>" AUTH_LDAP_USER_SEARCH = LDAPSearch("ou=People,<%= dc_suffix %> ", |