From bbfe30297f0a56d4d384f60e0ff20e7c67e08d7a Mon Sep 17 00:00:00 2001
From: Dylan William Hardison <dylan@hardison.net>
Date: Fri, 6 Oct 2017 18:11:25 -0400
Subject: Bug 1404092 - Bugzilla->localconfig should directly use environmental
 variables and ignore the localconfig file

---
 httpd/httpd.conf | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'httpd/httpd.conf')

diff --git a/httpd/httpd.conf b/httpd/httpd.conf
index 9df26b9db..8d0dad36d 100644
--- a/httpd/httpd.conf
+++ b/httpd/httpd.conf
@@ -59,6 +59,8 @@ LogFormat "%{User-agent}i" agent
 ServerSignature Off
 AddDefaultCharset UTF-8
 
+Include /app/httpd/env.conf
+
 PerlSwitches -wT
 PerlRequire /app/mod_perl.pl
 DirectoryIndex index.cgi
-- 
cgit v1.2.3-24-g4f1b