bugzilla: use bugzilla_location variable instead of hardcoding the path

1 files changed, 71 insertions, 71 deletions

diff --git a/modules/bugzilla/manifests/init.pp b/modules/bugzilla/manifests/init.pp
index 2f3ba28f..5d858bdf 100755
--- a/modules/bugzilla/manifests/init.pp
+++ b/modules/bugzilla/manifests/init.pp
@@ -1,6 +1,6 @@
 class bugzilla {
 
-    $bugzilla_location = '/usr/share/bugzilla/'
+    $bugzilla_location = '/usr/share/bugzilla'
 
     package {['graphviz',
               'perl-Template-GD', # needed for graphical_report support
@@ -33,14 +33,14 @@ class bugzilla {
     }
 
 #   Only enable the first time ( need to be fixed)'
-#    file { '/usr/share/bugzilla/localconfig':
+#    file { "$bugzilla_location/localconfig":
 #      group   => 'apache',
 #      mode    => '0640',
 #      content => template('bugzilla/localconfig')
 #    }
 
 
-    file { '/usr/share/bugzilla/data/params.json':
+    file { "$bugzilla_location/data/params.json":
       group   => 'apache',
       mode    => '0640',
       content => template('bugzilla/params.json')
@@ -51,7 +51,7 @@ class bugzilla {
     }
 
     $bugs_vhost = "bugs.${::domain}"
-    $vhost_root = '/usr/share/bugzilla'
+    $vhost_root = $bugzilla_location
 
     apache::vhost::redirect_ssl { $bugs_vhost: }
 
@@ -69,13 +69,13 @@ class bugzilla {
 
     file { 'Mageia':
       ensure  => directory,
-      path    => '/usr/share/bugzilla',
+      path    => $bugzilla_location,
       group   => 'apache',
       recurse => true,
       require => Git::Snapshot[$bugzilla_location],
     }
 
-      file { '/usr/share/bugzilla/data/assets':
+      file { "$bugzilla_location/data/assets":
           ensure => directory,
           owner => 'apache',
           group => 'apache',
@@ -83,76 +83,76 @@ class bugzilla {
         }
 
 
-    file { '/usr/share/bugzilla/robots.txt':
+    file { "$bugzilla_location/robots.txt":
       group   => 'apache',
       mode    => '0640',
       content => template('bugzilla/robots.txt')
     }
 
     file { [
-		'/usr/share/bugzilla/admin.cgi',
-		'/usr/share/bugzilla/attachment.cgi',
-                '/usr/share/bugzilla/buglist.cgi',
-                '/usr/share/bugzilla/chart.cgi',
-                '/usr/share/bugzilla/colchange.cgi',
-                '/usr/share/bugzilla/config.cgi',
-                '/usr/share/bugzilla/createaccount.cgi',
-                '/usr/share/bugzilla/describecomponents.cgi',
-                '/usr/share/bugzilla/describekeywords.cgi',
-                '/usr/share/bugzilla/duplicates.cgi',
-                '/usr/share/bugzilla/editclassifications.cgi',
-                '/usr/share/bugzilla/editfields.cgi',
-                '/usr/share/bugzilla/editgroups.cgi',
-                '/usr/share/bugzilla/editmilestones.cgi',
-                '/usr/share/bugzilla/editproducts.cgi',
-                '/usr/share/bugzilla/editusers.cgi',
-                '/usr/share/bugzilla/editversions.cgi',
-                '/usr/share/bugzilla/editworkflow.cgi',
-                '/usr/share/bugzilla/editcomponents.cgi',
-                '/usr/share/bugzilla/editflagtypes.cgi',
-                '/usr/share/bugzilla/editkeywords.cgi',
-                '/usr/share/bugzilla/editparams.cgi',
-                '/usr/share/bugzilla/editsettings.cgi',
-                '/usr/share/bugzilla/editvalues.cgi',
-                '/usr/share/bugzilla/editwhines.cgi',
-                '/usr/share/bugzilla/enter_bug.cgi',
-                '/usr/share/bugzilla/index.cgi',
-                '/usr/share/bugzilla/jsonrpc.cgi',
-                '/usr/share/bugzilla/page.cgi',
-                '/usr/share/bugzilla/post_bug.cgi',  
-                '/usr/share/bugzilla/process_bug.cgi',
-                '/usr/share/bugzilla/query.cgi',
-                '/usr/share/bugzilla/quips.cgi',
-                '/usr/share/bugzilla/relogin.cgi',
-                '/usr/share/bugzilla/reports.cgi',
-                '/usr/share/bugzilla/rest.cgi',
-                '/usr/share/bugzilla/search_plugin.cgi',
-                '/usr/share/bugzilla/show_bug.cgi',
-                '/usr/share/bugzilla/showdependencytree.cgi',
-                '/usr/share/bugzilla/testagent.cgi',
-                '/usr/share/bugzilla/userprefs.cgi',
-                '/usr/share/bugzilla/xmlrpc.cgi',
-                '/usr/share/bugzilla/report.cgi',
-                '/usr/share/bugzilla/request.cgi',
-                '/usr/share/bugzilla/sanitycheck.cgi',
-                '/usr/share/bugzilla/show_activity.cgi',
-                '/usr/share/bugzilla/showdependencygraph.cgi',
-                '/usr/share/bugzilla/summarize_time.cgi',
-                '/usr/share/bugzilla/token.cgi',
-                '/usr/share/bugzilla/votes.cgi',
-                '/usr/share/bugzilla/checksetup.pl',
-                '/usr/share/bugzilla/clean-bug-user-last-visit.pl',
-                '/usr/share/bugzilla/collectstats.pl',
-                '/usr/share/bugzilla/email_in.pl',
-                '/usr/share/bugzilla/importxml.pl',
-                '/usr/share/bugzilla/install-module.pl',
-                '/usr/share/bugzilla/jobqueue.pl',
-                '/usr/share/bugzilla/migrate.pl',
-                '/usr/share/bugzilla/runtests.pl',
-                '/usr/share/bugzilla/sanitycheck.pl',
-                '/usr/share/bugzilla/testserver.pl',
-                '/usr/share/bugzilla/whineatnews.pl',
-                '/usr/share/bugzilla/whine.pl'
+                "$bugzilla_location/admin.cgi",
+                "$bugzilla_location/attachment.cgi",
+                "$bugzilla_location/buglist.cgi",
+                "$bugzilla_location/chart.cgi",
+                "$bugzilla_location/colchange.cgi",
+                "$bugzilla_location/config.cgi",
+                "$bugzilla_location/createaccount.cgi",
+                "$bugzilla_location/describecomponents.cgi",
+                "$bugzilla_location/describekeywords.cgi",
+                "$bugzilla_location/duplicates.cgi",
+                "$bugzilla_location/editclassifications.cgi",
+                "$bugzilla_location/editfields.cgi",
+                "$bugzilla_location/editgroups.cgi",
+                "$bugzilla_location/editmilestones.cgi",
+                "$bugzilla_location/editproducts.cgi",
+                "$bugzilla_location/editusers.cgi",
+                "$bugzilla_location/editversions.cgi",
+                "$bugzilla_location/editworkflow.cgi",
+                "$bugzilla_location/editcomponents.cgi",
+                "$bugzilla_location/editflagtypes.cgi",
+                "$bugzilla_location/editkeywords.cgi",
+                "$bugzilla_location/editparams.cgi",
+                "$bugzilla_location/editsettings.cgi",
+                "$bugzilla_location/editvalues.cgi",
+                "$bugzilla_location/editwhines.cgi",
+                "$bugzilla_location/enter_bug.cgi",
+                "$bugzilla_location/index.cgi",
+                "$bugzilla_location/jsonrpc.cgi",
+                "$bugzilla_location/page.cgi",
+                "$bugzilla_location/post_bug.cgi",
+                "$bugzilla_location/process_bug.cgi",
+                "$bugzilla_location/query.cgi",
+                "$bugzilla_location/quips.cgi",
+                "$bugzilla_location/relogin.cgi",
+                "$bugzilla_location/reports.cgi",
+                "$bugzilla_location/rest.cgi",
+                "$bugzilla_location/search_plugin.cgi",
+                "$bugzilla_location/show_bug.cgi",
+                "$bugzilla_location/showdependencytree.cgi",
+                "$bugzilla_location/testagent.cgi",
+                "$bugzilla_location/userprefs.cgi",
+                "$bugzilla_location/xmlrpc.cgi",
+                "$bugzilla_location/report.cgi",
+                "$bugzilla_location/request.cgi",
+                "$bugzilla_location/sanitycheck.cgi",
+                "$bugzilla_location/show_activity.cgi",
+                "$bugzilla_location/showdependencygraph.cgi",
+                "$bugzilla_location/summarize_time.cgi",
+                "$bugzilla_location/token.cgi",
+                "$bugzilla_location/votes.cgi",
+                "$bugzilla_location/checksetup.pl",
+                "$bugzilla_location/clean-bug-user-last-visit.pl",
+                "$bugzilla_location/collectstats.pl",
+                "$bugzilla_location/email_in.pl",
+                "$bugzilla_location/importxml.pl",
+                "$bugzilla_location/install-module.pl",
+                "$bugzilla_location/jobqueue.pl",
+                "$bugzilla_location/migrate.pl",
+                "$bugzilla_location/runtests.pl",
+                "$bugzilla_location/sanitycheck.pl",
+                "$bugzilla_location/testserver.pl",
+                "$bugzilla_location/whineatnews.pl",
+                "$bugzilla_location/whine.pl",
 	   ]:
       group   => 'apache',
       mode    => '0750',
@@ -167,7 +167,7 @@ class bugzilla {
     }
 
     cron { 'collectstats':
-        command => '/usr/share/bugzilla/bin/collectstats.pl',
+        command => "$bugzilla_location/bin/collectstats.pl",
         user    => 'apache',
         hour    => 2,
         minute  => 30,