From 0c8e074a8699db46b97ca628464fff9c0bb06c09 Mon Sep 17 00:00:00 2001 From: Henry Whitaker Date: Fri, 10 Sep 2021 18:38:26 +0100 Subject: [PATCH] Fix the eula stuff --- app/Console/Commands/AcceptEULACommand.php | 2 +- config/speedtest.php | 2 +- docker/conf/etc/cont-init.d/50-speedtest | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/Console/Commands/AcceptEULACommand.php b/app/Console/Commands/AcceptEULACommand.php index 1aac5a2f..9eaba6ec 100644 --- a/app/Console/Commands/AcceptEULACommand.php +++ b/app/Console/Commands/AcceptEULACommand.php @@ -39,6 +39,6 @@ class AcceptEULACommand extends Command public function handle() { $this->info('Acceping EULA'); - shell_exec(config('speedtest.home') . ' && timeout 3s ' . app_path() . '/Bin/speedtest --accept-license --accept-gdpr'); + shell_exec(config('speedtest.home') . ' && timeout 10s ' . app_path() . '/Bin/speedtest --accept-license --accept-gdpr'); } } diff --git a/config/speedtest.php b/config/speedtest.php index 6c5b8800..1a384a3c 100644 --- a/config/speedtest.php +++ b/config/speedtest.php @@ -23,7 +23,7 @@ return [ |-------------------------------------------------------------------------- */ - 'home' => 'HOME=' . base_path() . DIRECTORY_SEPARATOR, + 'home' => 'HOME=/config', /* |-------------------------------------------------------------------------- diff --git a/docker/conf/etc/cont-init.d/50-speedtest b/docker/conf/etc/cont-init.d/50-speedtest index f8afdb96..2e7b1004 100644 --- a/docker/conf/etc/cont-init.d/50-speedtest +++ b/docker/conf/etc/cont-init.d/50-speedtest @@ -26,10 +26,10 @@ else tar zxvf speedtest.tgz > /dev/null cp speedtest /site/app/Bin/ - HOME=/config && timeout 10s s6-setuidgid abc /site/artisan speedtest:eula > /dev/null + HOME=/config && s6-setuidgid abc /site/artisan speedtest:eula > /dev/null HOME=/root else - HOME=/config && timeout 10s s6-setuidgid abc /config/www/artisan speedtest:eula > /dev/null + HOME=/config && s6-setuidgid abc /config/www/artisan speedtest:eula > /dev/null HOME=/root fi fi