Bug 1403777 - Migrate urlbase from params to localconfig

1 files changed, 15 insertions, 4 deletions

diff --git a/Bugzilla/Install/Localconfig.pm b/Bugzilla/Install/Localconfig.pm
index c1c8fb12e..f877829c5 100644
--- a/Bugzilla/Install/Localconfig.pm
+++ b/Bugzilla/Install/Localconfig.pm
@@ -31,6 +31,7 @@ use Tie::Hash::NamedCapture;
 use Safe;
 use Term::ANSIColor;
 use Taint::Util qw(untaint);
+use Sys::Hostname qw(hostname);
 
 use parent qw(Exporter);
 
@@ -122,10 +123,11 @@ use constant LOCALCONFIG_VARS => (
     },
     {
         name    => 'diffpath',
-        default => sub { dirname(bin_loc('diff')) },
+        default => sub { dirname( bin_loc('diff') ) },
     },
     {
-        name    => 'site_wide_secret',
+        name => 'site_wide_secret',
+
         # 64 characters is roughly the equivalent of a 384-bit key, which
         # is larger than anybody would ever be able to brute-force.
         default => sub { generate_random_password(64) },
@@ -148,14 +150,23 @@ use constant LOCALCONFIG_VARS => (
     },
     {
         name    => 'memcached_servers',
-        default =>  _migrate_param("memcached_servers", ""),
+        default => _migrate_param( "memcached_servers", "" ),
     },
     {
         name    => 'memcached_namespace',
-        default => _migrate_param("memcached_namespace", "bugzilla:"),
+        default => _migrate_param( "memcached_namespace", "bugzilla:" ),
+    },
+    {
+        name    => 'urlbase',
+        default => _migrate_param( "urlbase", "" ),
     },
+    {
+        name    => 'attachment_base',
+        default => _migrate_param( "attachment_base", '' ),
+    }
 );
 
+
 use constant ENV_KEYS => (
     (map { ENV_PREFIX . $_->{name} } LOCALCONFIG_VARS),
     (map { ENV_PREFIX . $_ } PARAM_OVERRIDE),