From c345cbc05311d8ecc51752c59b102d0323bcfb6c Mon Sep 17 00:00:00 2001 From: Dylan William Hardison Date: Thu, 15 Feb 2018 20:49:33 -0500 Subject: no bug - add USE_NYTPROF to PerlPassEnv (#395) --- Bugzilla/Install/Filesystem.pm | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'Bugzilla/Install') diff --git a/Bugzilla/Install/Filesystem.pm b/Bugzilla/Install/Filesystem.pm index 89a1e5d93..e1e9a47d7 100644 --- a/Bugzilla/Install/Filesystem.pm +++ b/Bugzilla/Install/Filesystem.pm @@ -102,13 +102,16 @@ use constant INDEX_HTML => <<'EOT'; EOT -sub HTTPD_ENV_CONF { +use constant HTTPD_ENV => qw( + LOCALCONFIG_ENV + BUGZILLA_UNSAFE_AUTH_DELEGATION + USE_NYTPROF + NYTPROF_DIR +); - return join( "\n", - "PerlPassEnv LOCALCONFIG_ENV", - "PerlPassEnv BUGZILLA_UNSAFE_AUTH_DELEGATION", - map { "PerlPassEnv " . $_ } ENV_KEYS - ) . "\n"; +sub HTTPD_ENV_CONF { + my @env = (ENV_KEYS, HTTPD_ENV); + return join( "\n", map { "PerlPassEnv " . $_ } @env ) . "\n"; } ############### @@ -304,7 +307,7 @@ sub FILESYSTEM { js => { files => WS_SERVE, dirs => DIR_WS_SERVE }, static => { files => WS_SERVE, - dirs => DIR_WS_SERVE }, + dirs => DIR_WS_SERVE }, $skinsdir => { files => WS_SERVE, dirs => DIR_WS_SERVE }, 'docs/*/html' => { files => WS_SERVE, -- cgit v1.2.3-24-g4f1b