1 files changed, 24 insertions, 22 deletions

diff --git a/modules/bugzilla/manifests/init.pp b/modules/bugzilla/manifests/init.pp
index ca5e7ea7..eaf12eb6 100755
--- a/modules/bugzilla/manifests/init.pp
+++ b/modules/bugzilla/manifests/init.pp
@@ -1,35 +1,40 @@
 class bugzilla {
 
-    $extension_location = '/usr/share/bugzilla/extensions/Mageia'
+    $bugzilla_location = '/usr/share/bugzilla/'
 
-    package {['bugzilla',
-              'bugzilla-extension-sitemap',
-              'graphviz',
+    package {['graphviz',
               'perl-Template-GD', # needed for graphical_report support
               'perl-Test-Taint',
-              'perl-JSON-RPC']: }
+              'perl-JSON-RPC',
+              'perl-Email-MIME',
+              'perl-Email-Sender',
+              'Math-Random-ISAAC',
+              'perl-Chart',
+              'perl-PatchReader',
+              'perl-ldap',
+              'perl-SOAP-Lite',
+              'perl-XMLRPC-Lite',
+              'perl-CGI']: }
 
     $pgsql_password = extlookup('bugzilla_pgsql','x')
     $ldap_password = extlookup('bugzilla_ldap','x')
 
-    postgresql::remote_db_and_user { 'bugs-dev':
+    postgresql::remote_db_and_user { 'bugs':
         description => 'Bugzilla database',
         password    => $pgsql_password,
     }
 
-    file { '/etc/bugzilla/localconfig':
+    file { '/usr/share/bugzilla/localconfig':
       group   => 'apache',
       mode    => '0640',
-      content => template('bugzilla/localconfig'),
-      require => Package['bugzilla'],
+      content => template('bugzilla/localconfig')
     }
 
 
-    file { '/var/lib/bugzilla/params':
+    file { '/usr/share/bugzilla/data/params.json':
       group   => 'apache',
       mode    => '0640',
-      content => template('bugzilla/params'),
-      require => Package['bugzilla'],
+      content => template('bugzilla/params.json')
     }
 
     apache::webapp_other { 'bugzilla':
@@ -37,7 +42,7 @@ class bugzilla {
     }
 
     $bugs_vhost = "bugs.${::domain}"
-    $vhost_root = '/usr/share/bugzilla/www'
+    $vhost_root = '/usr/share/bugzilla'
 
     apache::vhost::redirect_ssl { $bugs_vhost: }
 
@@ -49,25 +54,22 @@ class bugzilla {
         vhost    => $bugs_vhost,
     }
 
-    git::snapshot { $extension_location:
-      source  => "git://git.${::domain}/web/templates/bugzilla",
-      require => Package['bugzilla'],
+    git::snapshot { $bugzilla_location:
+      source  => "git://git.${::domain}/web/bugs"
     }
 
     file { 'Mageia':
       ensure  => directory,
-      path    => '/usr/share/bugzilla/extensions',
+      path    => '/usr/share/bugzilla',
       group   => 'apache',
-      mode    => '0640',
       recurse => true,
-      require => Git::Snapshot[$extension_location],
+      require => Git::Snapshot[$bugzilla_location],
     }
 
-    file { '/usr/share/bugzilla/www/robots.txt':
+    file { '/usr/share/bugzilla/robots.txt':
       group   => 'apache',
       mode    => '0640',
-      content => template('bugzilla/robots.txt'),
-      require => Package['bugzilla-extension-sitemap'],
+      content => template('bugzilla/robots.txt')
     }
 
     cron { 'collectstats':