From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Thu, 6 Mar 2025 16:18:44 +0000 (+0100)
Subject: #7374
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=9d4c8aaf32dcdd4744aa70b87a855c3e4354d252;p=fluidbook-toolbox.git

#7374
---

diff --git a/app/Fluidbook/HostingLoadBalancer.php b/app/Fluidbook/HostingLoadBalancer.php
index a82c461d0..a3b83bc06 100644
--- a/app/Fluidbook/HostingLoadBalancer.php
+++ b/app/Fluidbook/HostingLoadBalancer.php
@@ -7,9 +7,9 @@ use Cubist\Util\Files\Files;
 class HostingLoadBalancer
 {
     protected static $_servers = [
-        ['name' => 's1', 'host' => 's1.lb.fluidbook.com', 'weight' => 1],
-        //['name' => 's2', 'host' => 's2.lb.fluidbook.com', 'weight' => 2],
-        ['name' => 's3', 'host' => 's3.lb.fluidbook.com', 'weight' => 2],
+        ['name' => 's1', 'host' => 's1.lb.fluidbook.com', 'weight' => 1], // Toolbox
+        ['name' => 's2', 'host' => 's2.lb.fluidbook.com', 'weight' => 8], // Benhur
+        ['name' => 's3', 'host' => 's3.lb.fluidbook.com', 'weight' => 2], // Cloudatlas
       // ['name' => 's4', 'host' => 's4.lb.fluidbook.com', 'weight' => 2],
       //  ['name' => 's5', 'host' => 's5.lb.fluidbook.com', 'weight' => 8],
         //['name' => 's6', 'host' => 's6.lb.fluidbook.com', 'weight' => 8],
diff --git a/resources/servers/amadeus/firewall b/resources/servers/amadeus/firewall
index 62947a013..27e237fb4 100644
--- a/resources/servers/amadeus/firewall
+++ b/resources/servers/amadeus/firewall
@@ -27,6 +27,7 @@ b3=195.70.4.231
 blacklist=($b0 $b1 $b2 $b3)
 
 s1=`dig +short benhur.cubedesigners.com | tail -1`
+s1_0=`dig +short postal.cubedesigners.com | tail -1`
 s2=`dig +short cloudatlas.cubedesigners.com | tail -1`
 s2_0=`dig +short hostingdev.cubedesigners.com | tail -1`
 s2_1=`dig +short hosting.fluidbook.com | tail -1`
@@ -41,9 +42,9 @@ s4=`dig +short kingkong.cubedesigners.com | tail -1`
 s5=`dig +short elephantman.cubedesigners.com | tail -1`
 s6=`dig +short fastandfurious.cubedesigners.com | tail -1`
 
-auth=($s1 $s2 $s2_0 $s2_1 $s2_2 $s2_3 $s2_4 $s2_5 $s2_6 $s2_7 $s3 $s4 $s5 $s6)
+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 $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)
 
 
 for ip in "${blacklist[@]}"
diff --git a/resources/servers/cloudatlas/firewall b/resources/servers/cloudatlas/firewall
index 3e87e77ac..b69671887 100644
--- a/resources/servers/cloudatlas/firewall
+++ b/resources/servers/cloudatlas/firewall
@@ -29,14 +29,15 @@ blacklist=($b0 $b1 $b2 $b3)
 s0=`dig +short amadeus.cubedesigners.com | tail -1`
 s0_0=`dig +short toolbox.fluidbook.com | tail -1`
 s1=`dig +short benhur.cubedesigners.com | tail -1`
+s1_0=`dig +short postal.cubedesigners.com | tail -1`
 s3=`dig +short dobermann.cubedesigners.com | tail -1`
 s4=`dig +short kingkong.cubedesigners.com | tail -1`
 s5=`dig +short elephantman.cubedesigners.com | tail -1`
 s6=`dig +short fastandfurious.cubedesigners.com | tail -1`
 
-auth=($s0 $s0_0 $s1 $s3 $s4 $s5 $s6)
+auth=($s0 $s0_0 $s1 $s1_0 $s3 $s4 $s5 $s6)
 
-docker_allowed=($i0 $i1 $i2 $i3 $s0 $s0_0 $s1 $s3 $s4 $s5 $s6)
+docker_allowed=($i0 $i1 $i2 $i3 $s0 $s0_0 $s1 $s1_0 $s3 $s4 $s5 $s6)
 
 
 for ip in "${blacklist[@]}"
@@ -67,7 +68,7 @@ ufw deny out 22822
 ufw deny out 22222
 
 
-restricted_containers=("portainer" "monit" "satis" "git-daemon" "gitolite" "gitserver-http" )
+restricted_containers=("portainer" "monit" "git-daemon" "gitolite" "git-server" )
 
 sudo wget -O /usr/local/bin/ufw-docker https://raw.githubusercontent.com/EnhydraV/ufw-docker/refs/heads/master/ufw-docker
 sudo chmod +x /usr/local/bin/ufw-docker
diff --git a/resources/servers/dobermann/firewall b/resources/servers/dobermann/firewall
index 510d58625..bec492e46 100644
--- a/resources/servers/dobermann/firewall
+++ b/resources/servers/dobermann/firewall
@@ -29,6 +29,7 @@ blacklist=($b0 $b1 $b2 $b3)
 s0=`dig +short amadeus.cubedesigners.com | tail -1`
 s0_0=`dig +short toolbox.fluidbook.com | tail -1`
 s1=`dig +short benhur.cubedesigners.com | tail -1`
+s1_0=`dig +short postal.cubedesigners.com | tail -1`
 s2=`dig +short cloudatlas.cubedesigners.com | tail -1`
 s2_0=`dig +short hostingdev.cubedesigners.com | tail -1`
 s2_1=`dig +short hosting.fluidbook.com | tail -1`
@@ -42,9 +43,9 @@ s4=`dig +short kingkong.cubedesigners.com | tail -1`
 s5=`dig +short elephantman.cubedesigners.com | tail -1`
 s6=`dig +short fastandfurious.cubedesigners.com | tail -1`
 
-auth=($s0 $s0_0 $s1 $s2 $s2_0 $s2_1 $s2_2 $s2_3 $s2_4 $s2_5 $s2_6 $s2_7 $s4 $s5 $s6)
+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 $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)
 
 c0=`dig +short www.fondation-sycomore.com | tail -1`
 backup=($c0)
diff --git a/resources/servers/elephantman/firewall b/resources/servers/elephantman/firewall
index 4a45c6f5d..e578dad5e 100644
--- a/resources/servers/elephantman/firewall
+++ b/resources/servers/elephantman/firewall
@@ -29,6 +29,7 @@ blacklist=($b0 $b1 $b2 $b3)
 s0=`dig +short amadeus.cubedesigners.com | tail -1`
 s0_0=`dig +short toolbox.fluidbook.com | tail -1`
 s1=`dig +short benhur.cubedesigners.com | tail -1`
+s1_0=`dig +short postal.cubedesigners.com | tail -1`
 s2=`dig +short cloudatlas.cubedesigners.com | tail -1`
 s2_0=`dig +short hostingdev.cubedesigners.com | tail -1`
 s2_1=`dig +short hosting.fluidbook.com | tail -1`
@@ -42,9 +43,9 @@ s3=`dig +short dobermann.cubedesigners.com | tail -1`
 s4=`dig +short kingkong.cubedesigners.com | tail -1`
 s6=`dig +short fastandfurious.cubedesigners.com | tail -1`
 
-auth=($s0 $s0_0 $s1 $s2 $s2_0 $s2_1 $s2_2 $s2_3 $s2_4 $s2_5 $s2_6 $s2_7 $s3 $s4 $s6)
+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 $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)
 
 
 for ip in "${blacklist[@]}"
diff --git a/resources/servers/fastandfurious/firewall b/resources/servers/fastandfurious/firewall
index b78c289c3..fe1f12e6c 100644
--- a/resources/servers/fastandfurious/firewall
+++ b/resources/servers/fastandfurious/firewall
@@ -29,6 +29,7 @@ blacklist=($b0 $b1 $b2 $b3)
 s0=`dig +short amadeus.cubedesigners.com | tail -1`
 s0_0=`dig +short toolbox.fluidbook.com | tail -1`
 s1=`dig +short benhur.cubedesigners.com | tail -1`
+s1_0=`dig +short postal.cubedesigners.com | tail -1`
 s2=`dig +short cloudatlas.cubedesigners.com | tail -1`
 s2_0=`dig +short hostingdev.cubedesigners.com | tail -1`
 s2_1=`dig +short hosting.fluidbook.com | tail -1`
@@ -42,9 +43,9 @@ s3=`dig +short dobermann.cubedesigners.com | tail -1`
 s4=`dig +short kingkong.cubedesigners.com | tail -1`
 s5=`dig +short elephantman.cubedesigners.com | tail -1`
 
-auth=($s0 $s0_0 $s1 $s2 $s2_0 $s2_1 $s2_2 $s2_3 $s2_4 $s2_5 $s2_6 $s2_7 $s3 $s4 $s5)
+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 $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)
 
 ufw allow 51820
 
diff --git a/resources/servers/kingkong/firewall b/resources/servers/kingkong/firewall
index 102d0ae0d..5cd5afdb9 100644
--- a/resources/servers/kingkong/firewall
+++ b/resources/servers/kingkong/firewall
@@ -29,6 +29,7 @@ blacklist=($b0 $b1 $b2 $b3)
 s0=`dig +short amadeus.cubedesigners.com | tail -1`
 s0_0=`dig +short toolbox.fluidbook.com | tail -1`
 s1=`dig +short benhur.cubedesigners.com | tail -1`
+s1_0=`dig +short postal.cubedesigners.com | tail -1`
 s2=`dig +short cloudatlas.cubedesigners.com | tail -1`
 s2_0=`dig +short hostingdev.cubedesigners.com | tail -1`
 s2_1=`dig +short hosting.fluidbook.com | tail -1`
@@ -42,9 +43,9 @@ s3=`dig +short dobermann.cubedesigners.com | tail -1`
 s5=`dig +short elephantman.cubedesigners.com | tail -1`
 s6=`dig +short fastandfurious.cubedesigners.com | tail -1`
 
-auth=($s0 $s0_0 $s1 $s2 $s2_0 $s2_1 $s2_2 $s2_3 $s2_4 $s2_5 $s2_6 $s2_7 $s3 $s5 $s6)
+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 $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)
 
 
 for ip in "${blacklist[@]}"