From cd6351ab1212d5dea85db326113c887065b1efd6 Mon Sep 17 00:00:00 2001
From: Michael Scherer <misc@mageia.org>
Date: Sat, 20 Nov 2010 11:52:54 +0000
Subject: - 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

---
 modules/bugzilla/templates/params                     |  8 ++++----
 modules/bugzilla/templates/vhost_bugs.conf            | 13 +++++++++++++
 modules/bugzilla/templates/vhost_bugs.mageia.org.conf | 13 -------------
 modules/bugzilla/templates/webapp_bugzilla.conf       |  2 +-
 4 files changed, 18 insertions(+), 18 deletions(-)
 create mode 100644 modules/bugzilla/templates/vhost_bugs.conf
 delete mode 100644 modules/bugzilla/templates/vhost_bugs.mageia.org.conf

(limited to 'modules/bugzilla/templates')

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.conf b/modules/bugzilla/templates/vhost_bugs.conf
new file mode 100644
index 00000000..25306b1e
--- /dev/null
+++ b/modules/bugzilla/templates/vhost_bugs.conf
@@ -0,0 +1,13 @@
+<%
+path_data_directory = lib_dir + "/bugzilla"
+%>
+
+<VirtualHost *:80>
+        ServerName bugs.<%= domain %>
+        DocumentRoot /usr/share/bugzilla/www
+        Alias /bugzilla/data <%= path_data_directory %>
+        Alias /bugzilla /usr/share/bugzilla/www
+        <Location />
+                Allow from all
+        </Location>
+</VirtualHost>
diff --git a/modules/bugzilla/templates/vhost_bugs.mageia.org.conf b/modules/bugzilla/templates/vhost_bugs.mageia.org.conf
deleted file mode 100644
index 60cd8195..00000000
--- a/modules/bugzilla/templates/vhost_bugs.mageia.org.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-<%
-path_data_directory = "/usr/lib" + ( architecture == "x86_64" ? '64' : '') + "/bugzilla"
-%>
-
-<VirtualHost *:80>
-        ServerName bugs.<%= domain %>
-        DocumentRoot /usr/share/bugzilla/www
-        Alias /bugzilla/data <%= path_data_directory %>
-        Alias /bugzilla /usr/share/bugzilla/www
-        <Location />
-                Allow from all
-        </Location>
-</VirtualHost>
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>
-- 
cgit v1.2.1