summaryrefslogtreecommitdiffstats
path: root/httpd
diff options
context:
space:
mode:
authorDylan William Hardison <dylan@hardison.net>2017-10-07 00:11:25 +0200
committerGitHub <noreply@github.com>2017-10-07 00:11:25 +0200
commitbbfe30297f0a56d4d384f60e0ff20e7c67e08d7a (patch)
treeb2f34eca75df83ecc1f8da1f5d59184bcad242b0 /httpd
parent6fe0afaa39271bbd75cf068abd67b19fd062a843 (diff)
downloadbugzilla-bbfe30297f0a56d4d384f60e0ff20e7c67e08d7a.tar.gz
bugzilla-bbfe30297f0a56d4d384f60e0ff20e7c67e08d7a.tar.xz
Bug 1404092 - Bugzilla->localconfig should directly use environmental variables and ignore the localconfig file
Diffstat (limited to 'httpd')
-rw-r--r--httpd/httpd.conf2
1 files changed, 2 insertions, 0 deletions
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