4 files changed, 11 insertions, 11 deletions
diff --git a/modules/bugzilla/manifests/init.pp b/modules/bugzilla/manifests/init.pp
index 4a72fb75..23a24f1e 100644
--- a/modules/bugzilla/manifests/init.pp
+++ b/modules/bugzilla/manifests/init.pp
@@ -10,8 +10,8 @@ class bugzilla {
     file { '/etc/bugzilla/localconfig':
       ensure => present,
       owner => root,
-      group => root,
-      mode => 644,
+      group => apache,
+      mode => 640,
       content => template("bugzilla/localconfig")
     }
 
@@ -19,8 +19,8 @@ class bugzilla {
     file { '/var/lib/bugzilla/params':
       ensure => present,
       owner => root,
-      group => root,
-      mode => 644,
+      group => apache,
+      mode => 640,
       content => template("bugzilla/params")
     }
 
@@ -30,7 +30,7 @@ class bugzilla {
       }
 
     apache::vhost_other_app { "bugs.$domain":
-      vhost_file => "bugzilla/vhost_bugs.mageia.org.conf",
+      vhost_file => "bugzilla/vhost_bugs.conf",
     }
 }
 
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>