try #7398 @0.5

diff --git a/.docker/config/mariadb/connections.cnf b/.docker/config/mariadb/connections.cnf
index f623ae6ab0e8959acd3878fdc63aa94fc33ffb2c..801de4e2080e95f0384ee898bd58cb291c296c25 100644 (file)
--- 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 d8ede16d49b6f682480dab5e58511d0293ff57ca..c00031c7f8a2a10f0d7746dfeaec893ee63ee5c9 100644 (file)
--- 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 b4a955b9d49a2101af4f42ee138232904f57c595..d2d979e63df9d0c1336a4fd67e2dfe8e8f6e5eee 100644 (file)
--- 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 6bf67e9c82bfa6921a7c2f4cbdbf7168453b7b97..fb04208aa6e15d0f06e4a6ba23afd75f8912d5fc 100644 (file)
--- 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 27e237fb4386d7e822be348a4e9021da13a9117d..b48a7ffdf49f9bd74878b5a209593214cfc78f2f 100644 (file)
--- 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 a9c5666b2d62ea948bb071467669e119e4d9a9d1..048e06472fad9e685fa214f3f84dabd6e96e800d 100644 (file)
--- 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 b69671887a1381b8c27a93cebb6a2ccb66329c0f..d49606b69f5bc8b02f9189e34974917b6491c0d8 100644 (file)
--- 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 bec492e4623fd8b349c1c6abf34170c14f4a0590..60397611c87c0cd50943f63b7be0c0d1241769a6 100644 (file)
--- 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 e578dad5e47020d3186a30bdf0bf4673cc9a2eb8..2f4e6dcb7c832f6af8a1446c69f3d1cf0d8f17dc 100644 (file)
--- 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 fe1f12e6cb44dcb9afa00691cd27139f8145267f..215099668f8b0335d7c9ac9aec4fa3b822b4aed8 100644 (file)
--- 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 5cd5afdb90670b554d6775eba2ea3321977f4f68..283d3b48164b260f2554262b95845eb7eb2a3efc 100644 (file)
--- 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[@]}"