From 8951f0dd8cb0442f598ea9e223df485218135355 Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Thu, 30 Jan 2025 11:32:40 +0100 Subject: [PATCH] wait #7292 @1 --- .docker/docker-compose.yml | 9 +++++++-- bin/mount.sh | 34 +++++++++++++++++----------------- 2 files changed, 24 insertions(+), 19 deletions(-) diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml index d1b6ed5d0..f4a7b4b5c 100644 --- a/.docker/docker-compose.yml +++ b/.docker/docker-compose.yml @@ -17,15 +17,19 @@ services: - '/home/extranet/share/:/application/share/' - '/data/toolbox/storage/:/application/storage/' - '/data/extranet/ftp/:/application/ftp/' -# - '/data/extranet/www/fluidbook/books/working/:/application/protected/fluidbookpublication/working/' + # - '/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/' - '/data/toolbox/protected/fluidbookpublication/cache/:/application/protected/fluidbookpublication/cache/' + - '/data/fluidbook/pdfcache/:/application/protected/fluidbookpublication/cache/pdffiles/' - '/data/toolbox/protected/fluidbookpublication/pdf/:/application/protected/fluidbookpublication/pdf/' - '/data/toolbox/protected/fluidbookpublication/final/:/application/protected/fluidbookpublication/final/' - '/data/toolbox/protected/fluidbookpublication/packager/:/application/protected/fluidbookpublication/packager/' - '/data/toolbox/protected/fluidbookpublication/seo/:/application/protected/fluidbookpublication/seo/' - '/data/toolbox/protected/fluidbookcollection/:/application/protected/fluidbookcollection/' + # Local mounts + - "/data/fluidbook/docs/:/application/protected/fluidbookpublication/docs/" + - "/data/fluidbook/assets/:/application/protected/fluidbookpublication/working/" # Startup - '/home/toolbox/www/bin/startup.sh:/usr/bin/startup.sh' # SSH @@ -89,9 +93,10 @@ services: - '/home/extranet/share/:/application/share/' - '/data/toolbox/storage/:/application/storage/' - '/data/extranet/ftp/:/application/ftp/' -# - '/data/extranet/www/fluidbook/books/working/:/application/protected/fluidbookpublication/working/' + # - '/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/' + - '/data/fluidbook/pdfcache/:/application/protected/fluidbookpublication/cache/pdffiles/' - '/data/toolbox/protected/fluidbookpublication/cache/:/application/protected/fluidbookpublication/cache/' - '/data/toolbox/protected/fluidbookpublication/pdf/:/application/protected/fluidbookpublication/pdf/' - '/data/toolbox/protected/fluidbookpublication/final/:/application/protected/fluidbookpublication/final/' diff --git a/bin/mount.sh b/bin/mount.sh index 91ae3d5c7..72b40958a 100644 --- a/bin/mount.sh +++ b/bin/mount.sh @@ -26,23 +26,23 @@ else sshfs -o reconnect,ServerAliveInterval=15,ServerAliveCountMax=3 -o cache=no -o uid=1001 -o gid=33 -o allow_other fluidbook@kingkong.cubedesigners.com:/home/fluidbook/data /application/usstorage fi -mkdir -p /application/protected/fluidbookpublication/docs -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 -p 7552 fluidbook@docs.toolbox.fluidbook.com:/data /application/protected/fluidbookpublication/docs -fi - -mkdir -p /application/protected/fluidbookpublication/working -if mountpoint -q "/application/protected/fluidbookpublication/working"; then - : -else - echo "mount /application/protected/fluidbookpublication/working" - umount -l -q /application/protected/fluidbookpublication/working - sshfs -o reconnect,ServerAliveInterval=15,ServerAliveCountMax=3 -o cache=no -o uid=1001 -o gid=33 -o allow_other -p 7553 fluidbook@assets.toolbox.fluidbook.com:/data /application/protected/fluidbookpublication/working -fi +#mkdir -p /application/protected/fluidbookpublication/docs +#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 -p 7552 fluidbook@docs.toolbox.fluidbook.com:/data /application/protected/fluidbookpublication/docs +#fi +# +#mkdir -p /application/protected/fluidbookpublication/working +#if mountpoint -q "/application/protected/fluidbookpublication/working"; then +# : +#else +# echo "mount /application/protected/fluidbookpublication/working" +# umount -l -q /application/protected/fluidbookpublication/working +# sshfs -o reconnect,ServerAliveInterval=15,ServerAliveCountMax=3 -o cache=no -o uid=1001 -o gid=33 -o allow_other -p 7553 fluidbook@assets.toolbox.fluidbook.com:/data /application/protected/fluidbookpublication/working +#fi mkdir -p /mnt/sign if mountpoint -q "/mnt/sign"; then -- 2.39.5