From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Mon, 17 Mar 2025 16:26:58 +0000 (+0100)
Subject: try #7398 @0.5
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=7a094809623063605201308f8fd5b7061a11cfdf;p=fluidbook-toolbox.git

try #7398 @0.5
---

diff --git a/.docker/config/mariadb/connections.cnf b/.docker/config/mariadb/connections.cnf
index f623ae6ab..801de4e20 100644
--- a/.docker/config/mariadb/connections.cnf
+++ b/.docker/config/mariadb/connections.cnf
@@ -1,2 +1,2 @@
 [mariadb]
-max_connections = 1024
+max_connections = 64
diff --git a/.docker/config/mariadb/finetuning.cnf b/.docker/config/mariadb/finetuning.cnf
index d8ede16d4..c00031c7f 100644
--- a/.docker/config/mariadb/finetuning.cnf
+++ b/.docker/config/mariadb/finetuning.cnf
@@ -2,15 +2,15 @@
 
 skip-name-resolve
 
-key_buffer_size         = 64M
-max_allowed_packet      = 256M
-max_heap_table_size     = 256M
-tmp_table_size          = 128M
+key_buffer_size         = 32M
+max_allowed_packet      = 128M
+max_heap_table_size     = 128M
+tmp_table_size          = 64M
 
-innodb_buffer_pool_size = 1G
+innodb_buffer_pool_size = 512M
 
-join_buffer_size        = 32M
-join_buffer_space_limit = 128M
+join_buffer_size        = 16M
+join_buffer_space_limit = 64M
 join_cache_level        = 6
 
-query_cache_size	= 128M
+query_cache_size	= 64M
diff --git a/.docker/config/php/fpm.conf b/.docker/config/php/fpm.conf
index b4a955b9d..d2d979e63 100644
--- a/.docker/config/php/fpm.conf
+++ b/.docker/config/php/fpm.conf
@@ -30,8 +30,8 @@ user = 1001
 group = 33
 
 pm = dynamic
-pm.max_children = 32
-pm.start_servers = 18
-pm.min_spare_servers = 16
-pm.max_spare_servers = 24
-pm.max_requests = 1000
+pm.max_children = 16
+pm.start_servers = 9
+pm.min_spare_servers = 8
+pm.max_spare_servers = 12
+pm.max_requests = 100
diff --git a/app/Fluidbook/Farm.php b/app/Fluidbook/Farm.php
index 6bf67e9c8..fb04208aa 100644
--- a/app/Fluidbook/Farm.php
+++ b/app/Fluidbook/Farm.php
@@ -20,7 +20,7 @@ class Farm
     protected static $_region = Region::EUROPE;
 
     protected static $_farmServers = [
-        ['name' => 'amadeus', 'host' => 'amadeus.cubedesigners.com', 'weight' => 4, 'region' => Region::EUROPE, 'local' => false],
+        ['name' => 'amadeus', 'host' => 'amadeus.cubedesigners.com', 'weight' => 1, 'region' => Region::EUROPE, 'local' => false],
         ['name' => 'benhur', 'host' => 'amadeus.cubedesigners.com', 'weight' => 8, 'region' => Region::EUROPE, 'local' => false],
         ['name' => 'cloudatlas', 'host' => 'cloudatlas.cubedesigners.com', 'weight' => 2, 'region' => Region::EUROPE, 'local' => false],
         ['name' => 'dobermann', 'host' => 'dobermann.cubedesigners.com', 'weight' => 6, 'region' => Region::EUROPE, 'local' => false],
diff --git a/resources/servers/amadeus/firewall b/resources/servers/amadeus/firewall
index 27e237fb4..b48a7ffdf 100644
--- a/resources/servers/amadeus/firewall
+++ b/resources/servers/amadeus/firewall
@@ -14,11 +14,12 @@ l1=10.0.0.0/8
 l2=172.16.0.0/12
 l3=192.168.0.0/16
 i0=`dig +short paris.cubedesigners.com | tail -1`
-i1=`dig +short montpellier.cubedesigners.com | tail -1`
-i2=`dig +short tortuga.enhydra.fr | tail -1`
-i3=`dig +short cocodrilo.enhydra.fr | tail -1`
+i1=`dig +short old.paris.cubedesigners.com | tail -1`
+i2=`dig +short montpellier.cubedesigners.com | tail -1`
+i3=`dig +short tortuga.enhydra.fr | tail -1`
+i4=`dig +short cocodrilo.enhydra.fr | tail -1`
 
-local=($l0 $l1 $l2 $l3 $i0 $i1 $i2 $i3)
+local=($l0 $l1 $l2 $l3 $i0 $i1 $i2 $i3 $i4)
 
 b0=24.104.34.225
 b1=62.99.220.220
@@ -44,7 +45,7 @@ s6=`dig +short fastandfurious.cubedesigners.com | tail -1`
 
 auth=($s1 $s1_0 $s2 $s2_0 $s2_1 $s2_2 $s2_3 $s2_4 $s2_5 $s2_6 $s2_7 $s3 $s4 $s5 $s6)
 
-docker_allowed=($i0 $i1 $i2 $i3 $s1 $s1_0 $s2 $s2_0 $s2_1 $s2_2 $s2_3 $s2_4 $s2_5 $s2_6 $s2_7 $s3 $s4 $s5 $s6)
+docker_allowed=($i0 $i1 $i2 $i3 $i4 $s1 $s1_0 $s2 $s2_0 $s2_1 $s2_2 $s2_3 $s2_4 $s2_5 $s2_6 $s2_7 $s3 $s4 $s5 $s6)
 
 
 for ip in "${blacklist[@]}"
diff --git a/resources/servers/benhur/firewall b/resources/servers/benhur/firewall
index a9c5666b2..048e06472 100644
--- a/resources/servers/benhur/firewall
+++ b/resources/servers/benhur/firewall
@@ -14,11 +14,12 @@ l1=10.0.0.0/8
 l2=172.16.0.0/12
 l3=192.168.0.0/16
 i0=`dig +short paris.cubedesigners.com | tail -1`
-i1=`dig +short montpellier.cubedesigners.com | tail -1`
-i2=`dig +short tortuga.enhydra.fr | tail -1`
-i3=`dig +short cocodrilo.enhydra.fr | tail -1`
+i1=`dig +short old.paris.cubedesigners.com | tail -1`
+i2=`dig +short montpellier.cubedesigners.com | tail -1`
+i3=`dig +short tortuga.enhydra.fr | tail -1`
+i4=`dig +short cocodrilo.enhydra.fr | tail -1`
 
-local=($l0 $l1 $l2 $l3 $i0 $i1 $i2 $i3)
+local=($l0 $l1 $l2 $l3 $i0 $i1 $i2 $i3 $i4)
 
 b0=24.104.34.225
 b1=62.99.220.220
@@ -44,7 +45,7 @@ s6=`dig +short fastandfurious.cubedesigners.com | tail -1`
 
 auth=($s0 $s0_0 $s2 $s2_0 $s2_1 $s2_2 $s2_3 $s2_4 $s2_5 $s2_6 $s2_7 $s3 $s4 $s5 $s6)
 
-docker_allowed=($i0 $i1 $i2 $i3 $s0 $s0_0 $s2 $s2_0 $s2_1 $s2_2 $s2_3 $s2_4 $s2_5 $s2_6 $s2_7 $s3 $s4 $s5 $s6)
+docker_allowed=($i0 $i1 $i2 $i3 $i4 $s0 $s0_0 $s2 $s2_0 $s2_1 $s2_2 $s2_3 $s2_4 $s2_5 $s2_6 $s2_7 $s3 $s4 $s5 $s6)
 
 
 for ip in "${blacklist[@]}"
diff --git a/resources/servers/cloudatlas/firewall b/resources/servers/cloudatlas/firewall
index b69671887..d49606b69 100644
--- a/resources/servers/cloudatlas/firewall
+++ b/resources/servers/cloudatlas/firewall
@@ -14,11 +14,12 @@ l1=10.0.0.0/8
 l2=172.16.0.0/12
 l3=192.168.0.0/16
 i0=`dig +short paris.cubedesigners.com | tail -1`
-i1=`dig +short montpellier.cubedesigners.com | tail -1`
-i2=`dig +short tortuga.enhydra.fr | tail -1`
-i3=`dig +short cocodrilo.enhydra.fr | tail -1`
+i1=`dig +short old.paris.cubedesigners.com | tail -1`
+i2=`dig +short montpellier.cubedesigners.com | tail -1`
+i3=`dig +short tortuga.enhydra.fr | tail -1`
+i4=`dig +short cocodrilo.enhydra.fr | tail -1`
 
-local=($l0 $l1 $l2 $l3 $i0 $i1 $i2 $i3)
+local=($l0 $l1 $l2 $l3 $i0 $i1 $i2 $i3 $i4)
 
 b0=24.104.34.225
 b1=62.99.220.220
@@ -37,7 +38,7 @@ s6=`dig +short fastandfurious.cubedesigners.com | tail -1`
 
 auth=($s0 $s0_0 $s1 $s1_0 $s3 $s4 $s5 $s6)
 
-docker_allowed=($i0 $i1 $i2 $i3 $s0 $s0_0 $s1 $s1_0 $s3 $s4 $s5 $s6)
+docker_allowed=($i0 $i1 $i2 $i3 $i4 $s0 $s0_0 $s1 $s1_0 $s3 $s4 $s5 $s6)
 
 
 for ip in "${blacklist[@]}"
diff --git a/resources/servers/dobermann/firewall b/resources/servers/dobermann/firewall
index bec492e46..60397611c 100644
--- a/resources/servers/dobermann/firewall
+++ b/resources/servers/dobermann/firewall
@@ -14,11 +14,12 @@ l1=10.0.0.0/8
 l2=172.16.0.0/12
 l3=192.168.0.0/16
 i0=`dig +short paris.cubedesigners.com | tail -1`
-i1=`dig +short montpellier.cubedesigners.com | tail -1`
-i2=`dig +short tortuga.enhydra.fr | tail -1`
-i3=`dig +short cocodrilo.enhydra.fr | tail -1`
+i1=`dig +short old.paris.cubedesigners.com | tail -1`
+i2=`dig +short montpellier.cubedesigners.com | tail -1`
+i3=`dig +short tortuga.enhydra.fr | tail -1`
+i4=`dig +short cocodrilo.enhydra.fr | tail -1`
 
-local=($l0 $l1 $l2 $l3 $i0 $i1 $i2 $i3)
+local=($l0 $l1 $l2 $l3 $i0 $i1 $i2 $i3 $i4)
 
 b0=24.104.34.225
 b1=62.99.220.220
@@ -45,7 +46,7 @@ s6=`dig +short fastandfurious.cubedesigners.com | tail -1`
 
 auth=($s0 $s0_0 $s1 $s1_0 $s2 $s2_0 $s2_1 $s2_2 $s2_3 $s2_4 $s2_5 $s2_6 $s2_7 $s4 $s5 $s6)
 
-docker_allowed=($i0 $i1 $i2 $i3 $s0 $s0_0 $s1 $s1_0 $s2 $s2_0 $s2_1 $s2_2 $s2_3 $s2_4 $s2_5 $s2_6 $s2_7 $s4 $s5 $s6)
+docker_allowed=($i0 $i1 $i2 $i3 $i4 $s0 $s0_0 $s1 $s1_0 $s2 $s2_0 $s2_1 $s2_2 $s2_3 $s2_4 $s2_5 $s2_6 $s2_7 $s4 $s5 $s6)
 
 c0=`dig +short www.fondation-sycomore.com | tail -1`
 backup=($c0)
diff --git a/resources/servers/elephantman/firewall b/resources/servers/elephantman/firewall
index e578dad5e..2f4e6dcb7 100644
--- a/resources/servers/elephantman/firewall
+++ b/resources/servers/elephantman/firewall
@@ -14,11 +14,12 @@ l1=10.0.0.0/8
 l2=172.16.0.0/12
 l3=192.168.0.0/16
 i0=`dig +short paris.cubedesigners.com | tail -1`
-i1=`dig +short montpellier.cubedesigners.com | tail -1`
-i2=`dig +short tortuga.enhydra.fr | tail -1`
-i3=`dig +short cocodrilo.enhydra.fr | tail -1`
+i1=`dig +short old.paris.cubedesigners.com | tail -1`
+i2=`dig +short montpellier.cubedesigners.com | tail -1`
+i3=`dig +short tortuga.enhydra.fr | tail -1`
+i4=`dig +short cocodrilo.enhydra.fr | tail -1`
 
-local=($l0 $l1 $l2 $l3 $i0 $i1 $i2 $i3)
+local=($l0 $l1 $l2 $l3 $i0 $i1 $i2 $i3 $i4)
 
 b0=24.104.34.225
 b1=62.99.220.220
@@ -45,7 +46,7 @@ s6=`dig +short fastandfurious.cubedesigners.com | tail -1`
 
 auth=($s0 $s0_0 $s1 $s1_0 $s2 $s2_0 $s2_1 $s2_2 $s2_3 $s2_4 $s2_5 $s2_6 $s2_7 $s3 $s4 $s6)
 
-docker_allowed=($i0 $i1 $i2 $i3 $s0 $s0_0 $s1 $s1_0 $s2 $s2_0 $s2_1 $s2_2 $s2_3 $s2_4 $s2_5 $s2_6 $s2_7 $s3 $s4 $s6)
+docker_allowed=($i0 $i1 $i2 $i3 $i4 $s0 $s0_0 $s1 $s1_0 $s2 $s2_0 $s2_1 $s2_2 $s2_3 $s2_4 $s2_5 $s2_6 $s2_7 $s3 $s4 $s6)
 
 
 for ip in "${blacklist[@]}"
diff --git a/resources/servers/fastandfurious/firewall b/resources/servers/fastandfurious/firewall
index fe1f12e6c..215099668 100644
--- a/resources/servers/fastandfurious/firewall
+++ b/resources/servers/fastandfurious/firewall
@@ -14,11 +14,12 @@ l1=10.0.0.0/8
 l2=172.16.0.0/12
 l3=192.168.0.0/16
 i0=`dig +short paris.cubedesigners.com | tail -1`
-i1=`dig +short montpellier.cubedesigners.com | tail -1`
-i2=`dig +short tortuga.enhydra.fr | tail -1`
-i3=`dig +short cocodrilo.enhydra.fr | tail -1`
+i1=`dig +short old.paris.cubedesigners.com | tail -1`
+i2=`dig +short montpellier.cubedesigners.com | tail -1`
+i3=`dig +short tortuga.enhydra.fr | tail -1`
+i4=`dig +short cocodrilo.enhydra.fr | tail -1`
 
-local=($l0 $l1 $l2 $l3 $i0 $i1 $i2 $i3)
+local=($l0 $l1 $l2 $l3 $i0 $i1 $i2 $i3 $i4)
 
 b0=24.104.34.225
 b1=62.99.220.220
@@ -45,7 +46,7 @@ s5=`dig +short elephantman.cubedesigners.com | tail -1`
 
 auth=($s0 $s0_0 $s1 $s1_0 $s2 $s2_0 $s2_1 $s2_2 $s2_3 $s2_4 $s2_5 $s2_6 $s2_7 $s3 $s4 $s5)
 
-docker_allowed=($i0 $i1 $i2 $i3 $s0 $s0_0 $s1 $s1_0 $s2 $s2_0 $s2_1 $s2_2 $s2_3 $s2_4 $s2_5 $s2_6 $s2_7 $s3 $s4 $s5)
+docker_allowed=($i0 $i1 $i2 $i3 $i4 $s0 $s0_0 $s1 $s1_0 $s2 $s2_0 $s2_1 $s2_2 $s2_3 $s2_4 $s2_5 $s2_6 $s2_7 $s3 $s4 $s5)
 
 ufw allow 51820
 
diff --git a/resources/servers/kingkong/firewall b/resources/servers/kingkong/firewall
index 5cd5afdb9..283d3b481 100644
--- a/resources/servers/kingkong/firewall
+++ b/resources/servers/kingkong/firewall
@@ -14,11 +14,12 @@ l1=10.0.0.0/8
 l2=172.16.0.0/12
 l3=192.168.0.0/16
 i0=`dig +short paris.cubedesigners.com | tail -1`
-i1=`dig +short montpellier.cubedesigners.com | tail -1`
-i2=`dig +short tortuga.enhydra.fr | tail -1`
-i3=`dig +short cocodrilo.enhydra.fr | tail -1`
+i1=`dig +short old.paris.cubedesigners.com | tail -1`
+i2=`dig +short montpellier.cubedesigners.com | tail -1`
+i3=`dig +short tortuga.enhydra.fr | tail -1`
+i4=`dig +short cocodrilo.enhydra.fr | tail -1`
 
-local=($l0 $l1 $l2 $l3 $i0 $i1 $i2 $i3)
+local=($l0 $l1 $l2 $l3 $i0 $i1 $i2 $i3 $i4)
 
 b0=24.104.34.225
 b1=62.99.220.220
@@ -45,7 +46,7 @@ s6=`dig +short fastandfurious.cubedesigners.com | tail -1`
 
 auth=($s0 $s0_0 $s1 $s1_0 $s2 $s2_0 $s2_1 $s2_2 $s2_3 $s2_4 $s2_5 $s2_6 $s2_7 $s3 $s5 $s6)
 
-docker_allowed=($i0 $i1 $i2 $i3 $s0 $s0_0 $s1 $s1_0 $s2 $s2_0 $s2_1 $s2_2 $s2_3 $s2_4 $s2_5 $s2_6 $s2_7 $s3 $s5 $s6)
+docker_allowed=($i0 $i1 $i2 $i3 $i4 $s0 $s0_0 $s1 $s1_0 $s2 $s2_0 $s2_1 $s2_2 $s2_3 $s2_4 $s2_5 $s2_6 $s2_7 $s3 $s5 $s6)
 
 
 for ip in "${blacklist[@]}"