From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Fri, 15 Dec 2023 08:14:09 +0000 (+0100)
Subject: wip #6549 @0.5
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=765e8b31682ab29d2c351b86814bdcc96fcc0292;p=fluidbook-toolbox.git

wip #6549 @0.5
---

diff --git a/.docker/alpha/docker-compose.yml b/.docker/alpha/docker-compose.yml
index f657369fe..ca97e7515 100644
--- a/.docker/alpha/docker-compose.yml
+++ b/.docker/alpha/docker-compose.yml
@@ -18,7 +18,6 @@ services:
       - '/home/extranet/share/:/application/share/'
       - '/data/toolbox/alpha/storage/:/application/storage/'
       - '/data/extranet/ftp/:/application/ftp/'
-      - '/mnt/sshfs/godzilla/data/fluidbook/docs/:/application/protected/fluidbookpublication/docs/'
       - '/data/extranet/www/fluidbook/books/working/:/application/protected/fluidbookpublication/working/'
       - '/data/extranet/www/fluidbook/books/links/:/application/protected/fluidbookpublication/links/'
       - '/home/extranet/www/fluidbook/cache/unzip/:/application/storage/fluidbook/cache/unzip/'
@@ -87,7 +86,6 @@ services:
       - '/home/extranet/share/:/application/share/'
       - '/data/toolbox/alpha/storage/:/application/storage/'
       - '/data/extranet/ftp/:/application/ftp/'
-      - '/mnt/sshfs/godzilla/data/fluidbook/docs/:/application/protected/fluidbookpublication/docs/'
       - '/data/extranet/www/fluidbook/books/working/:/application/protected/fluidbookpublication/working/'
       - '/data/extranet/www/fluidbook/books/links/:/application/protected/fluidbookpublication/links/'
       - '/home/extranet/www/fluidbook/cache/unzip/:/application/storage/fluidbook/cache/unzip/'
@@ -97,6 +95,7 @@ services:
       - '/data/toolbox/alpha/.docker/config/httpd/httpd-alpha.conf:/usr/local/apache2/conf/httpd.conf'
       # External volume
       - 'sshfsusstorage:/application/usstorage:ro'
+      - 'docs:/application/protected/fluidbookpublication/docs:ro'
     environment:
       VIRTUAL_HOST: alpha.toolbox.fluidbook.com
       LETSENCRYPT_HOST: alpha.toolbox.fluidbook.com
@@ -174,3 +173,10 @@ volumes:
       sshcmd: "fluidbook@kingkong.cubedesigners.com:/home/fluidbook/data"
       allow_other: ""
       password: "Qu2E9uq48bBzsqGiZA"
+
+  docs:
+    driver: ucphhpc/sshfs:latest
+    driver_opts:
+      sshcmd: "fluidbook@dracula.cubedesigners.com:/data/fluidbook/docs"
+      allow_other: ""
+      password: "Qu2E9uq48bBzsqGiZA"
diff --git a/.docker/dev/docker-compose.yml b/.docker/dev/docker-compose.yml
index 324900207..f2fc02e5e 100644
--- a/.docker/dev/docker-compose.yml
+++ b/.docker/dev/docker-compose.yml
@@ -18,7 +18,6 @@ services:
       - '/home/extranet/share/:/application/share/'
       - '/data/toolbox/dev/storage/:/application/storage/'
       - '/data/extranet/ftp/:/application/ftp/'
-      - '/mnt/sshfs/godzilla/data/fluidbook/docs/:/application/protected/fluidbookpublication/docs/'
       - '/data/extranet/www/fluidbook/books/working/:/application/protected/fluidbookpublication/working/'
       - '/data/extranet/www/fluidbook/books/links/:/application/protected/fluidbookpublication/links/'
       - '/home/extranet/www/fluidbook/cache/unzip/:/application/storage/fluidbook/cache/unzip/'
@@ -87,7 +86,6 @@ services:
       - '/home/extranet/share/:/application/share/'
       - '/data/toolbox/dev/storage/:/application/storage/'
       - '/data/extranet/ftp/:/application/ftp/'
-      - '/mnt/sshfs/godzilla/data/fluidbook/docs/:/application/protected/fluidbookpublication/docs/'
       - '/data/extranet/www/fluidbook/books/working/:/application/protected/fluidbookpublication/working/'
       - '/data/extranet/www/fluidbook/books/links/:/application/protected/fluidbookpublication/links/'
       - '/home/extranet/www/fluidbook/cache/unzip/:/application/storage/fluidbook/cache/unzip/'
@@ -97,6 +95,7 @@ services:
       - '/home/toolbox/dev/.docker/config/httpd/httpd-dev.conf:/usr/local/apache2/conf/httpd.conf'
       # External volume
       - 'sshfsusstorage:/application/usstorage:ro'
+      - 'docs:/application/protected/fluidbookpublication/docs:ro'
     ports:
       - '37127:80'
     environment:
@@ -180,3 +179,10 @@ volumes:
       sshcmd: "fluidbook@kingkong.cubedesigners.com:/home/fluidbook/data"
       allow_other: ""
       password: "Qu2E9uq48bBzsqGiZA"
+
+  docs:
+    driver: ucphhpc/sshfs:latest
+    driver_opts:
+      sshcmd: "fluidbook@dracula.cubedesigners.com:/data/fluidbook/docs"
+      allow_other: ""
+      password: "Qu2E9uq48bBzsqGiZA"
diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml
index 4b5626753..3eceb6883 100644
--- a/.docker/docker-compose.yml
+++ b/.docker/docker-compose.yml
@@ -18,7 +18,6 @@ services:
       - '/home/extranet/share/:/application/share/'
       - '/data/toolbox/storage/:/application/storage/'
       - '/data/extranet/ftp/:/application/ftp/'
-      - '/mnt/sshfs/godzilla/data/fluidbook/docs/:/application/protected/fluidbookpublication/docs/'
       - '/data/extranet/www/fluidbook/books/working/:/application/protected/fluidbookpublication/working/'
       - '/data/extranet/www/fluidbook/books/links/:/application/protected/fluidbookpublication/links/'
       - '/home/extranet/www/fluidbook/cache/unzip/:/application/storage/fluidbook/cache/unzip/'
@@ -88,7 +87,6 @@ services:
       - '/home/extranet/share/:/application/share/'
       - '/data/toolbox/storage/:/application/storage/'
       - '/data/extranet/ftp/:/application/ftp/'
-      - '/mnt/sshfs/godzilla/data/fluidbook/docs/:/application/protected/fluidbookpublication/docs/'
       - '/data/extranet/www/fluidbook/books/working/:/application/protected/fluidbookpublication/working/'
       - '/data/extranet/www/fluidbook/books/links/:/application/protected/fluidbookpublication/links/'
       - '/home/extranet/www/fluidbook/cache/unzip/:/application/storage/fluidbook/cache/unzip/'
@@ -98,6 +96,7 @@ services:
       - '/home/toolbox/www/.docker/config/httpd/httpd.conf:/usr/local/apache2/conf/httpd.conf'
       # External volume
       - 'sshfsusstorage:/application/usstorage:ro'
+      - 'docs:/application/protected/fluidbookpublication/docs:ro'
     ports:
       - '37126:80'
     environment:
@@ -181,3 +180,10 @@ volumes:
       sshcmd: "fluidbook@kingkong.cubedesigners.com:/home/fluidbook/data"
       allow_other: ""
       password: "Qu2E9uq48bBzsqGiZA"
+
+  docs:
+    driver: ucphhpc/sshfs:latest
+    driver_opts:
+      sshcmd: "fluidbook@dracula.cubedesigners.com:/data/fluidbook/docs"
+      allow_other: ""
+      password: "Qu2E9uq48bBzsqGiZA"
diff --git a/.docker/update.sh b/.docker/update.sh
index 555f7facc..87d084c36 100644
--- a/.docker/update.sh
+++ b/.docker/update.sh
@@ -6,6 +6,7 @@ chown root:root /home/toolbox/www/.docker/config/cron/host;ln -sf /home/toolbox/
 docker network create fluidbook-toolbox
 docker compose down
 docker volume rm fluidbook-toolbox_sshfsusstorage
+docker volume rm fluidbook-toolbox_docs
 docker compose up -d
 /home/toolbox/www/scripts/fixrights.sh
 docker exec -it fluidbook-toolbox /application/scripts/update.sh
diff --git a/bin/startup.sh b/bin/startup.sh
index c2f062f07..68f910215 100644
--- a/bin/startup.sh
+++ b/bin/startup.sh
@@ -65,8 +65,8 @@ mkdir -p /application/protected/fluidbookpublication/docs
 if mountpoint -q "/application/protected/fluidbookpublication/docs"; then
     :
 else
-    sshfs -o reconnect,ServerAliveInterval=15,ServerAliveCountMax=3 -o cache=no -o sshfs_sync -o uid=1002 -o gid=33 -o allow_other root@godzilla.cubedesigners.com:/data/fluidbook/docs /application/protected/fluidbookpublication/docs
-    #sshfs -o reconnect,ServerAliveInterval=15,ServerAliveCountMax=3 -o cache=no -o sshfs_sync -o uid=1002 -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 sshfs_sync -o uid=1002 -o gid=33 -o allow_other root@godzilla.cubedesigners.com:/data/fluidbook/docs /application/protected/fluidbookpublication/docs
+    sshfs -o reconnect,ServerAliveInterval=15,ServerAliveCountMax=3 -o cache=no -o sshfs_sync -o uid=1002 -o gid=33 -o allow_other root@dracula.cubedesigners.com:/data/fluidbook/docs /application/protected/fluidbookpublication/docs
 fi
 
 # Launch PHP