summaryrefslogtreecommitdiffstats
path: root/Bugzilla/Install
diff options
context:
space:
mode:
authorDylan William Hardison <dylan@hardison.net>2018-03-02 06:05:28 +0100
committerGitHub <noreply@github.com>2018-03-02 06:05:28 +0100
commit785a05910108a6d032e802605762d7567dec4123 (patch)
treef22f76884460d1ae17e2ed9edfef77fdf643168a /Bugzilla/Install
parentb5ece2542a5416c97f3b9e060b877404349fafe6 (diff)
downloadbugzilla-785a05910108a6d032e802605762d7567dec4123.tar.gz
bugzilla-785a05910108a6d032e802605762d7567dec4123.tar.xz
Bug 1442520 - move inbound_proxies to localconfig
Diffstat (limited to 'Bugzilla/Install')
-rw-r--r--Bugzilla/Install/Localconfig.pm7
1 files changed, 5 insertions, 2 deletions
diff --git a/Bugzilla/Install/Localconfig.pm b/Bugzilla/Install/Localconfig.pm
index 646dbc1a7..ba8e8dc57 100644
--- a/Bugzilla/Install/Localconfig.pm
+++ b/Bugzilla/Install/Localconfig.pm
@@ -43,7 +43,7 @@ our @EXPORT_OK = qw(
# might want to change this for upstream
use constant ENV_PREFIX => 'BMO_';
-use constant PARAM_OVERRIDE => qw( inbound_proxies shadowdb shadowdbhost shadowdbport shadowdbsock );
+use constant PARAM_OVERRIDE => qw( shadowdb shadowdbhost shadowdbport shadowdbsock );
sub _sensible_group {
return '' if ON_WINDOWS;
@@ -135,7 +135,6 @@ use constant LOCALCONFIG_VARS => (
{
name => 'param_override',
default => {
- inbound_proxies => undef,
memcached_servers => undef,
memcached_namespace => undef,
shadowdb => undef,
@@ -172,6 +171,10 @@ use constant LOCALCONFIG_VARS => (
name => 'ses_password',
default => '',
},
+ {
+ name => 'inbound_proxies',
+ default => _migrate_param( 'inbound_proxies', '' ),
+ },
);