diff options
Diffstat (limited to 'Bugzilla/Install/Filesystem.pm')
-rw-r--r-- | Bugzilla/Install/Filesystem.pm | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/Bugzilla/Install/Filesystem.pm b/Bugzilla/Install/Filesystem.pm index 3114d64be..2a2e9b71a 100644 --- a/Bugzilla/Install/Filesystem.pm +++ b/Bugzilla/Install/Filesystem.pm @@ -21,7 +21,8 @@ use warnings; use Bugzilla::Constants; use Bugzilla::Error; -use Bugzilla::Install::Localconfig; +use Bugzilla::Install::Localconfig qw(ENV_KEYS); + use Bugzilla::Install::Util qw(install_string); use Bugzilla::Util; use Bugzilla::Hook; @@ -101,6 +102,14 @@ use constant INDEX_HTML => <<'EOT'; </html> EOT +sub HTTPD_ENV_CONF { + + return join( "\n", + "PerlPassEnv LOCALCONFIG_ENV", + map { "PerlPassEnv " . $_ } ENV_KEYS + ) . "\n"; +} + ############### # Permissions # ############### @@ -407,6 +416,9 @@ sub FILESYSTEM { "robots.txt" => { perms => CGI_READ, overwrite => 1, contents => \&robots_txt}, + "httpd/env.conf" => { perms => CGI_READ, + overwrite => 1, + contents => \&HTTPD_ENV_CONF }, ); # Because checksetup controls the creation of index.html separately |