Bug 1403777 - Migrate urlbase from params to localconfig

2 files changed, 15 insertions, 16 deletions

diff --git a/Bugzilla/Install/Filesystem.pm b/Bugzilla/Install/Filesystem.pm
index bb87e499e..01b8d7e8e 100644
--- a/Bugzilla/Install/Filesystem.pm
+++ b/Bugzilla/Install/Filesystem.pm
@@ -416,9 +416,6 @@ sub FILESYSTEM {
         "skins/yui3.css"          => { perms     => CGI_READ,
                                        overwrite => 1,
                                        contents  => $yui3_all_css },
-        "robots.txt"              => { perms     => CGI_READ,
-                                       overwrite => 1,
-                                       contents  => \&robots_txt},
         "httpd/env.conf"          => { perms     => CGI_READ,
                                        overwrite => 1,
                                        contents  => \&HTTPD_ENV_CONF },
@@ -969,15 +966,6 @@ sub _check_web_server_group {
     return $group_id;
 }
 
-sub robots_txt {
-    my $output = '';
-    my %vars;
-    Bugzilla::Hook::process("before_robots_txt", { vars => \%vars });
-    Bugzilla->template->process("robots.txt.tmpl", \%vars, \$output)
-    or die Bugzilla->template->error;
-    return $output;
-}
-
 
 1;
 
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),