wip #7270 @6

diff --git a/.docker/config/ssh/root/id_rsa.pub b/.docker/config/ssh/root/id_rsa.pub
index 2f7a68c962e4ce4b7028a22aa86c0db076e2f0dd..0ccfb924a0c62ffa16e348db4c2740723d25ae84 100644 (file)
--- a/.docker/config/ssh/root/id_rsa.pub
+++ b/.docker/config/ssh/root/id_rsa.pub
@@ -1 +1 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC3vHNE7na68aUPFwAK4h3VW+PR4GZaLsTCdySLdt8974jKltMDfWdEbM//mQOm4nOLDkPkbn+TX0GuTNu/SnFTP/qnG7e+p+pqhuYrvw9CHBHtsGoPZS1ZWs53wuXbuJmYTzJMaMV+dibRh2rX/uzH7dBNVQJMGFcQkjrq/UnhJTgKZPprhx2tDV4Rm72GXH4JOi+yautM7jK21gpxdFUJy7VaNaPB1iqcCikn+htCNs1n8BjVRwAMPI9AB6eEgfX68DyVF80TGLyWxlCumFOZXDELhOneJtO0zFMSEuBVXbPm2fNq1jaMaeqgmZqQiZNM0o4hqW/ZLcRH0k+gGXHH extranet@amarcord.cubedesigners.com
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC3vHNE7na68aUPFwAK4h3VW+PR4GZaLsTCdySLdt8974jKltMDfWdEbM//mQOm4nOLDkPkbn+TX0GuTNu/SnFTP/qnG7e+p+pqhuYrvw9CHBHtsGoPZS1ZWs53wuXbuJmYTzJMaMV+dibRh2rX/uzH7dBNVQJMGFcQkjrq/UnhJTgKZPprhx2tDV4Rm72GXH4JOi+yautM7jK21gpxdFUJy7VaNaPB1iqcCikn+htCNs1n8BjVRwAMPI9AB6eEgfX68DyVF80TGLyWxlCumFOZXDELhOneJtO0zFMSEuBVXbPm2fNq1jaMaeqgmZqQiZNM0o4hqW/ZLcRH0k+gGXHH toolbox@fluidbook.com

diff --git a/.docker/config/ssh/root/known_hosts b/.docker/config/ssh/root/known_hosts
index f51383b520b841b3cbad08d4dfe2a6f17ebf6348..7722dac4c42cc3d64ba6f0269591304fb4c8c2af 100644 (file)
--- a/.docker/config/ssh/root/known_hosts
+++ b/.docker/config/ssh/root/known_hosts
@@ -56,6 +56,13 @@
 |1|6wykuWMhStQ5Tv99aBiqb6H+zyY=|cl+8o5TNKooA36tWnHoIAOIvV4k= ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEGI/UefTFGQMkNX5fjbcI6ZIwDbOvWi0Pu2NAdrnqMI7OEHbFZ2PZdyOFkOvg+r6L989kt9xX7UDC4hb7YbFXI=
 clockwork.cubedesigners.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIANFl2JCSaJevMwQgEbkSTskRo9sEPNbPcaCURgxDu6q
 kingkong.cubedesigners.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAYlGygCsICCRvgOUYi18Nwudv3z1vUsRmvvDKQ4Gs95
+github.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOMqqnkVzrm0SdG6UOoqKLsabgH5C9okWi0dh2l9GKJl
+github.com ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCj7ndNxQowgcQnjshcLrqPEiiphnt+VTTvDP6mHBL9j1aNUkY4Ue1gvwnGLVlOhGeYrnZaMgRK6+PKCUXaDbC7qtbW8gIkhL7aGCsOr/C56SJMy/BCZfxd1nWzAOxSDPgVsmerOBYfNqltV9/hWCqBywINIR+5dIg6JTJ72pcEpEjcYgXkE2YEFXV1JHnsKgbLWNlhScqb2UmyRkQyytRLtL+38TGxkxCflmO+5Z8CSSNY7GidjMIZ7Q4zMjA2n1nGrlTDkzwDCsw+wqFPGQA179cnfGWOWRVruj16z6XyvxvjJwbz0wQZ75XK5tKSb7FNyeIEs4TT4jk+S4dhPeAUC5y+bDYirYgM4GC7uEnztnZyaVWQ7B381AK4Qdrwt51ZqExKbQpTUNn+EjqoTwvqNj4kqx5QUCI0ThS/YkOxJCXmPUWZbhjpCg56i+2aB6CmK2JGhn57K5mj0MNdBXA4/WnwH6XoPWJzK5Nyu2zB3nAZp+S5hpQs+p1vN1/wsjk=
+github.com ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEmKSENjQEezOmxkZMy7opKgwFB9nkt5YRrYMjNuG5N87uRgg6CLrbo5wAdT/y6v0mKV0U2w0WZ2YB/++Tpockg=
+[paris.cubedesigners.com]:22622 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFm4EKDXLwDEGP0R1Ie+K+UbM+98ECvyOdma+oASacUJ
+[paris.cubedesigners.com]:22622 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC7/de3HhC7g6KV5PCcw/2DdJUvHVu160hdUFGVq6s/bcNkt8PrS4qxl3Cc5FUFtwRmZdFeWKIC7jTJGq/PMa5HTrJcVy/VuQBuxoZv28FPxIX0Cx8pdtqtVa4L9VpyibmsNkERVTh1nfSAwVjvuHBy4WyeC/kDZsDZOAY/IDrdTE6hYhJjSW2WZXixPjBgM9lEklemokklA5KQstwkKh8mGyF9chYc3wU+Eyrb2faplSJ59BbjoV4Jh7JLzX+ttE7W/qTG2dVIcgrqwovU+RP+C/1rxmUUAyDThDj6Ug3g7oPgBj+Eo4EXq10X3LP6bkzFgV9cJc5orBsB5olWA2cUUYBOMaFO0FwClGFHsuxRo9zdvKoLUp2Dx8Q16z9sQXeBdk9W3qEVjRh1DB8smCxSrNObuqKqc36PmezPmkv/SNvD1wrEmQ/0/a9uznOoegOaW9k1lBhooxDaiQCyCO80DD/E7JDj/euRZ42qEBrxeOGCbUkPTHCXQo3glhcPAjc=
+[paris.cubedesigners.com]:22622 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBB+yTkg8a5sqFxBSLmXEPD3h/vSlNu7ptk7ZreYD85NtRtwu/+ixk87olCEG3v8iDxKoYs31PiBc/Rnu03ey/1Y=
+clockwork.cubedesigners.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIANFl2JCSaJevMwQgEbkSTskRo9sEPNbPcaCURgxDu6q
 kingkong.cubedesigners.com ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEIbwg6rJgn3sVRiS0MIxzMWI0BCOyvpoU031Wr2O3jHyEtBPfntcURQHloxD0D6gsD1Ps56a3b4/SBQgWqZY6Y=
 192.168.10.176 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILRkvb1WurcFyDt1Afedb3vDFsJh07PbUzOPxgAyPEIz
 192.168.10.32 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIizfZpU3yj5wLdHbMjcpeUsFXyQYc4ekMWekNxLZaZX
@@ -65,3 +72,7 @@ kingkong.cubedesigners.com ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAA
 cloudatlas.cubedesigners.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIG/uWkiM5RoIVZVytB5aAtoLSKDET+YnCVoUeU6Kehs6
 cloudatlas.cubedesigners.com ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDdFpfzuqAB4W3XYZMYIPOAVHMX1gRAE+RgfmMea9axczlBVC3d/66lwX0G9gDm3bGKTsMdX/mhwsAtUNeiZpTN5w4MQlU1kxcGeLBzfiBc20WnSI80HUbSoE1g3ewZqFeeA+5NBD0/8P+hLbXIGN0X7mzBjYpXNqOOe5rsOcYN+D7N2sn2+hfpWPh8PNMAo20ezO+2LqhnE11LZlOykdEz1/12NKBYa8RSonn/ABQv5rU38tAHKCglhbBpYzkxJKhx0KqKJC3dNsqplMMZ9hpRjjWF/t5vG/uDQKRd1gOg8RzBwk8Vi/3WnljX3c3DAKdOlfp6yWG8tzYmCGN6z39NF88G3obH5OAKyOepbSAy+4Vs4oQ6JdWGTvLUjrTZ93WLM8L11OKKs+OK2raC6EgvT68R9kgdK6O0YKcQEw8alRUXXVBDU3msnceXtD4dNjxJ+uDAbl8epSRSg3O3q3SBLsOEMIfuGMDTyeOo6IUr8sb8+pN84CKZeY04XVF3IP8=
 cloudatlas.cubedesigners.com ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBAoAIRkoSvgr8J2iHY7cloPMqbiigf6jQxisvSu3TleZp41hhGT3XvTE1zFiwkLRIupodMk4nepXr6oOQTXfwXQ=
+docs.toolbox.fluidbook.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFUp6De47cne783SJcF2dJjNg4A4kvcvtlRnvz/YRXEF
+[docs.toolbox.fluidbook.com]:7552 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIYkSZhpAGPrK9pusbaZ1DnhkhrbAnTEQOlvpfLLsqiv
+[docs.toolbox.fluidbook.com]:7552 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBMAKu2ibdnGTqMCPxYKYRTWv1vmTYtybyTOiktjSSLctQef35AThJieC9Fn2qg/ermTqywF/ZVBFQkoG23MYSMw=
+[docs.toolbox.fluidbook.com]:7552 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCxFAHrBXEQoTtvFoBobLjBqLkV7hjiaTTCFjgr0W5zNFeEOcRnFYn7IR+1tScbZZ1dZQgfiHyjjb1RntOfXaY4QYBIGbuxxBie68bxsL0BOc2MqR4JCbK3lWkvFF2QstmmY5P1sd8ove3HTfY6k9bmoek34s5z6t3Gebm8qr8G6oC/F/LlXnNeI22jct9fHcYWt2v0pLf/XAYY54hTtZFMDiZmquGZVwqT4vsMcH/HS1PcI3lMT3cVrTZbvWlz8P9aSTwUcQgYSuUWLOC2KyS8IZuuoUSAnS/ebYvzA5rkmUfrpavWsxgFCu/O0czP7iagyzTcf0rU0ocBb9LR64bYd7NoEVShGWgyT4y3bnrouTxnbYZ5S13adGQAGjAClvmKcncZeWte+mBsXews4yrRkUA9N2a2fBZ4VR3LrhV3PD6T5Ket8o4P3LGFJEn4IRWwB6K68f+IIYdd7gZD39dHm7moF3q6WVIwpbnXtAb2+M57+hWnFnk6sJXW1fLMl1M=

diff --git a/.docker/config/ssh/user/id_rsa.pub b/.docker/config/ssh/user/id_rsa.pub
index 2f7a68c962e4ce4b7028a22aa86c0db076e2f0dd..0ccfb924a0c62ffa16e348db4c2740723d25ae84 100644 (file)
--- a/.docker/config/ssh/user/id_rsa.pub
+++ b/.docker/config/ssh/user/id_rsa.pub
@@ -1 +1 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC3vHNE7na68aUPFwAK4h3VW+PR4GZaLsTCdySLdt8974jKltMDfWdEbM//mQOm4nOLDkPkbn+TX0GuTNu/SnFTP/qnG7e+p+pqhuYrvw9CHBHtsGoPZS1ZWs53wuXbuJmYTzJMaMV+dibRh2rX/uzH7dBNVQJMGFcQkjrq/UnhJTgKZPprhx2tDV4Rm72GXH4JOi+yautM7jK21gpxdFUJy7VaNaPB1iqcCikn+htCNs1n8BjVRwAMPI9AB6eEgfX68DyVF80TGLyWxlCumFOZXDELhOneJtO0zFMSEuBVXbPm2fNq1jaMaeqgmZqQiZNM0o4hqW/ZLcRH0k+gGXHH extranet@amarcord.cubedesigners.com
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC3vHNE7na68aUPFwAK4h3VW+PR4GZaLsTCdySLdt8974jKltMDfWdEbM//mQOm4nOLDkPkbn+TX0GuTNu/SnFTP/qnG7e+p+pqhuYrvw9CHBHtsGoPZS1ZWs53wuXbuJmYTzJMaMV+dibRh2rX/uzH7dBNVQJMGFcQkjrq/UnhJTgKZPprhx2tDV4Rm72GXH4JOi+yautM7jK21gpxdFUJy7VaNaPB1iqcCikn+htCNs1n8BjVRwAMPI9AB6eEgfX68DyVF80TGLyWxlCumFOZXDELhOneJtO0zFMSEuBVXbPm2fNq1jaMaeqgmZqQiZNM0o4hqW/ZLcRH0k+gGXHH toolbox@fluidbook.com

diff --git a/.docker/config/ssh/user/known_hosts b/.docker/config/ssh/user/known_hosts
index 61eba067ca154e04d2dfb46b9118f10645eb6054..7722dac4c42cc3d64ba6f0269591304fb4c8c2af 100644 (file)
--- a/.docker/config/ssh/user/known_hosts
+++ b/.docker/config/ssh/user/known_hosts
@@ -54,6 +54,7 @@
 |1|EmZ7B29Ivw6vXBlnc4XgrTLl9+8=|78a+bA6zcqZqT3mcCSA7DgfgtWQ= ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEKmRybFZ/yMrtKp92N7MpKSByOo4TNm1yFa96mvH4ktgxG9Iw5LdRBELGknXZO0hRkysrblSsQ6Opu/8ZOdPuo=
 |1|JzPIYF8QCrSBS4t2fVId5Ym7Kyg=|0K3icsRiZpexNkPIchHkADj+UJE= ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEKmRybFZ/yMrtKp92N7MpKSByOo4TNm1yFa96mvH4ktgxG9Iw5LdRBELGknXZO0hRkysrblSsQ6Opu/8ZOdPuo=
 |1|6wykuWMhStQ5Tv99aBiqb6H+zyY=|cl+8o5TNKooA36tWnHoIAOIvV4k= ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEGI/UefTFGQMkNX5fjbcI6ZIwDbOvWi0Pu2NAdrnqMI7OEHbFZ2PZdyOFkOvg+r6L989kt9xX7UDC4hb7YbFXI=
+clockwork.cubedesigners.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIANFl2JCSaJevMwQgEbkSTskRo9sEPNbPcaCURgxDu6q
 kingkong.cubedesigners.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAYlGygCsICCRvgOUYi18Nwudv3z1vUsRmvvDKQ4Gs95
 github.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOMqqnkVzrm0SdG6UOoqKLsabgH5C9okWi0dh2l9GKJl
 github.com ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCj7ndNxQowgcQnjshcLrqPEiiphnt+VTTvDP6mHBL9j1aNUkY4Ue1gvwnGLVlOhGeYrnZaMgRK6+PKCUXaDbC7qtbW8gIkhL7aGCsOr/C56SJMy/BCZfxd1nWzAOxSDPgVsmerOBYfNqltV9/hWCqBywINIR+5dIg6JTJ72pcEpEjcYgXkE2YEFXV1JHnsKgbLWNlhScqb2UmyRkQyytRLtL+38TGxkxCflmO+5Z8CSSNY7GidjMIZ7Q4zMjA2n1nGrlTDkzwDCsw+wqFPGQA179cnfGWOWRVruj16z6XyvxvjJwbz0wQZ75XK5tKSb7FNyeIEs4TT4jk+S4dhPeAUC5y+bDYirYgM4GC7uEnztnZyaVWQ7B381AK4Qdrwt51ZqExKbQpTUNn+EjqoTwvqNj4kqx5QUCI0ThS/YkOxJCXmPUWZbhjpCg56i+2aB6CmK2JGhn57K5mj0MNdBXA4/WnwH6XoPWJzK5Nyu2zB3nAZp+S5hpQs+p1vN1/wsjk=
@@ -63,4 +64,15 @@ github.com ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAA
 [paris.cubedesigners.com]:22622 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBB+yTkg8a5sqFxBSLmXEPD3h/vSlNu7ptk7ZreYD85NtRtwu/+ixk87olCEG3v8iDxKoYs31PiBc/Rnu03ey/1Y=
 clockwork.cubedesigners.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIANFl2JCSaJevMwQgEbkSTskRo9sEPNbPcaCURgxDu6q
 kingkong.cubedesigners.com ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEIbwg6rJgn3sVRiS0MIxzMWI0BCOyvpoU031Wr2O3jHyEtBPfntcURQHloxD0D6gsD1Ps56a3b4/SBQgWqZY6Y=
+192.168.10.176 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILRkvb1WurcFyDt1Afedb3vDFsJh07PbUzOPxgAyPEIz
+192.168.10.32 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIizfZpU3yj5wLdHbMjcpeUsFXyQYc4ekMWekNxLZaZX
 192.168.10.102 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFm4EKDXLwDEGP0R1Ie+K+UbM+98ECvyOdma+oASacUJ
+192.168.10.102 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC7/de3HhC7g6KV5PCcw/2DdJUvHVu160hdUFGVq6s/bcNkt8PrS4qxl3Cc5FUFtwRmZdFeWKIC7jTJGq/PMa5HTrJcVy/VuQBuxoZv28FPxIX0Cx8pdtqtVa4L9VpyibmsNkERVTh1nfSAwVjvuHBy4WyeC/kDZsDZOAY/IDrdTE6hYhJjSW2WZXixPjBgM9lEklemokklA5KQstwkKh8mGyF9chYc3wU+Eyrb2faplSJ59BbjoV4Jh7JLzX+ttE7W/qTG2dVIcgrqwovU+RP+C/1rxmUUAyDThDj6Ug3g7oPgBj+Eo4EXq10X3LP6bkzFgV9cJc5orBsB5olWA2cUUYBOMaFO0FwClGFHsuxRo9zdvKoLUp2Dx8Q16z9sQXeBdk9W3qEVjRh1DB8smCxSrNObuqKqc36PmezPmkv/SNvD1wrEmQ/0/a9uznOoegOaW9k1lBhooxDaiQCyCO80DD/E7JDj/euRZ42qEBrxeOGCbUkPTHCXQo3glhcPAjc=
+192.168.10.102 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBB+yTkg8a5sqFxBSLmXEPD3h/vSlNu7ptk7ZreYD85NtRtwu/+ixk87olCEG3v8iDxKoYs31PiBc/Rnu03ey/1Y=
+cloudatlas.cubedesigners.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIG/uWkiM5RoIVZVytB5aAtoLSKDET+YnCVoUeU6Kehs6
+cloudatlas.cubedesigners.com ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDdFpfzuqAB4W3XYZMYIPOAVHMX1gRAE+RgfmMea9axczlBVC3d/66lwX0G9gDm3bGKTsMdX/mhwsAtUNeiZpTN5w4MQlU1kxcGeLBzfiBc20WnSI80HUbSoE1g3ewZqFeeA+5NBD0/8P+hLbXIGN0X7mzBjYpXNqOOe5rsOcYN+D7N2sn2+hfpWPh8PNMAo20ezO+2LqhnE11LZlOykdEz1/12NKBYa8RSonn/ABQv5rU38tAHKCglhbBpYzkxJKhx0KqKJC3dNsqplMMZ9hpRjjWF/t5vG/uDQKRd1gOg8RzBwk8Vi/3WnljX3c3DAKdOlfp6yWG8tzYmCGN6z39NF88G3obH5OAKyOepbSAy+4Vs4oQ6JdWGTvLUjrTZ93WLM8L11OKKs+OK2raC6EgvT68R9kgdK6O0YKcQEw8alRUXXVBDU3msnceXtD4dNjxJ+uDAbl8epSRSg3O3q3SBLsOEMIfuGMDTyeOo6IUr8sb8+pN84CKZeY04XVF3IP8=
+cloudatlas.cubedesigners.com ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBAoAIRkoSvgr8J2iHY7cloPMqbiigf6jQxisvSu3TleZp41hhGT3XvTE1zFiwkLRIupodMk4nepXr6oOQTXfwXQ=
+docs.toolbox.fluidbook.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFUp6De47cne783SJcF2dJjNg4A4kvcvtlRnvz/YRXEF
+[docs.toolbox.fluidbook.com]:7552 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIYkSZhpAGPrK9pusbaZ1DnhkhrbAnTEQOlvpfLLsqiv
+[docs.toolbox.fluidbook.com]:7552 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBMAKu2ibdnGTqMCPxYKYRTWv1vmTYtybyTOiktjSSLctQef35AThJieC9Fn2qg/ermTqywF/ZVBFQkoG23MYSMw=
+[docs.toolbox.fluidbook.com]:7552 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCxFAHrBXEQoTtvFoBobLjBqLkV7hjiaTTCFjgr0W5zNFeEOcRnFYn7IR+1tScbZZ1dZQgfiHyjjb1RntOfXaY4QYBIGbuxxBie68bxsL0BOc2MqR4JCbK3lWkvFF2QstmmY5P1sd8ove3HTfY6k9bmoek34s5z6t3Gebm8qr8G6oC/F/LlXnNeI22jct9fHcYWt2v0pLf/XAYY54hTtZFMDiZmquGZVwqT4vsMcH/HS1PcI3lMT3cVrTZbvWlz8P9aSTwUcQgYSuUWLOC2KyS8IZuuoUSAnS/ebYvzA5rkmUfrpavWsxgFCu/O0czP7iagyzTcf0rU0ocBb9LR64bYd7NoEVShGWgyT4y3bnrouTxnbYZ5S13adGQAGjAClvmKcncZeWte+mBsXews4yrRkUA9N2a2fBZ4VR3LrhV3PD6T5Ket8o4P3LGFJEn4IRWwB6K68f+IIYdd7gZD39dHm7moF3q6WVIwpbnXtAb2+M57+hWnFnk6sJXW1fLMl1M=

diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml
index 2800615f85814b687dbdeae173a9090abfedfacb..abd3afd80beeab23da47273e61712f5fa7d11dd1 100644 (file)
--- a/.docker/docker-compose.yml
+++ b/.docker/docker-compose.yml
@@ -190,6 +190,7 @@ volumes:
   docs:
     driver: ucphhpc/sshfs:latest
     driver_opts:
-      sshcmd: "fluidbook@dracula.cubedesigners.com:/data/fluidbook/docs"
+      sshcmd: "fluidbook@docs.toolbox.fluidbook.com:/data"
       allow_other: ""
       password: "Qu2E9uq48bBzsqGiZA"
+      port: "7552"

diff --git a/app/SubForms/TeamServer.php b/app/SubForms/TeamServer.php
index 17e06d8ebef621c12dcd98b9889d7359f263088c..275d731e33cc83d49091e23d294347a71d019607 100644 (file)
--- a/app/SubForms/TeamServer.php
+++ b/app/SubForms/TeamServer.php
@@ -23,5 +23,7 @@ class TeamServer extends SubForm
         $this->addField('wireguard', Checkbox::class, __('Serveur Wireguard'));
         $this->addField('backup', Checkbox::class, __('Serveur de backup'));
         $this->addField('ports', Text::class, __('Autres ports à ouvrir'));
+        $this->addField('docker', Textarea::class, __('Containers publics'));
+        $this->addField('docker_restricted', Textarea::class, __('Containers restreints'));
     }
 }

diff --git a/bin/mount.sh b/bin/mount.sh
index e661fbc10bbd2633cdcfd2fa5f5697145ef8f4f7..eaa1398659b895ab0888effd974c53bef24e7b3c 100644 (file)
--- a/bin/mount.sh
+++ b/bin/mount.sh
@@ -32,7 +32,7 @@ if mountpoint -q "/application/protected/fluidbookpublication/docs"; then
 else
     echo "mount /application/protected/fluidbookpublication/docs"
     umount -l -q /application/protected/fluidbookpublication/docs
-    sshfs -o reconnect,ServerAliveInterval=15,ServerAliveCountMax=3 -o cache=no -o uid=1001 -o gid=33 -o allow_other root@dracula.cubedesigners.com:/data/fluidbook/docs /application/protected/fluidbookpublication/docs
+    sshfs -o reconnect,ServerAliveInterval=15,ServerAliveCountMax=3 -o cache=no -o uid=1001 -o gid=33 -o allow_other -p 7552 fluidbook@docs.toolbox.fluidbook.com:/data /application/protected/fluidbookpublication/docs
 fi
 
 mkdir -p /mnt/sign

diff --git a/resources/servers/alphaville/firewall b/resources/servers/alphaville/firewall
index 52e14e7c3c7e268fa8290b035a150a502d2c2e33..afdacf3f2885560c76a482fa9c09dc6255866f87 100644 (file)
--- a/resources/servers/alphaville/firewall
+++ b/resources/servers/alphaville/firewall
@@ -26,23 +26,19 @@ b2=50.62.177.177
 b3=195.70.4.231
 blacklist=($b0 $b1 $b2 $b3)
 
-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`
+s0=`dig +short amadeus.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 kingkong.cubedesigners.com | tail -1`
 s6=`dig +short elephantman.cubedesigners.com | tail -1`
 s7=`dig +short fastandfurious.cubedesigners.com | tail -1`
 
-auth=($s1 $s1_0 $s1_1 $s1_2 $s2 $s2_0 $s3 $s4 $s4_0 $s4_1 $s4_2 $s4_3 $s5 $s6 $s7)
+auth=($s0 $s2 $s2_0 $s2_1 $s2_2 $s3 $s3_0 $s4 $s5 $s6 $s7)
 
 ufw allow 58745
 ufw allow 80

diff --git a/resources/servers/amadeus/firewall b/resources/servers/amadeus/firewall
new file mode 100644 (file)
index 0000000..f0c6b43
--- /dev/null
+++ b/resources/servers/amadeus/firewall
@@ -0,0 +1,89 @@
+#!/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`
+i3=`dig +short cocodrilo.enhydra.fr | tail -1`
+
+local=($l0 $l1 $l2 $l3 $i0 $i1 $i2 $i3)
+
+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)
+
+s1=`dig +short alphaville.cubedesigners.com | tail -1`
+s1_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 kingkong.cubedesigners.com | tail -1`
+s6=`dig +short elephantman.cubedesigners.com | tail -1`
+s7=`dig +short fastandfurious.cubedesigners.com | tail -1`
+
+auth=($s1 $s1_0 $s2 $s2_0 $s2_1 $s2_2 $s3 $s3_0 $s4 $s5 $s6 $s7)
+
+ufw allow 58745
+ufw allow 53
+ufw allow 80
+ufw allow 443
+
+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 6337fb7e91525a8c38b57a6fd4e58db9056e5491..4a88ba1bed8ca9b78443beae18819befc79cbcbd 100644 (file)
--- a/resources/servers/cloudatlas/firewall
+++ b/resources/servers/cloudatlas/firewall
@@ -26,21 +26,17 @@ 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 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`
+s0=`dig +short amadeus.cubedesigners.com | tail -1`
+s1=`dig +short alphaville.cubedesigners.com | tail -1`
+s1_0=`dig +short toolbox.fluidbook.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 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 $s2 $s2_0 $s3 $s4 $s4_0 $s4_1 $s4_2 $s4_3 $s5 $s6 $s7)
+auth=($s0 $s1 $s1_0 $s3 $s3_0 $s4 $s5 $s6 $s7)
 
 ufw allow 53
 ufw allow 80

diff --git a/resources/servers/dobermann/firewall b/resources/servers/dobermann/firewall
index 3f98455c925dc85c20db75c2a3b018db31ed9d59..69d2441297314a51e5c53c6c0a1cdc81acc900e9 100644 (file)
--- a/resources/servers/dobermann/firewall
+++ b/resources/servers/dobermann/firewall
@@ -26,24 +26,20 @@ 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 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`
+s0=`dig +short amadeus.cubedesigners.com | tail -1`
+s1=`dig +short alphaville.cubedesigners.com | tail -1`
+s1_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`
 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)
+auth=($s0 $s1 $s1_0 $s2 $s2_0 $s2_1 $s2_2 $s3 $s3_0 $s5 $s6 $s7)
 
 c0=`dig +short www.fondation-sycomore.com | tail -1`
 backup=($c0)

diff --git a/resources/servers/dracula/firewall b/resources/servers/dracula/firewall
index 0c2f2b6135a660886ac4d00544c596a1e85fe23f..62ee4270a5809bd64c31acb91b361428551ae9f3 100644 (file)
--- a/resources/servers/dracula/firewall
+++ b/resources/servers/dracula/firewall
@@ -26,23 +26,19 @@ 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 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`
+s0=`dig +short amadeus.cubedesigners.com | tail -1`
+s1=`dig +short alphaville.cubedesigners.com | tail -1`
+s1_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`
+s4=`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 $s3 $s4 $s4_0 $s4_1 $s4_2 $s4_3 $s5 $s6 $s7)
+auth=($s0 $s1 $s1_0 $s2 $s2_0 $s2_1 $s2_2 $s4 $s5 $s6 $s7)
 
 ufw allow 53
 ufw allow 80

diff --git a/resources/servers/elephantman/firewall b/resources/servers/elephantman/firewall
index c79731787a646909fedc1b7e1f7456be1699b746..4f6c57141d2e9ea7e43d0ef2c6a3b150fde71b13 100644 (file)
--- a/resources/servers/elephantman/firewall
+++ b/resources/servers/elephantman/firewall
@@ -26,24 +26,20 @@ 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 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`
+s0=`dig +short amadeus.cubedesigners.com | tail -1`
+s1=`dig +short alphaville.cubedesigners.com | tail -1`
+s1_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 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)
+auth=($s0 $s1 $s1_0 $s2 $s2_0 $s2_1 $s2_2 $s3 $s3_0 $s4 $s5 $s7)
 
 
 for ip in "${blacklist[@]}"

diff --git a/resources/servers/fastandfurious/firewall b/resources/servers/fastandfurious/firewall
index 96a97166e66ca94121aa5a094a1adc68c31dd393..39f5b1695aaea0ab4674e1389b87adf0d0a6a8ae 100644 (file)
--- a/resources/servers/fastandfurious/firewall
+++ b/resources/servers/fastandfurious/firewall
@@ -26,24 +26,20 @@ 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 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`
+s0=`dig +short amadeus.cubedesigners.com | tail -1`
+s1=`dig +short alphaville.cubedesigners.com | tail -1`
+s1_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 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)
+auth=($s0 $s1 $s1_0 $s2 $s2_0 $s2_1 $s2_2 $s3 $s3_0 $s4 $s5 $s6)
 
 ufw allow 51820
 

diff --git a/resources/servers/kingkong/firewall b/resources/servers/kingkong/firewall
index 761986f49f272610344b6e8e383b7ccb147d51b8..5a59326d947f19c38ef86306227cdf0f68e8950b 100644 (file)
--- a/resources/servers/kingkong/firewall
+++ b/resources/servers/kingkong/firewall
@@ -26,24 +26,20 @@ 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 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`
+s0=`dig +short amadeus.cubedesigners.com | tail -1`
+s1=`dig +short alphaville.cubedesigners.com | tail -1`
+s1_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`
 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)
+auth=($s0 $s1 $s1_0 $s2 $s2_0 $s2_1 $s2_2 $s3 $s3_0 $s4 $s6 $s7)
 
 ufw allow 80
 ufw allow 443

diff --git a/resources/servers/update.bat b/resources/servers/update.bat
index 59e74f22e5867b2a98f1a5110e82561808925ef8..9369a87e91a0b526d78b8d21794c67755d04fae1 100644 (file)
--- a/resources/servers/update.bat
+++ b/resources/servers/update.bat
@@ -3,6 +3,9 @@ cd /D D:\Works\FluidbookToolbox\resources
 scp -P 58745 -r toolbox@toolbox.fluidbook.com:/application/resources/servers/ ./
 cd /D D:\Works\FluidbookToolbox\resources\servers
 
+scp -P 22 ./amadeus/firewall root@amadeus.cubedesigners.com:/usr/local/bin/fw
+ssh -p 22 root@amadeus.cubedesigners.com 'chmod 755 /usr/local/bin/fw;rm -f /usr/local/bin/firewall;/usr/local/bin/fw'
+
 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'
 
@@ -15,9 +18,6 @@ ssh -p 22 root@dracula.cubedesigners.com 'chmod 755 /usr/local/bin/fw;rm -f /usr
 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;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;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'
 

diff --git a/servers/alphaville/firewall b/servers/alphaville/firewall
new file mode 100644 (file)
index 0000000..1ba5bdd
--- /dev/null
+++ b/servers/alphaville/firewall
@@ -0,0 +1,87 @@
+#!/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`
+i3=`dig +short cocodrilo.enhydra.fr | tail -1`
+
+local=($l0 $l1 $l2 $l3 $i0 $i1 $i2 $i3)
+
+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)
+
+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 kingkong.cubedesigners.com | tail -1`
+s5=`dig +short elephantman.cubedesigners.com | tail -1`
+s6=`dig +short fastandfurious.cubedesigners.com | tail -1`
+s7=`dig +short amadeus.cubedesigners.com | tail -1`
+
+auth=($s1 $s1_0 $s1_1 $s1_2 $s2 $s2_0 $s3 $s4 $s5 $s6 $s7)
+
+ufw allow 58745
+ufw allow 80
+ufw allow 443
+
+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/servers/amadeus/firewall b/servers/amadeus/firewall
new file mode 100644 (file)
index 0000000..a99e406
--- /dev/null
+++ b/servers/amadeus/firewall
@@ -0,0 +1,94 @@
+#!/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`
+i3=`dig +short cocodrilo.enhydra.fr | tail -1`
+
+local=($l0 $l1 $l2 $l3 $i0 $i1 $i2 $i3)
+
+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 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 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 $s1_0 $s1_1 $s1_2 $s2 $s2_0 $s3 $s4 $s5 $s6)
+
+ufw allow 58745
+ufw allow 53
+ufw allow 80
+ufw allow 443
+
+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/servers/cloudatlas/firewall b/servers/cloudatlas/firewall
new file mode 100644 (file)
index 0000000..2193b29
--- /dev/null
+++ b/servers/cloudatlas/firewall
@@ -0,0 +1,91 @@
+#!/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`
+i3=`dig +short cocodrilo.enhydra.fr | tail -1`
+
+local=($l0 $l1 $l2 $l3 $i0 $i1 $i2 $i3)
+
+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 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 kingkong.cubedesigners.com | tail -1`
+s5=`dig +short elephantman.cubedesigners.com | tail -1`
+s6=`dig +short fastandfurious.cubedesigners.com | tail -1`
+s7=`dig +short amadeus.cubedesigners.com | tail -1`
+
+auth=($s0 $s0_0 $s2 $s2_0 $s3 $s4 $s5 $s6 $s7)
+
+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
+
+#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/servers/dobermann/firewall b/servers/dobermann/firewall
new file mode 100644 (file)
index 0000000..a4686c3
--- /dev/null
+++ b/servers/dobermann/firewall
@@ -0,0 +1,95 @@
+#!/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`
+i3=`dig +short cocodrilo.enhydra.fr | tail -1`
+
+local=($l0 $l1 $l2 $l3 $i0 $i1 $i2 $i3)
+
+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 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 kingkong.cubedesigners.com | tail -1`
+s5=`dig +short elephantman.cubedesigners.com | tail -1`
+s6=`dig +short fastandfurious.cubedesigners.com | tail -1`
+s7=`dig +short amadeus.cubedesigners.com | tail -1`
+
+auth=($s0 $s0_0 $s1 $s1_0 $s1_1 $s1_2 $s2 $s2_0 $s4 $s5 $s6 $s7)
+
+c0=`dig +short www.fondation-sycomore.com | tail -1`
+backup=($c0)
+ufw allow 53
+ufw allow 80
+ufw allow 443
+
+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/servers/dracula/firewall b/servers/dracula/firewall
new file mode 100644 (file)
index 0000000..759b360
--- /dev/null
+++ b/servers/dracula/firewall
@@ -0,0 +1,87 @@
+#!/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`
+i3=`dig +short cocodrilo.enhydra.fr | tail -1`
+
+local=($l0 $l1 $l2 $l3 $i0 $i1 $i2 $i3)
+
+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 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 kingkong.cubedesigners.com | tail -1`
+s5=`dig +short elephantman.cubedesigners.com | tail -1`
+s6=`dig +short fastandfurious.cubedesigners.com | tail -1`
+s7=`dig +short amadeus.cubedesigners.com | tail -1`
+
+auth=($s0 $s0_0 $s1 $s1_0 $s1_1 $s1_2 $s3 $s4 $s5 $s6 $s7)
+
+ufw allow 53
+ufw allow 80
+ufw allow 443
+
+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/servers/elephantman/firewall b/servers/elephantman/firewall
new file mode 100644 (file)
index 0000000..6266f89
--- /dev/null
+++ b/servers/elephantman/firewall
@@ -0,0 +1,90 @@
+#!/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`
+i3=`dig +short cocodrilo.enhydra.fr | tail -1`
+
+local=($l0 $l1 $l2 $l3 $i0 $i1 $i2 $i3)
+
+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 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 kingkong.cubedesigners.com | tail -1`
+s6=`dig +short fastandfurious.cubedesigners.com | tail -1`
+s7=`dig +short amadeus.cubedesigners.com | tail -1`
+
+auth=($s0 $s0_0 $s1 $s1_0 $s1_1 $s1_2 $s2 $s2_0 $s3 $s4 $s6 $s7)
+
+
+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/servers/fastandfurious/firewall b/servers/fastandfurious/firewall
new file mode 100644 (file)
index 0000000..7584df5
--- /dev/null
+++ b/servers/fastandfurious/firewall
@@ -0,0 +1,91 @@
+#!/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`
+i3=`dig +short cocodrilo.enhydra.fr | tail -1`
+
+local=($l0 $l1 $l2 $l3 $i0 $i1 $i2 $i3)
+
+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 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 kingkong.cubedesigners.com | tail -1`
+s5=`dig +short elephantman.cubedesigners.com | tail -1`
+s7=`dig +short amadeus.cubedesigners.com | tail -1`
+
+auth=($s0 $s0_0 $s1 $s1_0 $s1_1 $s1_2 $s2 $s2_0 $s3 $s4 $s5 $s7)
+
+ufw allow 51820
+
+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/servers/kingkong/firewall b/servers/kingkong/firewall
new file mode 100644 (file)
index 0000000..0d24a0e
--- /dev/null
+++ b/servers/kingkong/firewall
@@ -0,0 +1,92 @@
+#!/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`
+i3=`dig +short cocodrilo.enhydra.fr | tail -1`
+
+local=($l0 $l1 $l2 $l3 $i0 $i1 $i2 $i3)
+
+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 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 elephantman.cubedesigners.com | tail -1`
+s6=`dig +short fastandfurious.cubedesigners.com | tail -1`
+s7=`dig +short amadeus.cubedesigners.com | tail -1`
+
+auth=($s0 $s0_0 $s1 $s1_0 $s1_1 $s1_2 $s2 $s2_0 $s3 $s5 $s6 $s7)
+
+ufw allow 80
+ufw allow 443
+
+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/servers/update.bat b/servers/update.bat
new file mode 100644 (file)
index 0000000..ada0968
--- /dev/null
+++ b/servers/update.bat
@@ -0,0 +1,29 @@
+@echo off
+cd /D D:\Works\FluidbookToolbox\resources
+scp -P 58745 -r toolbox@toolbox.fluidbook.com:/application/resources/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;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'
+
+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;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;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'
+
+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;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;rm -f /usr/local/bin/firewall;/usr/local/bin/fw'
+
+scp -P 22 ./amadeus/firewall root@amadeus.cubedesigners.com:/usr/local/bin/fw
+ssh -p 22 root@amadeus.cubedesigners.com 'chmod 755 /usr/local/bin/fw;rm -f /usr/local/bin/firewall;/usr/local/bin/fw'
+