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/bugzilla | |
| 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/bugzilla')
| -rw-r--r-- | modules/bugzilla/manifests/init.pp | 4 | ||||
| -rw-r--r-- | modules/bugzilla/templates/localconfig | 2 | ||||
| -rw-r--r-- | modules/bugzilla/templates/params | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/modules/bugzilla/manifests/init.pp b/modules/bugzilla/manifests/init.pp index 8c4553ce..c1388ce7 100644 --- a/modules/bugzilla/manifests/init.pp +++ b/modules/bugzilla/manifests/init.pp @@ -6,8 +6,8 @@ class bugzilla { ensure => installed; } - $password = extlookup("bugzilla_password",'x') - $passwordLdap = extlookup("bugzilla_ldap",'x') + $pgsql_password = extlookup("bugzilla_pgsql",'x') + $ldap_password = extlookup("bugzilla_ldap",'x') file { '/etc/bugzilla/localconfig': ensure => present, diff --git a/modules/bugzilla/templates/localconfig b/modules/bugzilla/templates/localconfig index 23089510..5ef4a9ab 100644 --- a/modules/bugzilla/templates/localconfig +++ b/modules/bugzilla/templates/localconfig @@ -56,7 +56,7 @@ $db_user = 'bugs'; # If you use apostrophe (') or a backslash (\) in your password, you'll # need to escape it by preceding it with a '\' character. (\') or (\) # (Far simpler just not to use those characters.) -$db_pass = '<%= password %>'; +$db_pass = '<%= pgsql_password %>'; # Sometimes the database server is running on a non-standard port. If that's # the case for your database server, set this to the port number that your diff --git a/modules/bugzilla/templates/params b/modules/bugzilla/templates/params index df5c98a2..45e8a0c8 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 %>:<%= passwordLdap %>', + 'LDAPbinddn' => 'cn=bugzilla-alamut,ou=System Accounts,<%= dc_suffix %>:<%= ldap_password %>', 'LDAPfilter' => '', 'LDAPmailattribute' => 'mail', 'LDAPserver' => 'ldap.<%= domain %>', |