From 9833fff17f2ed37aad8a224c2465afc91a876110 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 28 Jan 2022 09:51:00 +0100 Subject: [PATCH 1/7] Update upgrade --- scripts/upgrade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index eb0ef0a..d005c38 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -123,9 +123,9 @@ ynh_script_progression --message="Install BookStack" --weight=5 pushd $final_path php$phpversion artisan migrate --no-interaction - #php$phpversion artisan cache:clear --no-interaction + php$phpversion artisan cache:clear --no-interaction php$phpversion artisan config:clear --no-interaction - #php$phpversion artisan view:clear --no-interaction + php$phpversion artisan view:clear --no-interaction popd chmod 755 $final_path From de9a1f8354d812c63493f36aba78e09c45816ead Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 28 Jan 2022 10:06:20 +0100 Subject: [PATCH 2/7] Update upgrade --- scripts/upgrade | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index d005c38..e161583 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -123,15 +123,15 @@ ynh_script_progression --message="Install BookStack" --weight=5 pushd $final_path php$phpversion artisan migrate --no-interaction - php$phpversion artisan cache:clear --no-interaction - php$phpversion artisan config:clear --no-interaction - php$phpversion artisan view:clear --no-interaction + #php$phpversion artisan cache:clear --no-interaction + #php$phpversion artisan config:clear --no-interaction + #php$phpversion artisan view:clear --no-interaction popd chmod 755 $final_path chmod -R o-rwx $final_path chown -R $app:www-data $final_path -chmod 600 $final_path/.env +#chmod 600 $final_path/.env #================================================= # RELOAD NGINX From d6b123a37a21280b8b488d340273cc26d32c78f0 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 28 Jan 2022 10:06:32 +0100 Subject: [PATCH 3/7] Update upgrade --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index e161583..d8a094c 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -122,7 +122,7 @@ ynh_install_composer --install_args="--no-dev" ynh_script_progression --message="Install BookStack" --weight=5 pushd $final_path - php$phpversion artisan migrate --no-interaction + php$phpversion artisan migrate #--no-interaction #php$phpversion artisan cache:clear --no-interaction #php$phpversion artisan config:clear --no-interaction #php$phpversion artisan view:clear --no-interaction From 54d34424a692a93339602090b0b4ad8dcc5de775 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 28 Jan 2022 10:11:06 +0100 Subject: [PATCH 4/7] Update upgrade --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index d8a094c..30a30c5 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -122,7 +122,7 @@ ynh_install_composer --install_args="--no-dev" ynh_script_progression --message="Install BookStack" --weight=5 pushd $final_path - php$phpversion artisan migrate #--no-interaction + php$phpversion artisan migrate --force #--no-interaction #php$phpversion artisan cache:clear --no-interaction #php$phpversion artisan config:clear --no-interaction #php$phpversion artisan view:clear --no-interaction From f2f02969c258b2ebf26d3671f3fa7a0e7d2b6609 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 28 Jan 2022 10:17:03 +0100 Subject: [PATCH 5/7] Update upgrade --- scripts/upgrade | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 30a30c5..00fd4ea 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -122,7 +122,8 @@ ynh_install_composer --install_args="--no-dev" ynh_script_progression --message="Install BookStack" --weight=5 pushd $final_path - php$phpversion artisan migrate --force #--no-interaction + php$phpversion artisan migrate --force + php$phpversion artisan key:generate --force #--no-interaction #php$phpversion artisan cache:clear --no-interaction #php$phpversion artisan config:clear --no-interaction #php$phpversion artisan view:clear --no-interaction From 7e671c6ebaef453a6a4a61ad8bfc2815a3b0e1cb Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 28 Jan 2022 10:41:22 +0100 Subject: [PATCH 6/7] Update .env.example --- conf/.env.example | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/conf/.env.example b/conf/.env.example index b7c1110..938defe 100644 --- a/conf/.env.example +++ b/conf/.env.example @@ -6,6 +6,11 @@ # NOTE: If any of your values contain a space or a hash you will need to # wrap the entire value in quotes. (eg. MAIL_FROM_NAME="BookStack Mailer") +# Enable debug mode +# Shows advanced debug information and errors. +# CAN EXPOSE OTHER VARIABLES, LEAVE DISABLED +APP_DEBUG=false + # Application key APP_KEY=SomeRandomString @@ -67,3 +72,7 @@ SESSION_DRIVER=redis # Example of using a single local Redis server REDIS_SERVERS=127.0.0.1:6379:__REDIS_DB__ + +# Storage system to use +# Can be 'local', 'local_secure' or 's3' +STORAGE_TYPE=local From 35e99dc4453a2529ce5409a65017a773a1845347 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 28 Jan 2022 10:42:45 +0100 Subject: [PATCH 7/7] Update upgrade --- scripts/upgrade | 28 +++++----------------------- 1 file changed, 5 insertions(+), 23 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 00fd4ea..125665e 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -63,26 +63,8 @@ if [ "$upgrade_type" == "UPGRADE_APP" ] then ynh_script_progression --message="Upgrading source files..." --weight=1 - # Create a temporary directory - tmpdir="$(mktemp -d)" - - #cp -a "$final_path/.env " "$tmpdir/.env " - [[ -f "$final_path/public/uploads" ]] && cp -a "$final_path/public/uploads" "$tmpdir/public/uploads/" - [[ -f "$final_path/storage/uploads" ]] && cp -a "$final_path/storage/uploads" "$tmpdir/storage/uploads/" - # Remove the app directory securely - - ynh_secure_remove --file=$final_path # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$final_path" - - #cp -a "$tmpdir/.env " "$final_path/.env " - [[ -f "$tmpdir/public/uploads" ]] && cp -a "$tmpdir/public/uploads/" "$final_path/public/uploads" - [[ -f "$tmpdir/storage/uploads" ]] && cp -a "$tmpdir/storage/uploads/" "$final_path/storage/uploads" - - # Remove the tmp directory securely - ynh_secure_remove --file="$tmpdir" - - ynh_add_config --template=../conf/.env.example --destination=$final_path/.env + ynh_setup_source --dest_dir="$final_path" --keep="$final_path/.env $final_path/public/uploads $final_path/storage/uploads" fi #================================================= @@ -123,10 +105,10 @@ ynh_script_progression --message="Install BookStack" --weight=5 pushd $final_path php$phpversion artisan migrate --force - php$phpversion artisan key:generate --force #--no-interaction - #php$phpversion artisan cache:clear --no-interaction - #php$phpversion artisan config:clear --no-interaction - #php$phpversion artisan view:clear --no-interaction + php$phpversion artisan key:generate --force + php$phpversion artisan cache:clear + php$phpversion artisan config:clear + php$phpversion artisan view:clear popd chmod 755 $final_path