wip #8026 @2

diff --git a/.docker/config/ssh/root/authorized_keys2 b/.docker/config/ssh/root/authorized_keys2
index 9f111296325db0727bb3320cbedb92e0246d9822..bf150ee988c9ab7fc4c59b4d42589df8966ca742 100644 (file)
--- a/.docker/config/ssh/root/authorized_keys2
+++ b/.docker/config/ssh/root/authorized_keys2
@@ -3,3 +3,4 @@ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDwRQkEWWqc1KbEyiTxR2doyaYccrlVrtpFETuzoB9Q
 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDYAQ/tdQpfweVSyxgvF7hFtl4ax+0g8uI102LeH4NmZtzh85DmD3ccoN5UvAf3SOU6nTGLBN2i/YGRruYmm3PDDYBwyKmq3d1ZqUd8ItNfmTlVbRQme0qE6uOVfHgiejDqm9SS0kbI0lYi/BHp7sWK0UM18iE6NbsSgxw468FwBhtSiR78dw1yEhZQdtQDxusD6LbsGDsj37bV9YHFPVslzc6Bkf4fg9igm5YStCdmcYG86t0RUZDfHw6YGuIxXWkDRh1fpC6yj3Wv+n4+Zho5Bjlryg+YRhxFzno2VxgIeScIAernhUq3yy2whZU3jrWfXKfxutPmpCowl17ydcMXUr8Zt44RaYSVJI6V2lbw/B3HWW8BjkVmHlzDhulw4sJzWYoQOhiDLrUFprdF49CtYFrfsuVOx1IwETfnKKI0w5JqID+sa1iYCtgP9BdfO/H04iW3pFeaNhKW89c7GNZHhNuAS9x5wmcDpYiu2DH/ZIZIQ2wGKcyiZ0sMXQqBS4U= 33610@AYOR
 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDd3a5uU/RbUdeus+L/PbhsAFpt1Y/2yQFixEhtL5OH5DP88bXh4Jy0n42BKlLlc2JPGQ1wkJpJRY8aWwvL4hmtIPFC6dQNigHD/vdBJNEiL6tlD+qiLfibJsbvgPnyZ2wcsWTDBjt24R0iuq3urO6N+ZXWw8w1nCJp6POh6POB1tCeEO6AoyiQnDQJZfV+6bsDRHWqsn6h/GmiVdVzWGPU64C9Ats4daC33wwkFtBBRpcQC53FzmbRMfUkcABc5qc5QWGJyuEqlSV4vpJC2JIaJU1qBt2BXbx5FX/fav3fy+5PWHeW7J0k4PT0/sRWRSfDsvvPpl13OouAgPmKdEXYg7aFslaxaRrnjt+ESfE+NX3VIOf6vKw+z7W6BqcfmRWvo2isqkQESSEEhWhag2nQlYVqkYHAZxbZavni/BmKCCK5+Olrr236dRdp3O9DqxRKMZTf/WcejIrjrwQ3+R442eUX2P8+DZEVZLvId31TUT1m3qvr0q5TeEErotFUijU= fluidbook-hosting-loadbalancer
 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCrZpeStc0IE5I76kSzW2SICZ4MCRy0dcpIqTJl2SYpQDVHV6zaYeC50cKzBZXAfht4TEGdeGg1YyRa/lHkWL0+J+hiHuuern4i4gc6TJqbK590joffgf6J4XJWilKstaTsQFxTPdN9eJKYeeUyfBdwuBvgC0eZaUOPjXcxBhSvYleR2LQ1oYx1ACoGFrtmxwb+CQaNhk3zAwTbY3OOI95EUrIrpm8mrDPP3QShTo+TZTJqShXW8PBSHjEN83W0l3Uv7llYJETNUo6EimPcAzhiBQhX1UrskevfFvcIOqCB2nKzBbS5oC5eCl9DCkzJ7amI34/w2MP8aJ66mjmlx5dM9UHAnK98gr2F/Ag+R6FbTiYzTAsLQ3rCD4RuHtDTnDBBia7zG9mVhU1xOJh7uTD7ExigT4FUo+OXzcDaTl8eZcLZH0mSwMjURzdUyrSJQK1KfwrS6DUYaSJjmggDhgg2gNX790PW2Nx5N8bWDqhXojxoDbsO5+CfkNhUDk0KD3U= root@cloudatlas
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDE9hlH1DgCjfd1zbPkJq++097lDMpswCnfO5UIGudulH1/v97PmqhpUC6mqmgqLHL8Vz8S3zbrNUfQPGSRRRZaz7KPLSU/rYY7i995oRlTe8h3v/zdOf7vNsdt1sWl/UsCEqIazwQsxyg8FVkQcc2JgNs5nLdXK2iM/ajl0pMNTTWd6IQeWdkmI5m7ajlM06LD3Jf777TWvCpyxoMvll5FaCWh5S01BoLiiGfvCSIsnC149XnVv0yLChhwssxVOZTQ2Sjwno7mOx9Ow4jSrQYclOfY9H1NfzT+B81lKyIR7nD0U0cC9lC8iDmpS58ukN64YLOLf6SNOkMB0UF/99K4lqNXWnS2JQtA+nvqC52jUj5UHd/UeH05h6cH0LnVjIB3AziPc7P8j+B/xhj/blbDpcptpIhK6rCJEgrNY2b9fgl/gLxuJ4myx4D0jBjQC4i5qefvjoul+a2itmZlTf/VkQesBXwZxPMWNpWk89RDQg/mO5Ypzhg5+4l1LPR1AvU= root@hotfuzz

diff --git a/.docker/config/ssh/user/authorized_keys2 b/.docker/config/ssh/user/authorized_keys2
index 57de4ce9c24187054947133cd7472b95d290cf66..bf150ee988c9ab7fc4c59b4d42589df8966ca742 100644 (file)
--- a/.docker/config/ssh/user/authorized_keys2
+++ b/.docker/config/ssh/user/authorized_keys2
@@ -1,6 +1,6 @@
 ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAQEAtabxRZZMjtmq+r8uXsBmfLgAtkxqwigGpx0e6Mx066ukIWIafFsguity6aV5QNI4UfxXnX3QXROcWeIiyLBV4yDGxuq7ah4r0X1CjqHUvHoGpXwJ2DIWPeaa8XyXnavmj0SNtKn0f1T+oJS0fcryUTLyxY7eOgNsr+pp1fVmgca9Efj0BKUXV/SUIjp8JX3x0/E/3PAqG81zus2SxzuOO1b0FKXDq43Gx6Ov3Ok7+Pje4G4pB56rJiiXlPxrBlY0e8Pz/7+kFF8izCiztJLtZig32Dx0HbLYGtSvIPJKYxK8DDD/RWWpL3mgNPYZ2PE3wHf4c7CTlxLCDP+NeRS1yQ== vincent+2021@cubedesigners.com
 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDwRQkEWWqc1KbEyiTxR2doyaYccrlVrtpFETuzoB9QaBp4x+Iz948f1l7s4t+8JKU+AomYoPM7sDNoSaUihMxBz7zsI0HH41Bw5my1X0ugzt6dEPpR6VL31/DMeDRDAvJWH/kCDBjxclOJVv52E8sdPqvsKo3VeCZz1gdw0I+AEVFaTtZGFyXUW5/7iPi6kpxkPOoO83+7Ijb+Jdso/KT99Hp+X6W0NsTUpQiRt4+Vp9AKl8hXfPYzx2Nw86w8Lw/nIp6rwJ/c/ZmgCZFMEN2NrRbfQtV32E7c2QT25ljwNRfNc/wjzH4QJgTB2TPbqid01w/9EQr6G1wcqD0zZZeUe+Fz/rXo/sJkhlTIrvfO4pJx6IS4x+r1pTBECOt++9+6MhiBHUL2TsIUQBu52QPXqLfUP8S/HjPgDNA0bUM7S7t8jBIHj2MuVKIDqWgcSIV4Gcs38aMy2mqR4lh0i1bM7eP2MQfbK3Q1hpHzJkuUiZx9gHgnaie+AA14srMW16k= root@her.cubedesigners.com
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC3kvjNsFj8/D1G2wE6puNcS4VwFHARPmgKNFxgtDy+a+gHcDiuygYhZjJy8lYpo02N7I2kV9Mo3+nWH1Ain1FbjAPVGP5VBwujriFJkfcOev76b8uwVs/xFwdJn3Oc0AnVvu/03tvZv1vVVmAGE/S6Ym9BmCDVWC2pOVdySvt2hmljSoQaZQzPT5DHdwgenbDPU26TmSchFRy/K/a32+juua8P+eceOypi+bzV0K723h4x5teq4rQmsbqFalfUnh0FAYdXbzkTXBfhE/h4D8TkGMkCCgRJSuw5I5SP3XEuDEB24Bzd5HEjAQgrigGE2L697sYEgJkit7WUOQmB1DokgqCc3GgkfUE6/0TKeNeXQv15z7hQ9192Qnjo2Z7qcnebiZrozxo5i7tArJssHekrkMIzF4ujVL0WLLxXt85YAN/AB4A15B1lTM1Cyarp7kFK3mVD7nicJYsCapEgaVa8im6MIJoASg4/qRCrA006LQqC2TyX5wi9mECgJhKCp80= fluidbookfarmer@cubedesigners.com
 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDYAQ/tdQpfweVSyxgvF7hFtl4ax+0g8uI102LeH4NmZtzh85DmD3ccoN5UvAf3SOU6nTGLBN2i/YGRruYmm3PDDYBwyKmq3d1ZqUd8ItNfmTlVbRQme0qE6uOVfHgiejDqm9SS0kbI0lYi/BHp7sWK0UM18iE6NbsSgxw468FwBhtSiR78dw1yEhZQdtQDxusD6LbsGDsj37bV9YHFPVslzc6Bkf4fg9igm5YStCdmcYG86t0RUZDfHw6YGuIxXWkDRh1fpC6yj3Wv+n4+Zho5Bjlryg+YRhxFzno2VxgIeScIAernhUq3yy2whZU3jrWfXKfxutPmpCowl17ydcMXUr8Zt44RaYSVJI6V2lbw/B3HWW8BjkVmHlzDhulw4sJzWYoQOhiDLrUFprdF49CtYFrfsuVOx1IwETfnKKI0w5JqID+sa1iYCtgP9BdfO/H04iW3pFeaNhKW89c7GNZHhNuAS9x5wmcDpYiu2DH/ZIZIQ2wGKcyiZ0sMXQqBS4U= 33610@AYOR
 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDd3a5uU/RbUdeus+L/PbhsAFpt1Y/2yQFixEhtL5OH5DP88bXh4Jy0n42BKlLlc2JPGQ1wkJpJRY8aWwvL4hmtIPFC6dQNigHD/vdBJNEiL6tlD+qiLfibJsbvgPnyZ2wcsWTDBjt24R0iuq3urO6N+ZXWw8w1nCJp6POh6POB1tCeEO6AoyiQnDQJZfV+6bsDRHWqsn6h/GmiVdVzWGPU64C9Ats4daC33wwkFtBBRpcQC53FzmbRMfUkcABc5qc5QWGJyuEqlSV4vpJC2JIaJU1qBt2BXbx5FX/fav3fy+5PWHeW7J0k4PT0/sRWRSfDsvvPpl13OouAgPmKdEXYg7aFslaxaRrnjt+ESfE+NX3VIOf6vKw+z7W6BqcfmRWvo2isqkQESSEEhWhag2nQlYVqkYHAZxbZavni/BmKCCK5+Olrr236dRdp3O9DqxRKMZTf/WcejIrjrwQ3+R442eUX2P8+DZEVZLvId31TUT1m3qvr0q5TeEErotFUijU= fluidbook-hosting-loadbalancer
 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCrZpeStc0IE5I76kSzW2SICZ4MCRy0dcpIqTJl2SYpQDVHV6zaYeC50cKzBZXAfht4TEGdeGg1YyRa/lHkWL0+J+hiHuuern4i4gc6TJqbK590joffgf6J4XJWilKstaTsQFxTPdN9eJKYeeUyfBdwuBvgC0eZaUOPjXcxBhSvYleR2LQ1oYx1ACoGFrtmxwb+CQaNhk3zAwTbY3OOI95EUrIrpm8mrDPP3QShTo+TZTJqShXW8PBSHjEN83W0l3Uv7llYJETNUo6EimPcAzhiBQhX1UrskevfFvcIOqCB2nKzBbS5oC5eCl9DCkzJ7amI34/w2MP8aJ66mjmlx5dM9UHAnK98gr2F/Ag+R6FbTiYzTAsLQ3rCD4RuHtDTnDBBia7zG9mVhU1xOJh7uTD7ExigT4FUo+OXzcDaTl8eZcLZH0mSwMjURzdUyrSJQK1KfwrS6DUYaSJjmggDhgg2gNX790PW2Nx5N8bWDqhXojxoDbsO5+CfkNhUDk0KD3U= root@cloudatlas
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDE9hlH1DgCjfd1zbPkJq++097lDMpswCnfO5UIGudulH1/v97PmqhpUC6mqmgqLHL8Vz8S3zbrNUfQPGSRRRZaz7KPLSU/rYY7i995oRlTe8h3v/zdOf7vNsdt1sWl/UsCEqIazwQsxyg8FVkQcc2JgNs5nLdXK2iM/ajl0pMNTTWd6IQeWdkmI5m7ajlM06LD3Jf777TWvCpyxoMvll5FaCWh5S01BoLiiGfvCSIsnC149XnVv0yLChhwssxVOZTQ2Sjwno7mOx9Ow4jSrQYclOfY9H1NfzT+B81lKyIR7nD0U0cC9lC8iDmpS58ukN64YLOLf6SNOkMB0UF/99K4lqNXWnS2JQtA+nvqC52jUj5UHd/UeH05h6cH0LnVjIB3AziPc7P8j+B/xhj/blbDpcptpIhK6rCJEgrNY2b9fgl/gLxuJ4myx4D0jBjQC4i5qefvjoul+a2itmZlTf/VkQesBXwZxPMWNpWk89RDQg/mO5Ypzhg5+4l1LPR1AvU= root@hotfuzz

diff --git a/app/Fluidbook/Farm.php b/app/Fluidbook/Farm.php
index 64891a45949a7408757708b4efcb4efc18d26c47..6c11ef073b5bba683d6749a89b788f057d8da066 100644 (file)
--- a/app/Fluidbook/Farm.php
+++ b/app/Fluidbook/Farm.php
@@ -28,6 +28,7 @@ class Farm
         ['name' => 'elephantman', 'host' => 'paris.cubedesigners.com', 'weight' => 2, 'region' => Region::EUROPE, 'local' => false],
         ['name' => 'fastandfurious', 'host' => 'fastandfurious.cubedesigners.com', 'port' => 9460, 'weight' => 2, 'region' => Region::EUROPE, 'local' => false],
         ['name' => 'gremlins', 'host' => 'gremlins.cubedesigners.com', 'weight' => 8, 'region' => Region::EUROPE, 'local' => false],
+        ['name' => 'hotfuzz', 'host' => 'hotfuzz.cubedesigners.com', 'weight' => 4, 'region' => Region::EUROPE, 'local' => false],
         ['name' => 'isleofdogs', 'host' => 'paris.cubedesigners.com', 'port' => 9458, 'weight' => 4, 'region' => Region::EUROPE, 'local' => false],
         ['name' => 'jumanji', 'host' => 'paris.cubedesigners.com', 'port' => 9459, 'weight' => 6, 'region' => Region::EUROPE, 'local' => false],
         ['name' => 'kingkong', 'host' => 'kingkong.cubedesigners.com', 'weight' => 6, 'region' => Region::USA, 'local' => true],
@@ -367,12 +368,12 @@ class Farm
         $time = round(microtime(true) - $start, 4);
         $log = '[' . $farmer['name'] . ']' . "\t" . date('Y-m-d H:i:s') . "\t" . $time . "\t" . self::serializeParams($params) . "\t($res)\t>>" . $output . "\n";
 
-        if(isset($params['pdf'])){
-            $dir=dirname($params['pdf']) ;
-        }else if(isset($params['file'])){
-            $dir=dirname($params['file']) ;
-        }else{
-            $dir=$params['out'];
+        if (isset($params['pdf'])) {
+            $dir = dirname($params['pdf']);
+        } else if (isset($params['file'])) {
+            $dir = dirname($params['file']);
+        } else {
+            $dir = $params['out'];
         }
         $logfile = $dir . '/farm.log';
 

diff --git a/app/Fluidbook/HostingLoadBalancer.php b/app/Fluidbook/HostingLoadBalancer.php
index 558cfe094e5ea7fdd1d11271bc85c0f2290d78c9..8732f909276054bd43c6a79d6589e1ddd87cc181 100644 (file)
--- a/app/Fluidbook/HostingLoadBalancer.php
+++ b/app/Fluidbook/HostingLoadBalancer.php
@@ -11,7 +11,7 @@ class HostingLoadBalancer
         ['name' => 's2', 'host' => 's2.lb.fluidbook.com', 'weight' => 8], // Benhur
         ['name' => 's3', 'host' => 's3.lb.fluidbook.com', 'weight' => 2], // Dobermann
         ['name' => 's4', 'host' => 's4.lb.fluidbook.com', 'weight' => 8], // Gremlins
-        //  ['name' => 's5', 'host' => 's5.lb.fluidbook.com', 'weight' => 8],
+        ['name' => 's5', 'host' => 's5.lb.fluidbook.com', 'weight' => 2], // Hotfuzz
         //['name' => 's6', 'host' => 's6.lb.fluidbook.com', 'weight' => 8],
     ];