diff options
| author | Michael Scherer <misc@mageia.org> | 2010-11-20 11:52:54 +0000 |
|---|---|---|
| committer | Michael Scherer <misc@mageia.org> | 2010-11-20 11:52:54 +0000 |
| commit | cd6351ab1212d5dea85db326113c887065b1efd6 (patch) | |
| tree | 65c1f714456ce8ec15ff71eca0106f903dbc2e52 /modules/bugzilla/templates | |
| parent | c173069efea53f72fc7c6a758f8eebe772464a6f (diff) | |
| download | puppet-cd6351ab1212d5dea85db326113c887065b1efd6.tar puppet-cd6351ab1212d5dea85db326113c887065b1efd6.tar.gz puppet-cd6351ab1212d5dea85db326113c887065b1efd6.tar.bz2 puppet-cd6351ab1212d5dea85db326113c887065b1efd6.tar.xz puppet-cd6351ab1212d5dea85db326113c887065b1efd6.zip | |
- do not let file with passwords to be world readable
( even if being readable by apache is not good either, but needed as the password is used by apache )
- use ldaps for sympa
- use the 2 new facter macro and remove the version copied everywhere
- remove hardcoded domain in bugzilla and others
Diffstat (limited to 'modules/bugzilla/templates')
| -rw-r--r-- | modules/bugzilla/templates/params | 8 | ||||
| -rw-r--r-- | modules/bugzilla/templates/vhost_bugs.conf (renamed from modules/bugzilla/templates/vhost_bugs.mageia.org.conf) | 2 | ||||
| -rw-r--r-- | modules/bugzilla/templates/webapp_bugzilla.conf | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/modules/bugzilla/templates/params b/modules/bugzilla/templates/params index 78c5b5e3..df5c98a2 100644 --- a/modules/bugzilla/templates/params +++ b/modules/bugzilla/templates/params @@ -1,9 +1,9 @@ %param = ( - 'LDAPBaseDN' => 'ou=People,dc=mageia,dc=org', - 'LDAPbinddn' => 'cn=bugzilla-alamut,ou=System Accounts,dc=mageia,dc=org:<%= passwordLdap %>', + 'LDAPBaseDN' => 'ou=People,<%= dc_suffix %>', + 'LDAPbinddn' => 'cn=bugzilla-alamut,ou=System Accounts,<%= dc_suffix %>:<%= passwordLdap %>', 'LDAPfilter' => '', 'LDAPmailattribute' => 'mail', - 'LDAPserver' => 'ldap.mageia.org', + 'LDAPserver' => 'ldap.<%= domain %>', 'LDAPstarttls' => '1', 'LDAPuidattribute' => 'uid', 'RADIUS_NAS_IP' => '', @@ -88,7 +88,7 @@ 'strict_isolation' => 0, 'timetrackinggroup' => 'editbugs', 'upgrade_notification' => 'latest_stable_release', - 'urlbase' => 'http://bugs.mageia.org/', + 'urlbase' => 'http://bugs.<%= domain %>/', 'use_mailer_queue' => 0, 'use_see_also' => 1, 'usebugaliases' => 0, diff --git a/modules/bugzilla/templates/vhost_bugs.mageia.org.conf b/modules/bugzilla/templates/vhost_bugs.conf index 60cd8195..25306b1e 100644 --- a/modules/bugzilla/templates/vhost_bugs.mageia.org.conf +++ b/modules/bugzilla/templates/vhost_bugs.conf @@ -1,5 +1,5 @@ <% -path_data_directory = "/usr/lib" + ( architecture == "x86_64" ? '64' : '') + "/bugzilla" +path_data_directory = lib_dir + "/bugzilla" %> <VirtualHost *:80> diff --git a/modules/bugzilla/templates/webapp_bugzilla.conf b/modules/bugzilla/templates/webapp_bugzilla.conf index 6f22eed0..a37760d8 100644 --- a/modules/bugzilla/templates/webapp_bugzilla.conf +++ b/modules/bugzilla/templates/webapp_bugzilla.conf @@ -1,5 +1,5 @@ <% -path_data_directory = "/usr/lib" + ( architecture == "x86_64" ? '64' : '') + "/bugzilla" +path_data_directory = lib_dir + "/bugzilla" %> <Directory /usr/share/bugzilla/www> |