1 files changed, 12 insertions, 20 deletions

diff --git a/scripts/entrypoint.pl b/scripts/entrypoint.pl
index ce1cc795b..f5c52f6a6 100755
--- a/scripts/entrypoint.pl
+++ b/scripts/entrypoint.pl
@@ -57,11 +57,6 @@ check_env(qw(
     BMO_urlbase
 ));
 
-if ( $ENV{BMO_urlbase} eq 'AUTOMATIC' ) {
-    $ENV{BMO_urlbase} = sprintf 'http://%s:%d/%s', hostname(), $ENV{PORT}, $ENV{BZ_QA_LEGACY_MODE} ? 'bmo/' : '';
-    $ENV{BZ_BASE_URL} = sprintf 'http://%s:%d', hostname(), $ENV{PORT};
-}
-
 $func->($opts->());
 
 sub cmd_demo {
@@ -83,7 +78,6 @@ sub cmd_demo {
 sub cmd_httpd  {
     check_data_dir();
     wait_for_db();
-    check_httpd_env();
 
     my $httpd_exit_f = run_cereal_and_httpd();
     assert_httpd()->get();
@@ -111,6 +105,11 @@ sub cmd_dev_httpd {
     exit $httpd_exit_f->get;
 }
 
+sub cmd_checksetup_gen_files {
+    my (@args) = @_;
+    run( 'perl', 'checksetup.pl', '--no-database', @args);
+}
+
 sub cmd_checksetup {
     check_data_dir();
     wait_for_db();
@@ -141,7 +140,7 @@ sub cmd_test_webservices {
     check_data_dir();
     copy_qa_extension();
     assert_database()->get;
-    my $httpd_exit_f = run_cereal_and_httpd('-DHTTPD_IN_SUBDIR', '-DACCESS_LOGS');
+    my $httpd_exit_f = run_cereal_and_httpd('-DHTTPD_IN_SUBDIR');
     my $prove_exit_f = run_prove(
         httpd_url => $conf->{browser_url},
         prove_cmd => [
@@ -156,6 +155,7 @@ sub cmd_test_webservices {
 
 sub cmd_test_selenium {
     my $conf = require $ENV{BZ_QA_CONF_FILE};
+    $ENV{HTTP_BACKEND} = 'simple';
 
     check_data_dir();
     copy_qa_extension();
@@ -195,7 +195,7 @@ sub cmd_test_bmo {
     $ENV{BZ_TEST_NEWBIE2}      = 'newbie2@mozilla.example';
     $ENV{BZ_TEST_NEWBIE2_PASS} = 'captain.space.pants.time.lord';
 
-    my $httpd_exit_f = run_cereal_and_httpd('-DACCESS_LOGS');
+    my $httpd_exit_f = run_cereal_and_httpd();
     my $prove_exit_f = run_prove(
         httpd_url  => $ENV{BZ_BASE_URL},
         prove_cmd  => [ 'prove', '-I/app', '-I/app/local/lib/perl5', @prove_args ],
@@ -207,8 +207,6 @@ sub cmd_test_bmo {
 sub run_prove {
     my (%param) = @_;
 
-    check_httpd_env();
-
     my $prove_cmd    = $param{prove_cmd};
     my $prove_dir    = $param{prove_dir};
     assert_httpd()->then(sub {
@@ -246,6 +244,10 @@ sub copy_qa_extension {
     dircopy('/app/qa/extensions/QA', '/app/extensions/QA');
 }
 
+sub cmd_wait_for_db {
+    wait_for_db();
+}
+
 sub wait_for_db {
     assert_database()->get;
 }
@@ -268,16 +270,6 @@ sub check_env {
         die 'Missing required environmental variables: ', join(', ', @missing_env), "\n";
     }
 }
-sub check_httpd_env {
-    check_env(qw(
-        HTTPD_StartServers
-        HTTPD_MinSpareServers
-        HTTPD_MaxSpareServers
-        HTTPD_ServerLimit
-        HTTPD_MaxClients
-        HTTPD_MaxRequestsPerChild
-    ))
-}
 
 sub fix_path {
     $ENV{PATH} = "/app/local/bin:$ENV{PATH}";