wait #6021 @0.5

diff --git a/.docker/config/ssh/server/ssh_host_dsa_key b/.docker/config/ssh/server/ssh_host_dsa_key
index b814cc0f9ccdc43c0991c1a4df38addd4e433f93..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/.docker/config/ssh/server/ssh_host_dsa_key
+++ b/.docker/config/ssh/server/ssh_host_dsa_key
@@ -1,21 +0,0 @@
------BEGIN OPENSSH PRIVATE KEY-----
-b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAABsQAAAAdzc2gtZH
-NzAAAAgQCnADFd+E6phChygVvaA/I9D6jItqJzG2A/hEwE4cOciXxNC/+wJ/IqW4T7pOH2
-YpINLLqPMCqVNLj7744GeeNStwRjoMfd8f6zYoGBpimYc1WS3yi/QA1CH5o9qBDjgKV4/4
-zfqjvOwpEj7HZj3hNo1nvCfYrfAuVUVpOqt/Lo0wAAABUA7NkJP07kis6ZZ21WqVzFxam7
-cP8AAACAfp8vDPYcvhzECMtc66fIIEW82A3Hf5Ptoq8llPdX4NAlO+tWUg9zx+MqmuhGfP
-u+KsI7bY8HRIFqvR+HHABZLS6S3kOU6/o78XXgoUXBJW7mAzQvrxPwEiOty8ZOcSl30GGs
-pPKcj9IuRUqWKfTzEJ8q2Yjgz57LtMD0f8QtL+wAAACAdKlWQT2cBqD0hdF0ZnCCFzwlhm
-ZFJdkW0/GSci7IOVUH6ov4++NNzTlInsncd7Ft0dK+fFHiAFTYXz0DBpDafX7dp85PHhOT
-gCGYpym+aMzj5vTug49aROpRvWb1cDVwJQuc0u43FT8F2o+szWjpB4HwqQ1gs7LqyPOIei
-lqWaAAAAHoOhqY1DoamNQAAAAHc3NoLWRzcwAAAIEApwAxXfhOqYQocoFb2gPyPQ+oyLai
-cxtgP4RMBOHDnIl8TQv/sCfyKluE+6Th9mKSDSy6jzAqlTS4+++OBnnjUrcEY6DH3fH+s2
-KBgaYpmHNVkt8ov0ANQh+aPagQ44CleP+M36o7zsKRI+x2Y94TaNZ7wn2K3wLlVFaTqrfy
-6NMAAAAVAOzZCT9O5IrOmWdtVqlcxcWpu3D/AAAAgH6fLwz2HL4cxAjLXOunyCBFvNgNx3
-+T7aKvJZT3V+DQJTvrVlIPc8fjKproRnz7virCO22PB0SBar0fhxwAWS0ukt5DlOv6O/F1
-4KFFwSVu5gM0L68T8BIjrcvGTnEpd9BhrKTynI/SLkVKlin08xCfKtmI4M+ey7TA9H/ELS
-/sAAAAgHSpVkE9nAag9IXRdGZwghc8JYZmRSXZFtPxknIuyDlVB+qL+PvjTc05SJ7J3Hex
-bdHSvnxR4gBU2F89AwaQ2n1+3afOTx4Tk4AhmKcpvmjM4+b07oOPWkTqUb1m9XA1cCULnN
-LuNxU/BdqPrM1o6QeB8KkNYLOy6sjziHopalmgAAAAFQDRrqQqUf/GssrI/cGr4/M699Bo
-hgAAAA1yb290QGV4dHJhbmV0AQIDBAU=
------END OPENSSH PRIVATE KEY-----

diff --git a/.docker/config/ssh/server/ssh_host_ecdsa_key b/.docker/config/ssh/server/ssh_host_ecdsa_key
index fa2d15e4df764a3fd5f2e9cccd438528a4004b96..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/.docker/config/ssh/server/ssh_host_ecdsa_key
+++ b/.docker/config/ssh/server/ssh_host_ecdsa_key
@@ -1,9 +0,0 @@
------BEGIN OPENSSH PRIVATE KEY-----
-b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAaAAAABNlY2RzYS
-1zaGEyLW5pc3RwMjU2AAAACG5pc3RwMjU2AAAAQQRzsJmlJjWrmyn9xLQj2y7TdqX1cS2x
-WHusCEO1c/CjUn+gK/fLPicmVF1RsuqJ+hqFGxOKqHHSTKtzgZBMk4j0AAAAsB3y+3Qd8v
-t0AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBHOwmaUmNaubKf3E
-tCPbLtN2pfVxLbFYe6wIQ7Vz8KNSf6Ar98s+JyZUXVGy6on6GoUbE4qocdJMq3OBkEyTiP
-QAAAAgTVhrbxB1wGmOhpY/SKh/21zI+682tVUj1kAP7MUwMeAAAAAWcm9vdEBmbHVpZGJv
-b2stdG9vbGJveAEC
------END OPENSSH PRIVATE KEY-----

diff --git a/.docker/config/ssh/server/ssh_host_ed25519_key b/.docker/config/ssh/server/ssh_host_ed25519_key
index 252a296a3a867b1eac6b91adfe291ddc13896ccc..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/.docker/config/ssh/server/ssh_host_ed25519_key
+++ b/.docker/config/ssh/server/ssh_host_ed25519_key
@@ -1,7 +0,0 @@
------BEGIN OPENSSH PRIVATE KEY-----
-b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW
-QyNTUxOQAAACBh5gRbUVdUBUrFjacwO0gclTe8ftAXHlR+icwrqQsoRQAAAKDsSyo97Esq
-PQAAAAtzc2gtZWQyNTUxOQAAACBh5gRbUVdUBUrFjacwO0gclTe8ftAXHlR+icwrqQsoRQ
-AAAEDb28yvjXwNNePQG/X5VGZRtXDpigdVUbJR8tEfMEVmn2HmBFtRV1QFSsWNpzA7SByV
-N7x+0BceVH6JzCupCyhFAAAAFnJvb3RAZmx1aWRib29rLXRvb2xib3gBAgMEBQYH
------END OPENSSH PRIVATE KEY-----

diff --git a/.docker/config/ssh/server/ssh_host_rsa_key b/.docker/config/ssh/server/ssh_host_rsa_key
index 21a19ffd287aa87da1cba68bb85e44a9ebaf3eac..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/.docker/config/ssh/server/ssh_host_rsa_key
+++ b/.docker/config/ssh/server/ssh_host_rsa_key
@@ -1,38 +0,0 @@
------BEGIN OPENSSH PRIVATE KEY-----
-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
------END OPENSSH PRIVATE KEY-----

diff --git a/.docker/config/ssh/user/known_hosts b/.docker/config/ssh/user/known_hosts
index 4898ec98f3e10aed91e334de02b48ea71db11872..c3a6e2ba7b75484f0068b41af455acc7a953f0a7 100644 (file)
--- a/.docker/config/ssh/user/known_hosts
+++ b/.docker/config/ssh/user/known_hosts
@@ -55,3 +55,6 @@
 |1|JzPIYF8QCrSBS4t2fVId5Ym7Kyg=|0K3icsRiZpexNkPIchHkADj+UJE= ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEKmRybFZ/yMrtKp92N7MpKSByOo4TNm1yFa96mvH4ktgxG9Iw5LdRBELGknXZO0hRkysrblSsQ6Opu/8ZOdPuo=
 |1|6wykuWMhStQ5Tv99aBiqb6H+zyY=|cl+8o5TNKooA36tWnHoIAOIvV4k= ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEGI/UefTFGQMkNX5fjbcI6ZIwDbOvWi0Pu2NAdrnqMI7OEHbFZ2PZdyOFkOvg+r6L989kt9xX7UDC4hb7YbFXI=
 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=

diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml
index e1edce81acac8b617de5864428082337c92be696..7b376532ece359700c1d9fd3d6f45aba463d941c 100644 (file)
--- a/.docker/docker-compose.yml
+++ b/.docker/docker-compose.yml
@@ -69,6 +69,7 @@ services:
     networks:
       - fluidbook-toolbox
       - fluidbook-processfarm
+    privileged: true
     restart: unless-stopped
 
   webserver:

diff --git a/app/Models/FluidbookExternalInstallServer.php b/app/Models/FluidbookExternalInstallServer.php
index 953ed1d47f8871116bea0e94fded66536ccfbf43..55d8e01765c6b77fcf3030d8b3989dfd041a1471 100644 (file)
--- a/app/Models/FluidbookExternalInstallServer.php
+++ b/app/Models/FluidbookExternalInstallServer.php
@@ -44,7 +44,7 @@ class FluidbookExternalInstallServer extends ExternalServer
             return $res;
         }
         if ($this->getProtocol() === 'hosting') {
-            return new Local($this, '/mnt/sshfs/fluidbook/data/fluidbook/hosting/');
+            return new Local($this, '/mnt/hosting/');
         }
     }
 

diff --git a/bin/startup.sh b/bin/startup.sh
index 53d06dd23949b9b6a42d878abd1fa6aa39c31ed9..41f0f0f5bff3680a657eb8a0d9f1a2967ed3a59f 100644 (file)
--- a/bin/startup.sh
+++ b/bin/startup.sh
@@ -37,6 +37,14 @@ chpasswd < /root/passwords
 chmod -R 700 /etc/monit;chown -R root:root /etc/monit;/usr/bin/monit
 chown -R root:root /etc/monit && /usr/bin/monit
 
+# Mounts
+mkdir -p /mnt/hosting
+if mountpoint -q "/mnt/hosting"; then
+    :
+else
+    sshfs -o reconnect,ServerAliveInterval=15,ServerAliveCountMax=3 -o uid=1002 -o gid=33 -o allow_other fluidbook@clockwork.cubedesigners.com:/data/fluidbook/hosting /mnt/hosting
+fi
+
 # Launch PHP
 /usr/sbin/php-fpm8.2 -O