From: Ryan Gonzalez <rymg19@gmail.com>
Date: Sat, 11 Jul 2020 17:32:33 +0000 (-0500)
Subject: Move lbheartbeat out of BMO (#46)
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=899d82956cb0334139d3ed6b05004baff65690ee;p=thirdparty%2Fbugzilla.git

Move lbheartbeat out of BMO (#46)

This would cause startup to fail when the BMO extension was disabled,
as assert_httpd would fail to test the __lbheartbeat__ endpoint.
---

diff --git a/Bugzilla/Install/Filesystem.pm b/Bugzilla/Install/Filesystem.pm
index baa06ad3a..9f0eb2f55 100644
--- a/Bugzilla/Install/Filesystem.pm
+++ b/Bugzilla/Install/Filesystem.pm
@@ -329,6 +329,8 @@ sub FILESYSTEM {
   # The name of each file, pointing at its default permissions and
   # default contents.
   my %create_files = (
+    "__lbheartbeat__" => {perms => CGI_READ, contents => 'httpd OK'},
+
     "$datadir/extensions/additional" => {perms => CGI_READ, contents => ''},
 
     # We create this file so that it always has the right owner
diff --git a/extensions/BMO/Extension.pm b/extensions/BMO/Extension.pm
index 91b0c7ff3..2136222a2 100644
--- a/extensions/BMO/Extension.pm
+++ b/extensions/BMO/Extension.pm
@@ -2524,12 +2524,6 @@ sub install_filesystem {
   my $files          = $args->{files};
   my $create_files   = $args->{create_files};
   my $extensions_dir = bz_locations()->{extensionsdir};
-  $create_files->{__lbheartbeat__} = {
-    perms => Bugzilla::Install::Filesystem::WS_SERVE,
-    overwrite => 1,            # the original value for this was wrong, overwrite it
-    contents  => 'httpd OK',
-  };
-
 
   # version.json needs to have a source attribute pointing to
   # our repository. We already have this information in the (static)