diff options
| author | Dylan William Hardison <dylan@hardison.net> | 2018-08-26 07:55:24 +0200 |
|---|---|---|
| committer | Dylan William Hardison <dylan@hardison.net> | 2018-08-26 07:55:24 +0200 |
| commit | 9263f397e701f25af395e8cdee48c87ee3327157 (patch) | |
| tree | cc7f6b6beef8947090a108701ca34316a5c8edb8 /Bugzilla/Install | |
| parent | 23b94e8410d90e9e15584d3a9220b6bb214f4220 (diff) | |
| parent | d57aefa118802606ea7cc424aaa62173be9eec41 (diff) | |
| download | bugzilla-9263f397e701f25af395e8cdee48c87ee3327157.tar.gz bugzilla-9263f397e701f25af395e8cdee48c87ee3327157.tar.xz | |
Merge remote-tracking branch 'bmo/mojo'
Diffstat (limited to 'Bugzilla/Install')
| -rw-r--r-- | Bugzilla/Install/Filesystem.pm | 52 | ||||
| -rw-r--r-- | Bugzilla/Install/Localconfig.pm | 10 |
2 files changed, 9 insertions, 53 deletions
diff --git a/Bugzilla/Install/Filesystem.pm b/Bugzilla/Install/Filesystem.pm index 46e121779..1da33882b 100644 --- a/Bugzilla/Install/Filesystem.pm +++ b/Bugzilla/Install/Filesystem.pm @@ -67,55 +67,6 @@ use constant HTTPD_ENV => qw( NYTPROF_DIR ); -sub HTTPD_ENV_CONF { - my @env = (ENV_KEYS, HTTPD_ENV); - return join( "\n", map { "PerlPassEnv " . $_ } @env ) . "\n"; -} - -sub _error_page { - my ($code, $title, $description) = @_; - - return <<EOT; -<!DOCTYPE HTML> -<html> - <head> - <title>$title</title> - <style> - body { - margin: 1em 2em; - background-color: #455372; - color: #ddd; - font-family: sans-serif; - } - h1, h3 { - color: #fff; - } - a { - color: #fff; - text-decoration: none; - } - #buggie { - float: left; - } - #content { - margin-left: 100px; - padding-top: 20px; - } - </style> - </head> - <body> - <img src="/images/buggie.png" id="buggie" alt="buggie" width="78" height="215"> - <div id="content"> - <h1>$title</h1> - <p>$description</p> - <h3>Error $code</h3> - <p><a href="/">this site</a></p> - </div> - </body> -</html> -EOT -} - ############### # Permissions # ############### @@ -427,9 +378,6 @@ sub FILESYSTEM { "skins/yui3.css" => { perms => CGI_READ, overwrite => 1, contents => $yui3_all_css }, - "$confdir/env.conf" => { perms => CGI_READ, - overwrite => 1, - contents => \&HTTPD_ENV_CONF }, ); # Create static error pages. diff --git a/Bugzilla/Install/Localconfig.pm b/Bugzilla/Install/Localconfig.pm index 39063ee63..ac21a0cb7 100644 --- a/Bugzilla/Install/Localconfig.pm +++ b/Bugzilla/Install/Localconfig.pm @@ -186,7 +186,15 @@ use constant LOCALCONFIG_VARS => ( { name => 'shadowdb_pass', default => '', - } + }, + { + name => 'datadog_host', + default => '', + }, + { + name => 'datadog_port', + default => 8125, + }, ); |