From: Dylan William Hardison Date: Thu, 3 Jan 2019 01:44:16 +0000 (-0500) Subject: no bug - remove index.html stuff X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8beffc741dc9139e53464fba92b96cef9e57fcbe;p=thirdparty%2Fbugzilla.git no bug - remove index.html stuff --- diff --git a/Bugzilla/Install/Filesystem.pm b/Bugzilla/Install/Filesystem.pm index bc287f6a2..4ae0d7338 100644 --- a/Bugzilla/Install/Filesystem.pm +++ b/Bugzilla/Install/Filesystem.pm @@ -46,18 +46,6 @@ our @EXPORT = qw( fix_file_permissions ); -use constant INDEX_HTML => <<'EOT'; - - - - - - -

I think you are looking for index.cgi

- - -EOT - use constant HTTPD_ENV => qw( LOCALCONFIG_ENV BUGZILLA_UNSAFE_AUTH_DELEGATION @@ -356,10 +344,6 @@ sub FILESYSTEM { {perms => CGI_READ, overwrite => 1, contents => $yui3_all_css}, ); - # Because checksetup controls the creation of index.html separately - # from all other files, it gets its very own hash. - my %index_html = ('index.html' => {perms => WS_SERVE, contents => INDEX_HTML}); - Bugzilla::Hook::process( 'install_filesystem', { @@ -371,7 +355,7 @@ sub FILESYSTEM { } ); - my %all_files = (%create_files, %index_html, %files); + my %all_files = (%create_files, %files); my %all_dirs = (%create_dirs, %non_recurse_dirs); return { @@ -380,7 +364,6 @@ sub FILESYSTEM { all_dirs => \%all_dirs, create_files => \%create_files, - index_html => \%index_html, all_files => \%all_files, }; } @@ -430,16 +413,6 @@ sub update_filesystem { } _create_files(%files); - if ($params->{index_html}) { - _create_files(%{$fs->{index_html}}); - } - elsif (-e 'index.html') { - my $templatedir = bz_locations()->{'templatedir'}; - print "*** It appears that you still have an old index.html hanging around.\n", - "Either the contents of this file should be moved into a template and\n", - "placed in the '$templatedir/en/custom' directory, or you should delete\n", - "the file.\n"; - } # Delete old files that no longer need to exist @@ -851,15 +824,14 @@ filesystem during installation, including creating the data/ directory. =over -=item C 0 })> +=item C Description: Creates all the directories and files that Bugzilla needs to function but doesn't ship with. Also does any updates to these files as necessary during an upgrade. -Params: C - Whether or not we should create - the F file. +Params: none Returns: nothing diff --git a/google1498b17dba53f45e.html b/google1498b17dba53f45e.html deleted file mode 100644 index 814fee5f2..000000000 --- a/google1498b17dba53f45e.html +++ /dev/null @@ -1 +0,0 @@ -google-site-verification: google1498b17dba53f45e.html \ No newline at end of file