wip #6986 @1

diff --git a/app/Fluidbook/Farm.php b/app/Fluidbook/Farm.php
index 3e4eea05d48dffedd0d03d3197bcb9c816623857..13821ab836fd48c2cc48f08ae07d3a6144019fdb 100644 (file)
--- a/app/Fluidbook/Farm.php
+++ b/app/Fluidbook/Farm.php
@@ -21,7 +21,6 @@ class Farm
 
     protected static $_farmServers = [
         ['name' => 'alphaville', 'host' => 'fluidbook-processfarm', 'port' => 9000, 'weight' => 12, 'region' => Region::EUROPE, 'local' => false],
-        ['name' => 'brazil', 'host' => 'brazil.cubedesigners.com', 'weight' => 6, 'region' => Region::USA, 'local' => false],
         ['name' => 'cloudatlas', 'host' => 'cloudatlas.cubedesigners.com', 'weight' => 4, 'region' => Region::EUROPE, 'local' => false],
         ['name' => 'dracula', 'host' => 'dracula.cubedesigners.com', 'weight' => 1, 'region' => Region::EUROPE, 'local' => true],
         ['name' => 'dobermann', 'host' => 'dobermann.cubedesigners.com', 'weight' => 6, 'region' => Region::EUROPE, 'local' => false],

diff --git a/app/Models/TeamServers.php b/app/Models/TeamServers.php
index 5f8b86ed16e5cfb81f17fe0c376aab3973fc0198..31afec7e54ee87a615836738aba5582132a519cc 100644 (file)
--- a/app/Models/TeamServers.php
+++ b/app/Models/TeamServers.php
@@ -28,7 +28,7 @@ class TeamServers extends CubistMagicAbstractModel
         $this->addField('blacklist', Textarea::class, __('Liste noire'));
     }
 
-    public function postSave()
+    public function onSaved(): bool
     {
         Files::emptyDir(resource_path('servers/'));
 
@@ -194,6 +194,7 @@ cd /D D:\Works\FluidbookToolbox\resources\servers' . "\n\n";
         }
 
         file_put_contents(resource_path('servers') . '/' . 'update.bat', str_replace("\n", "\r\n", $update));
+        return parent::onSaved();
     }
 
     protected static function digOrIP($address)

diff --git a/resources/servers/alphaville/firewall b/resources/servers/alphaville/firewall
index da8e2c73a2200396102aa357d50795974dad5b90..52e14e7c3c7e268fa8290b035a150a502d2c2e33 100644 (file)
--- a/resources/servers/alphaville/firewall
+++ b/resources/servers/alphaville/firewall
@@ -16,8 +16,9 @@ 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`
 
-local=($l0 $l1 $l2 $l3 $i0 $i1 $i2)
+local=($l0 $l1 $l2 $l3 $i0 $i1 $i2 $i3)
 
 b0=24.104.34.225
 b1=62.99.220.220
@@ -25,29 +26,25 @@ b2=50.62.177.177
 b3=195.70.4.231
 blacklist=($b0 $b1 $b2 $b3)
 
-s1=`dig +short brazil.cubedesigners.com | tail -1`
-s2=`dig +short cloudatlas.cubedesigners.com | tail -1`
-s2_0=`dig +short git.cubedesigners.com | tail -1`
-s2_1=`dig +short mail.cubedesigners.com | tail -1`
-s2_2=`dig +short mail2.cubedesigners.com | tail -1`
-s3=`dig +short dracula.cubedesigners.com | tail -1`
-s3_0=`dig +short devdock.cubedesigners.com | tail -1`
-s4=`dig +short dobermann.cubedesigners.com | tail -1`
-s5=`dig +short godzilla.cubedesigners.com | tail -1`
-s5_0=`dig +short hostingdev.cubedesigners.com | tail -1`
-s5_1=`dig +short hosting.cubedesigners.com | tail -1`
-s5_2=`dig +short hosting2.fluidbook.com | tail -1`
-s5_3=`dig +short hosting.fluidbook.com | tail -1`
-s6=`dig +short her2.cubedesigners.com | tail -1`
-s6_0=`dig +short her.cubedesigners.com | tail -1`
-s6_1=`dig +short mail.cubedesigners.com | tail -1`
-s6_2=`dig +short mail2.cubedesigners.com | tail -1`
-s7=`dig +short kingkong.cubedesigners.com | tail -1`
-s8=`dig +short elephantman.cubedesigners.com | tail -1`
-s9=`dig +short fastandfurious.cubedesigners.com | tail -1`
+s1=`dig +short cloudatlas.cubedesigners.com | tail -1`
+s1_0=`dig +short git.cubedesigners.com | tail -1`
+s1_1=`dig +short mail.cubedesigners.com | tail -1`
+s1_2=`dig +short mail2.cubedesigners.com | tail -1`
+s2=`dig +short dracula.cubedesigners.com | tail -1`
+s2_0=`dig +short devdock.cubedesigners.com | tail -1`
+s3=`dig +short dobermann.cubedesigners.com | tail -1`
+s4=`dig +short godzilla.cubedesigners.com | tail -1`
+s4_0=`dig +short hostingdev.cubedesigners.com | tail -1`
+s4_1=`dig +short hosting.cubedesigners.com | tail -1`
+s4_2=`dig +short hosting2.fluidbook.com | tail -1`
+s4_3=`dig +short hosting.fluidbook.com | tail -1`
+s5=`dig +short kingkong.cubedesigners.com | tail -1`
+s6=`dig +short elephantman.cubedesigners.com | tail -1`
+s7=`dig +short fastandfurious.cubedesigners.com | tail -1`
 
-auth=($s1 $s2 $s2_0 $s2_1 $s2_2 $s3 $s3_0 $s4 $s5 $s5_0 $s5_1 $s5_2 $s5_3 $s6 $s6_0 $s6_1 $s6_2 $s7 $s8 $s9)
+auth=($s1 $s1_0 $s1_1 $s1_2 $s2 $s2_0 $s3 $s4 $s4_0 $s4_1 $s4_2 $s4_3 $s5 $s6 $s7)
 
+ufw allow 58745
 ufw allow 80
 ufw allow 443
 

diff --git a/resources/servers/brazil/firewall b/resources/servers/brazil/firewall
deleted file mode 100644 (file)
index 823ecb2..0000000
--- a/resources/servers/brazil/firewall
+++ /dev/null
@@ -1,93 +0,0 @@
-#!/bin/bash
-
-export DEBIAN_FRONTEND=noninteractive
-apt install --no-install-recommends -y dnsutils
-# Reset all rules
-ufw --force reset
-# Disable firewall
-ufw disable
-
-ufw default allow outgoing
-
-l0=127.0.0.0/8
-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`
-
-local=($l0 $l1 $l2 $l3 $i0 $i1 $i2)
-
-b0=24.104.34.225
-b1=62.99.220.220
-b2=50.62.177.177
-b3=195.70.4.231
-blacklist=($b0 $b1 $b2 $b3)
-
-s0=`dig +short alphaville.cubedesigners.com | tail -1`
-s0_0=`dig +short toolbox.fluidbook.com | tail -1`
-s2=`dig +short cloudatlas.cubedesigners.com | tail -1`
-s2_0=`dig +short git.cubedesigners.com | tail -1`
-s2_1=`dig +short mail.cubedesigners.com | tail -1`
-s2_2=`dig +short mail2.cubedesigners.com | tail -1`
-s3=`dig +short dracula.cubedesigners.com | tail -1`
-s3_0=`dig +short devdock.cubedesigners.com | tail -1`
-s4=`dig +short dobermann.cubedesigners.com | tail -1`
-s5=`dig +short godzilla.cubedesigners.com | tail -1`
-s5_0=`dig +short hostingdev.cubedesigners.com | tail -1`
-s5_1=`dig +short hosting.cubedesigners.com | tail -1`
-s5_2=`dig +short hosting2.fluidbook.com | tail -1`
-s5_3=`dig +short hosting.fluidbook.com | tail -1`
-s6=`dig +short her2.cubedesigners.com | tail -1`
-s6_0=`dig +short her.cubedesigners.com | tail -1`
-s6_1=`dig +short mail.cubedesigners.com | tail -1`
-s6_2=`dig +short mail2.cubedesigners.com | tail -1`
-s7=`dig +short kingkong.cubedesigners.com | tail -1`
-s8=`dig +short elephantman.cubedesigners.com | tail -1`
-s9=`dig +short fastandfurious.cubedesigners.com | tail -1`
-
-auth=($s0 $s0_0 $s2 $s2_0 $s2_1 $s2_2 $s3 $s3_0 $s4 $s5 $s5_0 $s5_1 $s5_2 $s5_3 $s6 $s6_0 $s6_1 $s6_2 $s7 $s8 $s9)
-
-
-for ip in "${blacklist[@]}"
-do
-        ufw deny from $ip
-        ufw deny to $ip
-done
-
-for ip in "${local[@]}"
-do
-        ufw allow from $ip
-done
-
-for ip in "${auth[@]}"
-do
-       ufw allow from $ip
-       ufw allow to $ip
-       ufw allow out to $ip port 22
-       ufw allow out to $ip port 22022
-       ufw allow out to $ip port 22822
-       ufw allow out to $ip port 22222
-done
-
-#SSH
-ufw deny out 22
-ufw deny out 22022
-ufw deny out 22822
-ufw deny out 22222
-# Finally enable firewall
-ufw --force enable
-
-# Enable loging
-ufw logging on
-
-# Display status
-ufw status verbose
-
-rm -f /etc/ufw/after.rules.*
-rm -f /etc/ufw/after6.rules.*
-rm -f /etc/ufw/before.rules.*
-rm -f /etc/ufw/before6.rules.*
-rm -f /lib/ufw/user6.rules.*
-rm -f /lib/ufw/user.rules.*

diff --git a/resources/servers/cloudatlas/firewall b/resources/servers/cloudatlas/firewall
index c83bf10bc983db1189a16c7fefdea23881fd1fc4..6337fb7e91525a8c38b57a6fd4e58db9056e5491 100644 (file)
--- a/resources/servers/cloudatlas/firewall
+++ b/resources/servers/cloudatlas/firewall
@@ -16,8 +16,9 @@ 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`
 
-local=($l0 $l1 $l2 $l3 $i0 $i1 $i2)
+local=($l0 $l1 $l2 $l3 $i0 $i1 $i2 $i3)
 
 b0=24.104.34.225
 b1=62.99.220.220
@@ -27,24 +28,19 @@ blacklist=($b0 $b1 $b2 $b3)
 
 s0=`dig +short alphaville.cubedesigners.com | tail -1`
 s0_0=`dig +short toolbox.fluidbook.com | tail -1`
-s1=`dig +short brazil.cubedesigners.com | tail -1`
-s3=`dig +short dracula.cubedesigners.com | tail -1`
-s3_0=`dig +short devdock.cubedesigners.com | tail -1`
-s4=`dig +short dobermann.cubedesigners.com | tail -1`
-s5=`dig +short godzilla.cubedesigners.com | tail -1`
-s5_0=`dig +short hostingdev.cubedesigners.com | tail -1`
-s5_1=`dig +short hosting.cubedesigners.com | tail -1`
-s5_2=`dig +short hosting2.fluidbook.com | tail -1`
-s5_3=`dig +short hosting.fluidbook.com | tail -1`
-s6=`dig +short her2.cubedesigners.com | tail -1`
-s6_0=`dig +short her.cubedesigners.com | tail -1`
-s6_1=`dig +short mail.cubedesigners.com | tail -1`
-s6_2=`dig +short mail2.cubedesigners.com | tail -1`
-s7=`dig +short kingkong.cubedesigners.com | tail -1`
-s8=`dig +short elephantman.cubedesigners.com | tail -1`
-s9=`dig +short fastandfurious.cubedesigners.com | tail -1`
+s2=`dig +short dracula.cubedesigners.com | tail -1`
+s2_0=`dig +short devdock.cubedesigners.com | tail -1`
+s3=`dig +short dobermann.cubedesigners.com | tail -1`
+s4=`dig +short godzilla.cubedesigners.com | tail -1`
+s4_0=`dig +short hostingdev.cubedesigners.com | tail -1`
+s4_1=`dig +short hosting.cubedesigners.com | tail -1`
+s4_2=`dig +short hosting2.fluidbook.com | tail -1`
+s4_3=`dig +short hosting.fluidbook.com | tail -1`
+s5=`dig +short kingkong.cubedesigners.com | tail -1`
+s6=`dig +short elephantman.cubedesigners.com | tail -1`
+s7=`dig +short fastandfurious.cubedesigners.com | tail -1`
 
-auth=($s0 $s0_0 $s1 $s3 $s3_0 $s4 $s5 $s5_0 $s5_1 $s5_2 $s5_3 $s6 $s6_0 $s6_1 $s6_2 $s7 $s8 $s9)
+auth=($s0 $s0_0 $s2 $s2_0 $s3 $s4 $s4_0 $s4_1 $s4_2 $s4_3 $s5 $s6 $s7)
 
 ufw allow 53
 ufw allow 80

diff --git a/resources/servers/dobermann/firewall b/resources/servers/dobermann/firewall
index a6f9ac43abe18cb3a3a4d3920721545ff4ed8f24..3f98455c925dc85c20db75c2a3b018db31ed9d59 100644 (file)
--- a/resources/servers/dobermann/firewall
+++ b/resources/servers/dobermann/firewall
@@ -16,8 +16,9 @@ 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`
 
-local=($l0 $l1 $l2 $l3 $i0 $i1 $i2)
+local=($l0 $l1 $l2 $l3 $i0 $i1 $i2 $i3)
 
 b0=24.104.34.225
 b1=62.99.220.220
@@ -27,31 +28,25 @@ blacklist=($b0 $b1 $b2 $b3)
 
 s0=`dig +short alphaville.cubedesigners.com | tail -1`
 s0_0=`dig +short toolbox.fluidbook.com | tail -1`
-s1=`dig +short brazil.cubedesigners.com | tail -1`
-s2=`dig +short cloudatlas.cubedesigners.com | tail -1`
-s2_0=`dig +short git.cubedesigners.com | tail -1`
-s2_1=`dig +short mail.cubedesigners.com | tail -1`
-s2_2=`dig +short mail2.cubedesigners.com | tail -1`
-s3=`dig +short dracula.cubedesigners.com | tail -1`
-s3_0=`dig +short devdock.cubedesigners.com | tail -1`
-s5=`dig +short godzilla.cubedesigners.com | tail -1`
-s5_0=`dig +short hostingdev.cubedesigners.com | tail -1`
-s5_1=`dig +short hosting.cubedesigners.com | tail -1`
-s5_2=`dig +short hosting2.fluidbook.com | tail -1`
-s5_3=`dig +short hosting.fluidbook.com | tail -1`
-s6=`dig +short her2.cubedesigners.com | tail -1`
-s6_0=`dig +short her.cubedesigners.com | tail -1`
-s6_1=`dig +short mail.cubedesigners.com | tail -1`
-s6_2=`dig +short mail2.cubedesigners.com | tail -1`
-s7=`dig +short kingkong.cubedesigners.com | tail -1`
-s8=`dig +short elephantman.cubedesigners.com | tail -1`
-s9=`dig +short fastandfurious.cubedesigners.com | tail -1`
-
-auth=($s0 $s0_0 $s1 $s2 $s2_0 $s2_1 $s2_2 $s3 $s3_0 $s5 $s5_0 $s5_1 $s5_2 $s5_3 $s6 $s6_0 $s6_1 $s6_2 $s7 $s8 $s9)
-
-c0=`dig +short s1.adangelis.com | tail -1`
-c1=`dig +short www.fondation-sycomore.com | tail -1`
-backup=($c0 $c1)
+s1=`dig +short cloudatlas.cubedesigners.com | tail -1`
+s1_0=`dig +short git.cubedesigners.com | tail -1`
+s1_1=`dig +short mail.cubedesigners.com | tail -1`
+s1_2=`dig +short mail2.cubedesigners.com | tail -1`
+s2=`dig +short dracula.cubedesigners.com | tail -1`
+s2_0=`dig +short devdock.cubedesigners.com | tail -1`
+s4=`dig +short godzilla.cubedesigners.com | tail -1`
+s4_0=`dig +short hostingdev.cubedesigners.com | tail -1`
+s4_1=`dig +short hosting.cubedesigners.com | tail -1`
+s4_2=`dig +short hosting2.fluidbook.com | tail -1`
+s4_3=`dig +short hosting.fluidbook.com | tail -1`
+s5=`dig +short kingkong.cubedesigners.com | tail -1`
+s6=`dig +short elephantman.cubedesigners.com | tail -1`
+s7=`dig +short fastandfurious.cubedesigners.com | tail -1`
+
+auth=($s0 $s0_0 $s1 $s1_0 $s1_1 $s1_2 $s2 $s2_0 $s4 $s4_0 $s4_1 $s4_2 $s4_3 $s5 $s6 $s7)
+
+c0=`dig +short www.fondation-sycomore.com | tail -1`
+backup=($c0)
 ufw allow 53
 ufw allow 80
 ufw allow 443

diff --git a/resources/servers/dracula/firewall b/resources/servers/dracula/firewall
index bf4f68e5c3d8c25cea5cab11187db79e75732656..0c2f2b6135a660886ac4d00544c596a1e85fe23f 100644 (file)
--- a/resources/servers/dracula/firewall
+++ b/resources/servers/dracula/firewall
@@ -16,8 +16,9 @@ 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`
 
-local=($l0 $l1 $l2 $l3 $i0 $i1 $i2)
+local=($l0 $l1 $l2 $l3 $i0 $i1 $i2 $i3)
 
 b0=24.104.34.225
 b1=62.99.220.220
@@ -27,26 +28,21 @@ blacklist=($b0 $b1 $b2 $b3)
 
 s0=`dig +short alphaville.cubedesigners.com | tail -1`
 s0_0=`dig +short toolbox.fluidbook.com | tail -1`
-s1=`dig +short brazil.cubedesigners.com | tail -1`
-s2=`dig +short cloudatlas.cubedesigners.com | tail -1`
-s2_0=`dig +short git.cubedesigners.com | tail -1`
-s2_1=`dig +short mail.cubedesigners.com | tail -1`
-s2_2=`dig +short mail2.cubedesigners.com | tail -1`
-s4=`dig +short dobermann.cubedesigners.com | tail -1`
-s5=`dig +short godzilla.cubedesigners.com | tail -1`
-s5_0=`dig +short hostingdev.cubedesigners.com | tail -1`
-s5_1=`dig +short hosting.cubedesigners.com | tail -1`
-s5_2=`dig +short hosting2.fluidbook.com | tail -1`
-s5_3=`dig +short hosting.fluidbook.com | tail -1`
-s6=`dig +short her2.cubedesigners.com | tail -1`
-s6_0=`dig +short her.cubedesigners.com | tail -1`
-s6_1=`dig +short mail.cubedesigners.com | tail -1`
-s6_2=`dig +short mail2.cubedesigners.com | tail -1`
-s7=`dig +short kingkong.cubedesigners.com | tail -1`
-s8=`dig +short elephantman.cubedesigners.com | tail -1`
-s9=`dig +short fastandfurious.cubedesigners.com | tail -1`
+s1=`dig +short cloudatlas.cubedesigners.com | tail -1`
+s1_0=`dig +short git.cubedesigners.com | tail -1`
+s1_1=`dig +short mail.cubedesigners.com | tail -1`
+s1_2=`dig +short mail2.cubedesigners.com | tail -1`
+s3=`dig +short dobermann.cubedesigners.com | tail -1`
+s4=`dig +short godzilla.cubedesigners.com | tail -1`
+s4_0=`dig +short hostingdev.cubedesigners.com | tail -1`
+s4_1=`dig +short hosting.cubedesigners.com | tail -1`
+s4_2=`dig +short hosting2.fluidbook.com | tail -1`
+s4_3=`dig +short hosting.fluidbook.com | tail -1`
+s5=`dig +short kingkong.cubedesigners.com | tail -1`
+s6=`dig +short elephantman.cubedesigners.com | tail -1`
+s7=`dig +short fastandfurious.cubedesigners.com | tail -1`
 
-auth=($s0 $s0_0 $s1 $s2 $s2_0 $s2_1 $s2_2 $s4 $s5 $s5_0 $s5_1 $s5_2 $s5_3 $s6 $s6_0 $s6_1 $s6_2 $s7 $s8 $s9)
+auth=($s0 $s0_0 $s1 $s1_0 $s1_1 $s1_2 $s3 $s4 $s4_0 $s4_1 $s4_2 $s4_3 $s5 $s6 $s7)
 
 ufw allow 53
 ufw allow 80

diff --git a/resources/servers/elephantman/firewall b/resources/servers/elephantman/firewall
index bffc6288ba54ea3cca936286826abdcc7e42bfb9..c79731787a646909fedc1b7e1f7456be1699b746 100644 (file)
--- a/resources/servers/elephantman/firewall
+++ b/resources/servers/elephantman/firewall
@@ -16,8 +16,9 @@ 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`
 
-local=($l0 $l1 $l2 $l3 $i0 $i1 $i2)
+local=($l0 $l1 $l2 $l3 $i0 $i1 $i2 $i3)
 
 b0=24.104.34.225
 b1=62.99.220.220
@@ -27,27 +28,22 @@ blacklist=($b0 $b1 $b2 $b3)
 
 s0=`dig +short alphaville.cubedesigners.com | tail -1`
 s0_0=`dig +short toolbox.fluidbook.com | tail -1`
-s1=`dig +short brazil.cubedesigners.com | tail -1`
-s2=`dig +short cloudatlas.cubedesigners.com | tail -1`
-s2_0=`dig +short git.cubedesigners.com | tail -1`
-s2_1=`dig +short mail.cubedesigners.com | tail -1`
-s2_2=`dig +short mail2.cubedesigners.com | tail -1`
-s3=`dig +short dracula.cubedesigners.com | tail -1`
-s3_0=`dig +short devdock.cubedesigners.com | tail -1`
-s4=`dig +short dobermann.cubedesigners.com | tail -1`
-s5=`dig +short godzilla.cubedesigners.com | tail -1`
-s5_0=`dig +short hostingdev.cubedesigners.com | tail -1`
-s5_1=`dig +short hosting.cubedesigners.com | tail -1`
-s5_2=`dig +short hosting2.fluidbook.com | tail -1`
-s5_3=`dig +short hosting.fluidbook.com | tail -1`
-s6=`dig +short her2.cubedesigners.com | tail -1`
-s6_0=`dig +short her.cubedesigners.com | tail -1`
-s6_1=`dig +short mail.cubedesigners.com | tail -1`
-s6_2=`dig +short mail2.cubedesigners.com | tail -1`
-s7=`dig +short kingkong.cubedesigners.com | tail -1`
-s9=`dig +short fastandfurious.cubedesigners.com | tail -1`
-
-auth=($s0 $s0_0 $s1 $s2 $s2_0 $s2_1 $s2_2 $s3 $s3_0 $s4 $s5 $s5_0 $s5_1 $s5_2 $s5_3 $s6 $s6_0 $s6_1 $s6_2 $s7 $s9)
+s1=`dig +short cloudatlas.cubedesigners.com | tail -1`
+s1_0=`dig +short git.cubedesigners.com | tail -1`
+s1_1=`dig +short mail.cubedesigners.com | tail -1`
+s1_2=`dig +short mail2.cubedesigners.com | tail -1`
+s2=`dig +short dracula.cubedesigners.com | tail -1`
+s2_0=`dig +short devdock.cubedesigners.com | tail -1`
+s3=`dig +short dobermann.cubedesigners.com | tail -1`
+s4=`dig +short godzilla.cubedesigners.com | tail -1`
+s4_0=`dig +short hostingdev.cubedesigners.com | tail -1`
+s4_1=`dig +short hosting.cubedesigners.com | tail -1`
+s4_2=`dig +short hosting2.fluidbook.com | tail -1`
+s4_3=`dig +short hosting.fluidbook.com | tail -1`
+s5=`dig +short kingkong.cubedesigners.com | tail -1`
+s7=`dig +short fastandfurious.cubedesigners.com | tail -1`
+
+auth=($s0 $s0_0 $s1 $s1_0 $s1_1 $s1_2 $s2 $s2_0 $s3 $s4 $s4_0 $s4_1 $s4_2 $s4_3 $s5 $s7)
 
 
 for ip in "${blacklist[@]}"

diff --git a/resources/servers/fastandfurious/firewall b/resources/servers/fastandfurious/firewall
index de2571723c6e59b473c881e6ebac0fd368a3dc17..96a97166e66ca94121aa5a094a1adc68c31dd393 100644 (file)
--- a/resources/servers/fastandfurious/firewall
+++ b/resources/servers/fastandfurious/firewall
@@ -16,8 +16,9 @@ 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`
 
-local=($l0 $l1 $l2 $l3 $i0 $i1 $i2)
+local=($l0 $l1 $l2 $l3 $i0 $i1 $i2 $i3)
 
 b0=24.104.34.225
 b1=62.99.220.220
@@ -27,27 +28,22 @@ blacklist=($b0 $b1 $b2 $b3)
 
 s0=`dig +short alphaville.cubedesigners.com | tail -1`
 s0_0=`dig +short toolbox.fluidbook.com | tail -1`
-s1=`dig +short brazil.cubedesigners.com | tail -1`
-s2=`dig +short cloudatlas.cubedesigners.com | tail -1`
-s2_0=`dig +short git.cubedesigners.com | tail -1`
-s2_1=`dig +short mail.cubedesigners.com | tail -1`
-s2_2=`dig +short mail2.cubedesigners.com | tail -1`
-s3=`dig +short dracula.cubedesigners.com | tail -1`
-s3_0=`dig +short devdock.cubedesigners.com | tail -1`
-s4=`dig +short dobermann.cubedesigners.com | tail -1`
-s5=`dig +short godzilla.cubedesigners.com | tail -1`
-s5_0=`dig +short hostingdev.cubedesigners.com | tail -1`
-s5_1=`dig +short hosting.cubedesigners.com | tail -1`
-s5_2=`dig +short hosting2.fluidbook.com | tail -1`
-s5_3=`dig +short hosting.fluidbook.com | tail -1`
-s6=`dig +short her2.cubedesigners.com | tail -1`
-s6_0=`dig +short her.cubedesigners.com | tail -1`
-s6_1=`dig +short mail.cubedesigners.com | tail -1`
-s6_2=`dig +short mail2.cubedesigners.com | tail -1`
-s7=`dig +short kingkong.cubedesigners.com | tail -1`
-s8=`dig +short elephantman.cubedesigners.com | tail -1`
-
-auth=($s0 $s0_0 $s1 $s2 $s2_0 $s2_1 $s2_2 $s3 $s3_0 $s4 $s5 $s5_0 $s5_1 $s5_2 $s5_3 $s6 $s6_0 $s6_1 $s6_2 $s7 $s8)
+s1=`dig +short cloudatlas.cubedesigners.com | tail -1`
+s1_0=`dig +short git.cubedesigners.com | tail -1`
+s1_1=`dig +short mail.cubedesigners.com | tail -1`
+s1_2=`dig +short mail2.cubedesigners.com | tail -1`
+s2=`dig +short dracula.cubedesigners.com | tail -1`
+s2_0=`dig +short devdock.cubedesigners.com | tail -1`
+s3=`dig +short dobermann.cubedesigners.com | tail -1`
+s4=`dig +short godzilla.cubedesigners.com | tail -1`
+s4_0=`dig +short hostingdev.cubedesigners.com | tail -1`
+s4_1=`dig +short hosting.cubedesigners.com | tail -1`
+s4_2=`dig +short hosting2.fluidbook.com | tail -1`
+s4_3=`dig +short hosting.fluidbook.com | tail -1`
+s5=`dig +short kingkong.cubedesigners.com | tail -1`
+s6=`dig +short elephantman.cubedesigners.com | tail -1`
+
+auth=($s0 $s0_0 $s1 $s1_0 $s1_1 $s1_2 $s2 $s2_0 $s3 $s4 $s4_0 $s4_1 $s4_2 $s4_3 $s5 $s6)
 
 ufw allow 51820
 

diff --git a/resources/servers/godzilla/firewall b/resources/servers/godzilla/firewall
index 03a4b94a2cdabe2c65841db3b2c0e21914a3c7b6..671a0a0ac0e8ad0b230f20df5b280dcaf43a3c92 100644 (file)
--- a/resources/servers/godzilla/firewall
+++ b/resources/servers/godzilla/firewall
@@ -16,8 +16,9 @@ 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`
 
-local=($l0 $l1 $l2 $l3 $i0 $i1 $i2)
+local=($l0 $l1 $l2 $l3 $i0 $i1 $i2 $i3)
 
 b0=24.104.34.225
 b1=62.99.220.220
@@ -27,23 +28,18 @@ blacklist=($b0 $b1 $b2 $b3)
 
 s0=`dig +short alphaville.cubedesigners.com | tail -1`
 s0_0=`dig +short toolbox.fluidbook.com | tail -1`
-s1=`dig +short brazil.cubedesigners.com | tail -1`
-s2=`dig +short cloudatlas.cubedesigners.com | tail -1`
-s2_0=`dig +short git.cubedesigners.com | tail -1`
-s2_1=`dig +short mail.cubedesigners.com | tail -1`
-s2_2=`dig +short mail2.cubedesigners.com | tail -1`
-s3=`dig +short dracula.cubedesigners.com | tail -1`
-s3_0=`dig +short devdock.cubedesigners.com | tail -1`
-s4=`dig +short dobermann.cubedesigners.com | tail -1`
-s6=`dig +short her2.cubedesigners.com | tail -1`
-s6_0=`dig +short her.cubedesigners.com | tail -1`
-s6_1=`dig +short mail.cubedesigners.com | tail -1`
-s6_2=`dig +short mail2.cubedesigners.com | tail -1`
-s7=`dig +short kingkong.cubedesigners.com | tail -1`
-s8=`dig +short elephantman.cubedesigners.com | tail -1`
-s9=`dig +short fastandfurious.cubedesigners.com | tail -1`
-
-auth=($s0 $s0_0 $s1 $s2 $s2_0 $s2_1 $s2_2 $s3 $s3_0 $s4 $s6 $s6_0 $s6_1 $s6_2 $s7 $s8 $s9)
+s1=`dig +short cloudatlas.cubedesigners.com | tail -1`
+s1_0=`dig +short git.cubedesigners.com | tail -1`
+s1_1=`dig +short mail.cubedesigners.com | tail -1`
+s1_2=`dig +short mail2.cubedesigners.com | tail -1`
+s2=`dig +short dracula.cubedesigners.com | tail -1`
+s2_0=`dig +short devdock.cubedesigners.com | tail -1`
+s3=`dig +short dobermann.cubedesigners.com | tail -1`
+s5=`dig +short kingkong.cubedesigners.com | tail -1`
+s6=`dig +short elephantman.cubedesigners.com | tail -1`
+s7=`dig +short fastandfurious.cubedesigners.com | tail -1`
+
+auth=($s0 $s0_0 $s1 $s1_0 $s1_1 $s1_2 $s2 $s2_0 $s3 $s5 $s6 $s7)
 
 ufw allow 53
 ufw allow 80

diff --git a/resources/servers/her2/firewall b/resources/servers/her2/firewall
deleted file mode 100644 (file)
index 7d87623..0000000
--- a/resources/servers/her2/firewall
+++ /dev/null
@@ -1,104 +0,0 @@
-#!/bin/bash
-
-export DEBIAN_FRONTEND=noninteractive
-apt install --no-install-recommends -y dnsutils
-# Reset all rules
-ufw --force reset
-# Disable firewall
-ufw disable
-
-ufw default allow outgoing
-
-l0=127.0.0.0/8
-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`
-
-local=($l0 $l1 $l2 $l3 $i0 $i1 $i2)
-
-b0=24.104.34.225
-b1=62.99.220.220
-b2=50.62.177.177
-b3=195.70.4.231
-blacklist=($b0 $b1 $b2 $b3)
-
-s0=`dig +short alphaville.cubedesigners.com | tail -1`
-s0_0=`dig +short toolbox.fluidbook.com | tail -1`
-s1=`dig +short brazil.cubedesigners.com | tail -1`
-s2=`dig +short cloudatlas.cubedesigners.com | tail -1`
-s2_0=`dig +short git.cubedesigners.com | tail -1`
-s2_1=`dig +short mail.cubedesigners.com | tail -1`
-s2_2=`dig +short mail2.cubedesigners.com | tail -1`
-s3=`dig +short dracula.cubedesigners.com | tail -1`
-s3_0=`dig +short devdock.cubedesigners.com | tail -1`
-s4=`dig +short dobermann.cubedesigners.com | tail -1`
-s5=`dig +short godzilla.cubedesigners.com | tail -1`
-s5_0=`dig +short hostingdev.cubedesigners.com | tail -1`
-s5_1=`dig +short hosting.cubedesigners.com | tail -1`
-s5_2=`dig +short hosting2.fluidbook.com | tail -1`
-s5_3=`dig +short hosting.fluidbook.com | tail -1`
-s7=`dig +short kingkong.cubedesigners.com | tail -1`
-s8=`dig +short elephantman.cubedesigners.com | tail -1`
-s9=`dig +short fastandfurious.cubedesigners.com | tail -1`
-
-auth=($s0 $s0_0 $s1 $s2 $s2_0 $s2_1 $s2_2 $s3 $s3_0 $s4 $s5 $s5_0 $s5_1 $s5_2 $s5_3 $s7 $s8 $s9)
-
-ufw allow 53
-ufw allow 80
-ufw allow 443
-ufw allow 25
-ufw allow 143
-ufw allow 465
-ufw allow 587
-ufw allow 993
-ufw allow 4190
-
-for ip in "${blacklist[@]}"
-do
-        ufw deny from $ip
-        ufw deny to $ip
-done
-
-for ip in "${local[@]}"
-do
-        ufw allow from $ip
-done
-
-for ip in "${auth[@]}"
-do
-       ufw allow from $ip
-       ufw allow to $ip
-       ufw allow out to $ip port 22
-       ufw allow out to $ip port 22022
-       ufw allow out to $ip port 22822
-       ufw allow out to $ip port 22222
-done
-
-for ip in "${backup[@]}"
-do
-        ufw allow in from $ip port 22
-done
-
-#SSH
-ufw deny out 22
-ufw deny out 22022
-ufw deny out 22822
-ufw deny out 22222
-# Finally enable firewall
-ufw --force enable
-
-# Enable loging
-ufw logging on
-
-# Display status
-ufw status verbose
-
-rm -f /etc/ufw/after.rules.*
-rm -f /etc/ufw/after6.rules.*
-rm -f /etc/ufw/before.rules.*
-rm -f /etc/ufw/before6.rules.*
-rm -f /lib/ufw/user6.rules.*
-rm -f /lib/ufw/user.rules.*

diff --git a/resources/servers/kingkong/firewall b/resources/servers/kingkong/firewall
index a15bc8f1276094ac5224c3f5d5da3d71a09dc02b..761986f49f272610344b6e8e383b7ccb147d51b8 100644 (file)
--- a/resources/servers/kingkong/firewall
+++ b/resources/servers/kingkong/firewall
@@ -16,8 +16,9 @@ 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`
 
-local=($l0 $l1 $l2 $l3 $i0 $i1 $i2)
+local=($l0 $l1 $l2 $l3 $i0 $i1 $i2 $i3)
 
 b0=24.104.34.225
 b1=62.99.220.220
@@ -27,27 +28,22 @@ blacklist=($b0 $b1 $b2 $b3)
 
 s0=`dig +short alphaville.cubedesigners.com | tail -1`
 s0_0=`dig +short toolbox.fluidbook.com | tail -1`
-s1=`dig +short brazil.cubedesigners.com | tail -1`
-s2=`dig +short cloudatlas.cubedesigners.com | tail -1`
-s2_0=`dig +short git.cubedesigners.com | tail -1`
-s2_1=`dig +short mail.cubedesigners.com | tail -1`
-s2_2=`dig +short mail2.cubedesigners.com | tail -1`
-s3=`dig +short dracula.cubedesigners.com | tail -1`
-s3_0=`dig +short devdock.cubedesigners.com | tail -1`
-s4=`dig +short dobermann.cubedesigners.com | tail -1`
-s5=`dig +short godzilla.cubedesigners.com | tail -1`
-s5_0=`dig +short hostingdev.cubedesigners.com | tail -1`
-s5_1=`dig +short hosting.cubedesigners.com | tail -1`
-s5_2=`dig +short hosting2.fluidbook.com | tail -1`
-s5_3=`dig +short hosting.fluidbook.com | tail -1`
-s6=`dig +short her2.cubedesigners.com | tail -1`
-s6_0=`dig +short her.cubedesigners.com | tail -1`
-s6_1=`dig +short mail.cubedesigners.com | tail -1`
-s6_2=`dig +short mail2.cubedesigners.com | tail -1`
-s8=`dig +short elephantman.cubedesigners.com | tail -1`
-s9=`dig +short fastandfurious.cubedesigners.com | tail -1`
-
-auth=($s0 $s0_0 $s1 $s2 $s2_0 $s2_1 $s2_2 $s3 $s3_0 $s4 $s5 $s5_0 $s5_1 $s5_2 $s5_3 $s6 $s6_0 $s6_1 $s6_2 $s8 $s9)
+s1=`dig +short cloudatlas.cubedesigners.com | tail -1`
+s1_0=`dig +short git.cubedesigners.com | tail -1`
+s1_1=`dig +short mail.cubedesigners.com | tail -1`
+s1_2=`dig +short mail2.cubedesigners.com | tail -1`
+s2=`dig +short dracula.cubedesigners.com | tail -1`
+s2_0=`dig +short devdock.cubedesigners.com | tail -1`
+s3=`dig +short dobermann.cubedesigners.com | tail -1`
+s4=`dig +short godzilla.cubedesigners.com | tail -1`
+s4_0=`dig +short hostingdev.cubedesigners.com | tail -1`
+s4_1=`dig +short hosting.cubedesigners.com | tail -1`
+s4_2=`dig +short hosting2.fluidbook.com | tail -1`
+s4_3=`dig +short hosting.fluidbook.com | tail -1`
+s6=`dig +short elephantman.cubedesigners.com | tail -1`
+s7=`dig +short fastandfurious.cubedesigners.com | tail -1`
+
+auth=($s0 $s0_0 $s1 $s1_0 $s1_1 $s1_2 $s2 $s2_0 $s3 $s4 $s4_0 $s4_1 $s4_2 $s4_3 $s6 $s7)
 
 ufw allow 80
 ufw allow 443

diff --git a/resources/servers/update.bat b/resources/servers/update.bat
index 5a99cdc9b797fdf65628f9338ab1d54ca243fb08..59e74f22e5867b2a98f1a5110e82561808925ef8 100644 (file)
--- a/resources/servers/update.bat
+++ b/resources/servers/update.bat
@@ -6,9 +6,6 @@ cd /D D:\Works\FluidbookToolbox\resources\servers
 scp -P 22 ./alphaville/firewall root@alphaville.cubedesigners.com:/usr/local/bin/fw
 ssh -p 22 root@alphaville.cubedesigners.com 'chmod 755 /usr/local/bin/fw;rm -f /usr/local/bin/firewall;/usr/local/bin/fw'
 
-scp -P 22 ./brazil/firewall root@brazil.cubedesigners.com:/usr/local/bin/fw
-ssh -p 22 root@brazil.cubedesigners.com 'chmod 755 /usr/local/bin/fw;rm -f /usr/local/bin/firewall;/usr/local/bin/fw'
-
 scp -P 22 ./cloudatlas/firewall root@cloudatlas.cubedesigners.com:/usr/local/bin/fw
 ssh -p 22 root@cloudatlas.cubedesigners.com 'chmod 755 /usr/local/bin/fw;rm -f /usr/local/bin/firewall;/usr/local/bin/fw'
 
@@ -21,9 +18,6 @@ ssh -p 22 root@dobermann.cubedesigners.com 'chmod 755 /usr/local/bin/fw;rm -f /u
 scp -P 22 ./godzilla/firewall root@godzilla.cubedesigners.com:/usr/local/bin/fw
 ssh -p 22 root@godzilla.cubedesigners.com 'chmod 755 /usr/local/bin/fw;rm -f /usr/local/bin/firewall;/usr/local/bin/fw'
 
-scp -P 22 ./her2/firewall root@her2.cubedesigners.com:/usr/local/bin/fw
-ssh -p 22 root@her2.cubedesigners.com 'chmod 755 /usr/local/bin/fw;rm -f /usr/local/bin/firewall;/usr/local/bin/fw'
-
 scp -P 22 ./kingkong/firewall root@kingkong.cubedesigners.com:/usr/local/bin/fw
 ssh -p 22 root@kingkong.cubedesigners.com 'chmod 755 /usr/local/bin/fw;rm -f /usr/local/bin/firewall;/usr/local/bin/fw'