wait #6501 @1

diff --git a/app/Fluidbook/Farm.php b/app/Fluidbook/Farm.php
index a02957805a73cc81f216b107d9f2b6080a64a947..7c97def517e249eef7b37b8e07ac2f792a086ea2 100644 (file)
--- 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 3938a676d611909072403d0467b59c35e8c855df..9a63216759f6bfba5de50fef81d1eddc44efe0af 100644 (file)
--- 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 a69d6d0a9d396d1a74a15d3056c35c8519c91e51..deb1615dee09f38b9bfe58adf81a95b03ea53354 100644 (file)
--- 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();
             }
         }