From 7759d52c2503e0357cc2a042f3441fb465e8120a Mon Sep 17 00:00:00 2001 From: TheSpad Date: Fri, 24 Nov 2023 13:54:02 +0000 Subject: [PATCH 1/2] Symlink all logs to avoid defer error on new install --- root/etc/s6-overlay/s6-rc.d/init-bookstack-config/run | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/root/etc/s6-overlay/s6-rc.d/init-bookstack-config/run b/root/etc/s6-overlay/s6-rc.d/init-bookstack-config/run index 6c1b78d..703e042 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-bookstack-config/run +++ b/root/etc/s6-overlay/s6-rc.d/init-bookstack-config/run @@ -3,7 +3,7 @@ # create directory structure mkdir -p \ - /config/www/{uploads,files,images,themes,backups} + /config/www/{uploads,files,images,themes,backups,logs} # check for .env and copy default if needed if [[ ! -f "/config/www/.env" ]] || [[ ! -s "/config/www/.env" ]]; then @@ -14,11 +14,11 @@ fi symlinks=( /app/www/themes /app/www/storage/backups + /app/www/storage/logs /app/www/storage/uploads/files /app/www/storage/uploads/images /app/www/public/uploads /app/www/.env - /app/www/storage/logs/laravel.log ) for i in "${symlinks[@]}"; do From 78d685a31f47de8708c037d76c89e4cf7856c734 Mon Sep 17 00:00:00 2001 From: TheSpad Date: Fri, 24 Nov 2023 14:11:04 +0000 Subject: [PATCH 2/2] Symlink logs and backups outside of www --- .../s6-rc.d/init-bookstack-config/run | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/root/etc/s6-overlay/s6-rc.d/init-bookstack-config/run b/root/etc/s6-overlay/s6-rc.d/init-bookstack-config/run index 703e042..39aa3bf 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-bookstack-config/run +++ b/root/etc/s6-overlay/s6-rc.d/init-bookstack-config/run @@ -3,7 +3,9 @@ # create directory structure mkdir -p \ - /config/www/{uploads,files,images,themes,backups,logs} + /config/www/{uploads,files,images,themes} \ + /config/backups \ + /config/log/bookstack # check for .env and copy default if needed if [[ ! -f "/config/www/.env" ]] || [[ ! -s "/config/www/.env" ]]; then @@ -13,8 +15,6 @@ fi # create symlinks symlinks=( /app/www/themes - /app/www/storage/backups - /app/www/storage/logs /app/www/storage/uploads/files /app/www/storage/uploads/images /app/www/public/uploads @@ -30,6 +30,20 @@ for i in "${symlinks[@]}"; do fi done +if [[ -e "/app/www/storage/backups" && ! -L "/app/www/storage/backups" ]]; then + rm -rf "/app/www/storage/backups" +fi +if [[ ! -L "/app/www/storage/backups" ]]; then + ln -s "/config/backups" "/app/www/storage/backups" +fi + +if [[ -e "/app/www/storage/logs" && ! -L "/app/www/storage/logs" ]]; then + rm -rf "/app/www/storage/logs" +fi +if [[ ! -L "/app/www/storage/logs" ]]; then + ln -s "/config/log/bookstack" "/app/www/storage/logs" +fi + # Echo init finish for test runs if [ -n "${TEST_RUN}" ]; then echo '[ls.io-init] done.'