From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Thu, 28 Dec 2023 12:35:18 +0000 (+0100)
Subject: wip #6601 @2
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=c77f43d24df63d5181e2799f7bf2f843bd28b04b;p=fluidbook-toolbox.git

wip #6601 @2
---

diff --git a/app/Models/TeamServers.php b/app/Models/TeamServers.php
index 7799e0da8..61c2f6406 100644
--- a/app/Models/TeamServers.php
+++ b/app/Models/TeamServers.php
@@ -30,6 +30,8 @@ class TeamServers extends CubistMagicAbstractModel
 
     public function postSave()
     {
+        Files::emptyDir(resource_path('servers/'));
+
         $servers = $this->servers;
 
         $blacklist = Text::explodeNewLines($this->blacklist);
@@ -38,7 +40,7 @@ class TeamServers extends CubistMagicAbstractModel
 
         $sshports = [22, 22022, 22822, 22222];
 
-        foreach ($servers as $k => $server) {
+        foreach ($servers as $sid => $server) {
             $fw = '#!/bin/bash' . "\n\n";
 
             $fw .= 'export DEBIAN_FRONTEND=noninteractive' . "\n";
@@ -61,6 +63,9 @@ ufw default allow outgoing
 
             $hosts = [];
             foreach ($servers as $k => $s) {
+                if ($sid === $k) {
+                    continue;
+                }
                 $hosts[] = '$s' . $k;
                 $fw .= 's' . $k . '=' . self::digOrIP($s['name'] . '.cubedesigners.com') . "\n";
                 $others = Text::explodeNewLines($s['others']);
@@ -107,6 +112,9 @@ ufw default allow outgoing
                 $openPorts[] = 993;
                 $openPorts[] = 4190;
             }
+            if ($server['wireguard']) {
+                $openPorts[] = 51820;
+            }
 
             foreach ($openPorts as $openPort) {
                 $fw .= 'ufw allow ' . $openPort . "\n";
@@ -147,24 +155,24 @@ ufw logging on
 # Display status
 ufw status verbose
 
-rm /etc/ufw/after.rules.*
-rm /etc/ufw/after6.rules.*
-rm /etc/ufw/before.rules.*
-rm /etc/ufw/before6.rules.*
-rm /lib/ufw/user6.rules.*
-rm /lib/ufw/user.rules.*
+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.*
 ';
             file_put_contents(Files::mkdir(resource_path('servers/' . $server['name'])) . 'firewall', $fw);
         }
 
         $update = '@echo off
-cd /D D:\Works\Scripts
+cd /D D:\Works\FluidbookToolbox\resources
 scp -P 58745 -r toolbox@toolbox.fluidbook.com:/application/resources/servers/ ./
-cd /D D:\Works\Scripts\servers' . "\n\n";
+cd /D D:\Works\FluidbookToolbox\resources\servers' . "\n\n";
 
         foreach ($servers as $server) {
             $update .= 'scp -P ' . $server['port'] . ' ./' . $server['name'] . '/firewall root@' . $server['name'] . '.cubedesigners.com:/usr/local/bin/fw' . "\n";
-            $update .= 'ssh -p ' . $server['port'] . ' root@' . $server['name'] . '.cubedesigners.com \'chmod 755 /usr/local/bin/fw;/usr/local/bin/fw\'' . "\n\n";
+            $update .= 'ssh -p ' . $server['port'] . ' root@' . $server['name'] . '.cubedesigners.com \'chmod 755 /usr/local/bin/fw;rm -f /usr/local/bin/firewall;/usr/local/bin/fw\'' . "\n\n";
         }
 
         file_put_contents(resource_path('servers') . '/' . 'update.bat', str_replace("\n", "\r\n", $update));
diff --git a/app/SubForms/TeamServer.php b/app/SubForms/TeamServer.php
index fcc1b848f..17e06d8eb 100644
--- a/app/SubForms/TeamServer.php
+++ b/app/SubForms/TeamServer.php
@@ -20,6 +20,7 @@ class TeamServer extends SubForm
         $this->addField('dns', Checkbox::class, __('Serveur DNS'));
         $this->addField('mail', Checkbox::class, __('Serveur Mail'));
         $this->addField('http', Checkbox::class, __('Serveur HTTP'));
+        $this->addField('wireguard', Checkbox::class, __('Serveur Wireguard'));
         $this->addField('backup', Checkbox::class, __('Serveur de backup'));
         $this->addField('ports', Text::class, __('Autres ports à ouvrir'));
     }
diff --git a/resources/servers/alphaville/firewall b/resources/servers/alphaville/firewall
index 1fa986226..ee54214df 100644
--- a/resources/servers/alphaville/firewall
+++ b/resources/servers/alphaville/firewall
@@ -15,8 +15,6 @@ 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 dracula.cubedesigners.com | tail -1`
 s2_0=`dig +short devdock.cubedesigners.com | tail -1`
@@ -38,11 +36,9 @@ i0=127.0.0.0/8
 i1=10.0.0.0/8
 i2=172.16.0.0/12
 i3=192.168.0.0/16
-i4=`dig +short paris.cubedesigners.com | tail -1`
-i5=`dig +short montpellier.cubedesigners.com | tail -1`
-i6=`dig +short tortuga.enhydra.fr | tail -1`
+i4=`dig +short tortuga.enhydra.fr | tail -1`
 
-auth=($s0 $s0_0 $s1 $s2 $s2_0 $s3 $s4 $s5 $s5_0 $s5_1 $s5_2 $s5_3 $s6 $s6_0 $s6_1 $s6_2 $s7 $s8 $i0 $i1 $i2 $i3 $i4 $i5 $i6)
+auth=($s1 $s2 $s2_0 $s3 $s4 $s5 $s5_0 $s5_1 $s5_2 $s5_3 $s6 $s6_0 $s6_1 $s6_2 $s7 $s8 $i0 $i1 $i2 $i3 $i4)
 
 ufw allow 80
 ufw allow 443
@@ -75,9 +71,9 @@ ufw logging on
 # Display status
 ufw status verbose
 
-rm /etc/ufw/after.rules.*
-rm /etc/ufw/after6.rules.*
-rm /etc/ufw/before.rules.*
-rm /etc/ufw/before6.rules.*
-rm /lib/ufw/user6.rules.*
-rm /lib/ufw/user.rules.*
+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/brazil/firewall b/resources/servers/brazil/firewall
index 543f3c2a9..b61c08103 100644
--- a/resources/servers/brazil/firewall
+++ b/resources/servers/brazil/firewall
@@ -17,7 +17,6 @@ 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 dracula.cubedesigners.com | tail -1`
 s2_0=`dig +short devdock.cubedesigners.com | tail -1`
 s3=`dig +short dobermann.cubedesigners.com | tail -1`
@@ -38,11 +37,9 @@ i0=127.0.0.0/8
 i1=10.0.0.0/8
 i2=172.16.0.0/12
 i3=192.168.0.0/16
-i4=`dig +short paris.cubedesigners.com | tail -1`
-i5=`dig +short montpellier.cubedesigners.com | tail -1`
-i6=`dig +short tortuga.enhydra.fr | tail -1`
+i4=`dig +short tortuga.enhydra.fr | tail -1`
 
-auth=($s0 $s0_0 $s1 $s2 $s2_0 $s3 $s4 $s5 $s5_0 $s5_1 $s5_2 $s5_3 $s6 $s6_0 $s6_1 $s6_2 $s7 $s8 $i0 $i1 $i2 $i3 $i4 $i5 $i6)
+auth=($s0 $s0_0 $s2 $s2_0 $s3 $s4 $s5 $s5_0 $s5_1 $s5_2 $s5_3 $s6 $s6_0 $s6_1 $s6_2 $s7 $s8 $i0 $i1 $i2 $i3 $i4)
 
 
 for ip in "${blacklist[@]}"
@@ -73,9 +70,9 @@ ufw logging on
 # Display status
 ufw status verbose
 
-rm /etc/ufw/after.rules.*
-rm /etc/ufw/after6.rules.*
-rm /etc/ufw/before.rules.*
-rm /etc/ufw/before6.rules.*
-rm /lib/ufw/user6.rules.*
-rm /lib/ufw/user.rules.*
+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/dobermann/firewall b/resources/servers/dobermann/firewall
index d625dad21..79ec81979 100644
--- a/resources/servers/dobermann/firewall
+++ b/resources/servers/dobermann/firewall
@@ -20,7 +20,6 @@ s0_0=`dig +short toolbox.fluidbook.com | tail -1`
 s1=`dig +short brazil.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 elephantman.cubedesigners.com | tail -1`
 s5=`dig +short godzilla.cubedesigners.com | tail -1`
 s5_0=`dig +short hostingdev.cubedesigners.com | tail -1`
@@ -38,11 +37,9 @@ i0=127.0.0.0/8
 i1=10.0.0.0/8
 i2=172.16.0.0/12
 i3=192.168.0.0/16
-i4=`dig +short paris.cubedesigners.com | tail -1`
-i5=`dig +short montpellier.cubedesigners.com | tail -1`
-i6=`dig +short tortuga.enhydra.fr | tail -1`
+i4=`dig +short tortuga.enhydra.fr | tail -1`
 
-auth=($s0 $s0_0 $s1 $s2 $s2_0 $s3 $s4 $s5 $s5_0 $s5_1 $s5_2 $s5_3 $s6 $s6_0 $s6_1 $s6_2 $s7 $s8 $i0 $i1 $i2 $i3 $i4 $i5 $i6)
+auth=($s0 $s0_0 $s1 $s2 $s2_0 $s4 $s5 $s5_0 $s5_1 $s5_2 $s5_3 $s6 $s6_0 $s6_1 $s6_2 $s7 $s8 $i0 $i1 $i2 $i3 $i4)
 
 c0=`dig +short s1.adangelis.com | tail -1`
 c1=`dig +short www.fondation-sycomore.com | tail -1`
@@ -84,9 +81,9 @@ ufw logging on
 # Display status
 ufw status verbose
 
-rm /etc/ufw/after.rules.*
-rm /etc/ufw/after6.rules.*
-rm /etc/ufw/before.rules.*
-rm /etc/ufw/before6.rules.*
-rm /lib/ufw/user6.rules.*
-rm /lib/ufw/user.rules.*
+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/dracula/firewall b/resources/servers/dracula/firewall
index df44850f6..3130b8a79 100644
--- a/resources/servers/dracula/firewall
+++ b/resources/servers/dracula/firewall
@@ -18,8 +18,6 @@ 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 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 elephantman.cubedesigners.com | tail -1`
 s5=`dig +short godzilla.cubedesigners.com | tail -1`
@@ -38,11 +36,9 @@ i0=127.0.0.0/8
 i1=10.0.0.0/8
 i2=172.16.0.0/12
 i3=192.168.0.0/16
-i4=`dig +short paris.cubedesigners.com | tail -1`
-i5=`dig +short montpellier.cubedesigners.com | tail -1`
-i6=`dig +short tortuga.enhydra.fr | tail -1`
+i4=`dig +short tortuga.enhydra.fr | tail -1`
 
-auth=($s0 $s0_0 $s1 $s2 $s2_0 $s3 $s4 $s5 $s5_0 $s5_1 $s5_2 $s5_3 $s6 $s6_0 $s6_1 $s6_2 $s7 $s8 $i0 $i1 $i2 $i3 $i4 $i5 $i6)
+auth=($s0 $s0_0 $s1 $s3 $s4 $s5 $s5_0 $s5_1 $s5_2 $s5_3 $s6 $s6_0 $s6_1 $s6_2 $s7 $s8 $i0 $i1 $i2 $i3 $i4)
 
 ufw allow 53
 ufw allow 80
@@ -76,9 +72,9 @@ ufw logging on
 # Display status
 ufw status verbose
 
-rm /etc/ufw/after.rules.*
-rm /etc/ufw/after6.rules.*
-rm /etc/ufw/before.rules.*
-rm /etc/ufw/before6.rules.*
-rm /lib/ufw/user6.rules.*
-rm /lib/ufw/user.rules.*
+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/elephantman/firewall b/resources/servers/elephantman/firewall
index 1dc0eef8b..e99d9e581 100644
--- a/resources/servers/elephantman/firewall
+++ b/resources/servers/elephantman/firewall
@@ -21,7 +21,6 @@ s1=`dig +short brazil.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 elephantman.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`
@@ -38,11 +37,9 @@ i0=127.0.0.0/8
 i1=10.0.0.0/8
 i2=172.16.0.0/12
 i3=192.168.0.0/16
-i4=`dig +short paris.cubedesigners.com | tail -1`
-i5=`dig +short montpellier.cubedesigners.com | tail -1`
-i6=`dig +short tortuga.enhydra.fr | tail -1`
+i4=`dig +short tortuga.enhydra.fr | tail -1`
 
-auth=($s0 $s0_0 $s1 $s2 $s2_0 $s3 $s4 $s5 $s5_0 $s5_1 $s5_2 $s5_3 $s6 $s6_0 $s6_1 $s6_2 $s7 $s8 $i0 $i1 $i2 $i3 $i4 $i5 $i6)
+auth=($s0 $s0_0 $s1 $s2 $s2_0 $s3 $s5 $s5_0 $s5_1 $s5_2 $s5_3 $s6 $s6_0 $s6_1 $s6_2 $s7 $s8 $i0 $i1 $i2 $i3 $i4)
 
 
 for ip in "${blacklist[@]}"
@@ -78,9 +75,9 @@ ufw logging on
 # Display status
 ufw status verbose
 
-rm /etc/ufw/after.rules.*
-rm /etc/ufw/after6.rules.*
-rm /etc/ufw/before.rules.*
-rm /etc/ufw/before6.rules.*
-rm /lib/ufw/user6.rules.*
-rm /lib/ufw/user.rules.*
+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/fastandfurious/firewall b/resources/servers/fastandfurious/firewall
index b503226a9..18ea48428 100644
--- a/resources/servers/fastandfurious/firewall
+++ b/resources/servers/fastandfurious/firewall
@@ -32,17 +32,14 @@ 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 fastandfurious.cubedesigners.com | tail -1`
 
 i0=127.0.0.0/8
 i1=10.0.0.0/8
 i2=172.16.0.0/12
 i3=192.168.0.0/16
-i4=`dig +short paris.cubedesigners.com | tail -1`
-i5=`dig +short montpellier.cubedesigners.com | tail -1`
-i6=`dig +short tortuga.enhydra.fr | tail -1`
+i4=`dig +short tortuga.enhydra.fr | tail -1`
 
-auth=($s0 $s0_0 $s1 $s2 $s2_0 $s3 $s4 $s5 $s5_0 $s5_1 $s5_2 $s5_3 $s6 $s6_0 $s6_1 $s6_2 $s7 $s8 $i0 $i1 $i2 $i3 $i4 $i5 $i6)
+auth=($s0 $s0_0 $s1 $s2 $s2_0 $s3 $s4 $s5 $s5_0 $s5_1 $s5_2 $s5_3 $s6 $s6_0 $s6_1 $s6_2 $s7 $i0 $i1 $i2 $i3 $i4)
 
 ufw allow 51820
 
@@ -79,9 +76,9 @@ ufw logging on
 # Display status
 ufw status verbose
 
-rm /etc/ufw/after.rules.*
-rm /etc/ufw/after6.rules.*
-rm /etc/ufw/before.rules.*
-rm /etc/ufw/before6.rules.*
-rm /lib/ufw/user6.rules.*
-rm /lib/ufw/user.rules.*
+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/godzilla/firewall b/resources/servers/godzilla/firewall
index ec7ff6731..cc3914727 100644
--- a/resources/servers/godzilla/firewall
+++ b/resources/servers/godzilla/firewall
@@ -22,11 +22,6 @@ 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 elephantman.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`
@@ -38,11 +33,9 @@ i0=127.0.0.0/8
 i1=10.0.0.0/8
 i2=172.16.0.0/12
 i3=192.168.0.0/16
-i4=`dig +short paris.cubedesigners.com | tail -1`
-i5=`dig +short montpellier.cubedesigners.com | tail -1`
-i6=`dig +short tortuga.enhydra.fr | tail -1`
+i4=`dig +short tortuga.enhydra.fr | tail -1`
 
-auth=($s0 $s0_0 $s1 $s2 $s2_0 $s3 $s4 $s5 $s5_0 $s5_1 $s5_2 $s5_3 $s6 $s6_0 $s6_1 $s6_2 $s7 $s8 $i0 $i1 $i2 $i3 $i4 $i5 $i6)
+auth=($s0 $s0_0 $s1 $s2 $s2_0 $s3 $s4 $s6 $s6_0 $s6_1 $s6_2 $s7 $s8 $i0 $i1 $i2 $i3 $i4)
 
 ufw allow 53
 ufw allow 80
@@ -81,9 +74,9 @@ ufw logging on
 # Display status
 ufw status verbose
 
-rm /etc/ufw/after.rules.*
-rm /etc/ufw/after6.rules.*
-rm /etc/ufw/before.rules.*
-rm /etc/ufw/before6.rules.*
-rm /lib/ufw/user6.rules.*
-rm /lib/ufw/user.rules.*
+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/her2/firewall b/resources/servers/her2/firewall
index 4421c8bc9..25e37694b 100644
--- a/resources/servers/her2/firewall
+++ b/resources/servers/her2/firewall
@@ -27,10 +27,6 @@ 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 fastandfurious.cubedesigners.com | tail -1`
 
@@ -38,11 +34,9 @@ i0=127.0.0.0/8
 i1=10.0.0.0/8
 i2=172.16.0.0/12
 i3=192.168.0.0/16
-i4=`dig +short paris.cubedesigners.com | tail -1`
-i5=`dig +short montpellier.cubedesigners.com | tail -1`
-i6=`dig +short tortuga.enhydra.fr | tail -1`
+i4=`dig +short tortuga.enhydra.fr | tail -1`
 
-auth=($s0 $s0_0 $s1 $s2 $s2_0 $s3 $s4 $s5 $s5_0 $s5_1 $s5_2 $s5_3 $s6 $s6_0 $s6_1 $s6_2 $s7 $s8 $i0 $i1 $i2 $i3 $i4 $i5 $i6)
+auth=($s0 $s0_0 $s1 $s2 $s2_0 $s3 $s4 $s5 $s5_0 $s5_1 $s5_2 $s5_3 $s7 $s8 $i0 $i1 $i2 $i3 $i4)
 
 ufw allow 53
 ufw allow 80
@@ -87,9 +81,9 @@ ufw logging on
 # Display status
 ufw status verbose
 
-rm /etc/ufw/after.rules.*
-rm /etc/ufw/after6.rules.*
-rm /etc/ufw/before.rules.*
-rm /etc/ufw/before6.rules.*
-rm /lib/ufw/user6.rules.*
-rm /lib/ufw/user.rules.*
+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 3aafb3d7e..907ae460a 100644
--- a/resources/servers/kingkong/firewall
+++ b/resources/servers/kingkong/firewall
@@ -31,18 +31,15 @@ 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 fastandfurious.cubedesigners.com | tail -1`
 
 i0=127.0.0.0/8
 i1=10.0.0.0/8
 i2=172.16.0.0/12
 i3=192.168.0.0/16
-i4=`dig +short paris.cubedesigners.com | tail -1`
-i5=`dig +short montpellier.cubedesigners.com | tail -1`
-i6=`dig +short tortuga.enhydra.fr | tail -1`
+i4=`dig +short tortuga.enhydra.fr | tail -1`
 
-auth=($s0 $s0_0 $s1 $s2 $s2_0 $s3 $s4 $s5 $s5_0 $s5_1 $s5_2 $s5_3 $s6 $s6_0 $s6_1 $s6_2 $s7 $s8 $i0 $i1 $i2 $i3 $i4 $i5 $i6)
+auth=($s0 $s0_0 $s1 $s2 $s2_0 $s3 $s4 $s5 $s5_0 $s5_1 $s5_2 $s5_3 $s6 $s6_0 $s6_1 $s6_2 $s8 $i0 $i1 $i2 $i3 $i4)
 
 ufw allow 80
 ufw allow 443
@@ -80,9 +77,9 @@ ufw logging on
 # Display status
 ufw status verbose
 
-rm /etc/ufw/after.rules.*
-rm /etc/ufw/after6.rules.*
-rm /etc/ufw/before.rules.*
-rm /etc/ufw/before6.rules.*
-rm /lib/ufw/user6.rules.*
-rm /lib/ufw/user.rules.*
+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/update.bat b/resources/servers/update.bat
index 6b3760d53..206f800e4 100644
--- a/resources/servers/update.bat
+++ b/resources/servers/update.bat
@@ -1,32 +1,32 @@
 @echo off
-cd /D D:\Works\Scripts
+cd /D D:\Works\FluidbookToolbox\resources
 scp -P 58745 -r toolbox@toolbox.fluidbook.com:/application/resources/servers/ ./
-cd /D D:\Works\Scripts\servers
+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;/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;/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 ./dracula/firewall root@dracula.cubedesigners.com:/usr/local/bin/fw
-ssh -p 22 root@dracula.cubedesigners.com 'chmod 755 /usr/local/bin/fw;/usr/local/bin/fw'
+ssh -p 22 root@dracula.cubedesigners.com 'chmod 755 /usr/local/bin/fw;rm -f /usr/local/bin/firewall;/usr/local/bin/fw'
 
 scp -P 22 ./dobermann/firewall root@dobermann.cubedesigners.com:/usr/local/bin/fw
-ssh -p 22 root@dobermann.cubedesigners.com 'chmod 755 /usr/local/bin/fw;/usr/local/bin/fw'
+ssh -p 22 root@dobermann.cubedesigners.com 'chmod 755 /usr/local/bin/fw;rm -f /usr/local/bin/firewall;/usr/local/bin/fw'
 
 scp -P 22822 ./elephantman/firewall root@elephantman.cubedesigners.com:/usr/local/bin/fw
-ssh -p 22822 root@elephantman.cubedesigners.com 'chmod 755 /usr/local/bin/fw;/usr/local/bin/fw'
+ssh -p 22822 root@elephantman.cubedesigners.com 'chmod 755 /usr/local/bin/fw;rm -f /usr/local/bin/firewall;/usr/local/bin/fw'
 
 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;/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;/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;/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'
 
 scp -P 22822 ./fastandfurious/firewall root@fastandfurious.cubedesigners.com:/usr/local/bin/fw
-ssh -p 22822 root@fastandfurious.cubedesigners.com 'chmod 755 /usr/local/bin/fw;/usr/local/bin/fw'
+ssh -p 22822 root@fastandfurious.cubedesigners.com 'chmod 755 /usr/local/bin/fw;rm -f /usr/local/bin/firewall;/usr/local/bin/fw'