From: Vincent Vanwaelscappel Date: Wed, 22 Nov 2023 16:49:17 +0000 (+0100) Subject: wait #6501 @1 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=a0ecc05b1cd0086a46886654cf64cee25f749fe4;p=fluidbook-toolbox.git wait #6501 @1 --- diff --git a/app/Fluidbook/Farm.php b/app/Fluidbook/Farm.php index a02957805..7c97def51 100644 --- a/app/Fluidbook/Farm.php +++ b/app/Fluidbook/Farm.php @@ -22,7 +22,7 @@ class Farm protected static $_farmServers = [ ['name' => 'alphaville', 'host' => 'fluidbook-processfarm', 'port' => 9000, 'weight' => 12, 'region' => Region::EUROPE], - ['name' => 'brazil', 'host' => 'brazil.cubedesigners.com', 'weight' => 6, 'region' => Region::EUROPE], + ['name' => 'brazil', 'host' => 'brazil.cubedesigners.com', 'weight' => 6, 'region' => Region::USA], ['name' => 'clockwork', 'host' => 'clockwork.cubedesigners.com', 'weight' => 2, 'region' => Region::EUROPE], ['name' => 'dracula', 'host' => 'dracula.cubedesigners.com', 'weight' => 6, 'region' => Region::EUROPE], ['name' => 'dobermann', 'host' => 'dobermann.cubedesigners.com', 'weight' => 6, 'region' => Region::EUROPE], diff --git a/app/Models/FluidbookDocument.php b/app/Models/FluidbookDocument.php index 3938a676d..9a6321675 100644 --- a/app/Models/FluidbookDocument.php +++ b/app/Models/FluidbookDocument.php @@ -244,6 +244,12 @@ class FluidbookDocument extends ToolboxModel $to = $this->path('', $newRegion); $rsync = new Rsync($from, $to, false); $rsync->setMove(true); + $rsync->setFollowSymlinks(true); + $rsync->execute(); + + $rsync = new Rsync($from, $to, false); + $rsync->setMove(true); + $rsync->setCopySymlinksAsSymlinks(true); $rsync->execute(); } $this->region = $newRegion; diff --git a/app/Models/FluidbookPublication.php b/app/Models/FluidbookPublication.php index a69d6d0a9..deb1615de 100644 --- a/app/Models/FluidbookPublication.php +++ b/app/Models/FluidbookPublication.php @@ -836,6 +836,12 @@ class FluidbookPublication extends ToolboxStatusModel $to = $this->protected_path('fluidbookpublication/' . $dir . '/' . $this->id, $newRegion); $rsync = new Rsync($from, $to, false); $rsync->setMove(true); + $rsync->setFollowSymlinks(true); + $rsync->execute(); + + $rsync = new Rsync($from, $to, false); + $rsync->setMove(true); + $rsync->setCopySymlinksAsSymlinks(true); $rsync->execute(); } }