wait #5856 @0.75

diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml
index fa306397fed1ba1ebac39d413593208552c9fde2..fd0f10851d5c6086f74e93c1ae61309bd7af4104 100644 (file)
--- a/.docker/docker-compose.yml
+++ b/.docker/docker-compose.yml
@@ -27,6 +27,7 @@ services:
       - '/mnt/sshfs/macparis:/mnt/sshfs/macparis'\r
       - '/data/extranet/www/fluidbook/cache/nwbuild:/usr/lib/node_modules/nw-builder/cache'\r
       - '/home/toolbox/www:/home/toolbox/www'\r
+      - '/data/toolbox/:/data/toolbox/'\r
       - '/home/stats/www:/home/stats/www'\r
       - '/home/wesco:/home/wesco'\r
       # Config\r
@@ -67,6 +68,7 @@ services:
       - '/mnt/sshfs/macparis:/mnt/sshfs/macparis'\r
       - '/data/extranet/www/fluidbook/cache/nwbuild:/usr/lib/node_modules/nw-builder/cache'\r
       - '/home/toolbox/www:/home/toolbox/www'\r
+      - '/data/toolbox/:/data/toolbox/'\r
       - '/home/stats/www:/home/stats/www'\r
       - '/home/wesco:/home/wesco'\r
       # Config\r
@@ -143,6 +145,7 @@ services:
       - '/mnt/sshfs/macparis:/mnt/sshfs/macparis'\r
       - '/data/extranet/www/fluidbook/cache/nwbuild:/usr/lib/node_modules/nw-builder/cache'\r
       - '/home/toolbox/www:/home/toolbox/www'\r
+      - '/data/toolbox/:/data/toolbox/'\r
       - '/home/stats/www:/home/stats/www'\r
       - '/home/wesco:/home/wesco'\r
     tmpfs:\r

diff --git a/inc/ws/Metier/class.ws.document.php b/inc/ws/Metier/class.ws.document.php
index c86dafc8eb0958707610954bf5b4092f7640ed53..891db1d686fe7b7c7bf4549ffd958a90dcb634fc 100644 (file)
--- a/inc/ws/Metier/class.ws.document.php
+++ b/inc/ws/Metier/class.ws.document.php
@@ -449,7 +449,7 @@ class wsDocument extends cubeMetier
     public static function getFarmServers()
     {
         if (null === self::$_farmServers) {
-            self::$_farmServers = json_decode(file_get_contents('/home/toolbox/www/storage/fluidbookfarm/servers'), true);
+            self::$_farmServers = json_decode(file_get_contents('/data/toolbox/storage/fluidbookfarm/servers'), true);
         }
 
         return self::$_farmServers;
@@ -458,7 +458,7 @@ class wsDocument extends cubeMetier
     public static function pickOneFarmServer($region = 'UE')
     {
         $hat = [];
-        $pings = json_decode(file_get_contents('/home/toolbox/www/storage/fluidbookfarm/pings'));
+        $pings = json_decode(file_get_contents('/data/toolbox/storage/fluidbookfarm/servers'));
 
         $allServers = [];
         $regionServers = [];