From 2eaa1ccd24f2c8050eec838454eb1dbef9f344b8 Mon Sep 17 00:00:00 2001
From: Dylan William Hardison <dylan@hardison.net>
Date: Tue, 27 Feb 2018 22:00:58 -0500
Subject: Bug 1437646 - Add confdir to bz_locations

---
 Bugzilla/Constants.pm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'Bugzilla/Constants.pm')

diff --git a/Bugzilla/Constants.pm b/Bugzilla/Constants.pm
index 695f2fede..00f0f8104 100644
--- a/Bugzilla/Constants.pm
+++ b/Bugzilla/Constants.pm
@@ -659,18 +659,21 @@ sub _bz_locations {
     $libpath =~ /(.*)/;
     $libpath = $1;
 
-    my ($localconfig, $datadir);
+    my ($localconfig, $datadir, $confdir);
     if ($project && $project =~ /^(\w+)$/) {
         $project = $1;
         $localconfig = "localconfig.$project";
         $datadir = "data/$project";
+        $confdir = "conf/$project";
     } else {
         $project = undef;
         $localconfig = "localconfig";
         $datadir = "data";
+        $confdir = "conf";
     }
 
     $datadir = "$libpath/$datadir";
+    $confdir = "$libpath/$confdir";
     # We have to return absolute paths for mod_perl.
     # That means that if you modify these paths, they must be absolute paths.
     return {
@@ -698,6 +701,7 @@ sub _bz_locations {
         'assetsdir'      => "$datadir/assets",
         # error_reports store error/warnings destined for sentry
         'error_reports'  => "$libpath/error_reports",
+        'confdir'        => $confdir,
     };
 }
 
-- 
cgit v1.2.3-24-g4f1b