From dca18f8d9ded750eb3531aa93244584466447e70 Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Tue, 5 Dec 2023 21:23:07 +0100 Subject: [PATCH] wip #6555 @0.5 --- app/Jobs/HostingUpdate.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/Jobs/HostingUpdate.php b/app/Jobs/HostingUpdate.php index a21fee208..b53c72769 100644 --- a/app/Jobs/HostingUpdate.php +++ b/app/Jobs/HostingUpdate.php @@ -11,7 +11,7 @@ class HostingUpdate extends Base { protected static $_data = [ - //'hosting' => ['host' => 'clockwork.cubedesigners.com', 'basepath' => '/data/fluidbook/hosting', 'ip' => '178.33.250.33'], + 'hosting' => ['host' => 'clockwork.cubedesigners.com', 'basepath' => '/data/fluidbook/hosting', 'ip' => '178.33.250.33'], 'hosting2' => ['host' => 'clockwork.cubedesigners.com', 'basepath' => '/data/fluidbook/hosting2', 'ip' => '213.186.47.100'], //'ushosting' => ['host' => 'kingkong.cubedesigners.com', 'basepath' => '/home/fluidbook/data/hosting', 'ip' => '134.148.91.250'], ]; @@ -26,6 +26,8 @@ class HostingUpdate extends Base protected function updateHosting($name, $data) { $d = Files::mkdir(protected_path('hosting/' . $name)); + Files::emptyDir($d); + $r = Files::mkdir(resource_path('hosting')); $servers = FluidbookExternalInstallServer::withoutGlobalScopes()->where('protocol', $name)->get(); @@ -42,7 +44,7 @@ class HostingUpdate extends Base '$dockerpath' => $server->php ? '/var/www/html' : '/usr/local/apache2/htdocs', '$domains' => implode(',', Text::explodeNewLines($server->subdomains)), '$hosting' => $name, - '$path' => $data['basepath'], + '$path' => $data['basepath'].$server->base_path, ]); $updateAll[] = '/docker/fluidbook-' . $name . '/server-' . $server->id . '/update'; } -- 2.39.5