From 8c9b855b9d9c0f6a7f8709b8fd206117bf3e682a Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 5 Apr 2021 22:28:47 +0200 Subject: [PATCH 01/16] Update nginx.conf --- conf/nginx.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index d2aad6d..67ac08b 100755 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,4 +1,4 @@ -location / { +location __PATH__/ { # Force usage of https if ($scheme = http) { @@ -27,7 +27,7 @@ location / { more_clear_input_headers 'Accept-Encoding'; } -location /ws/ { +location __PATH__/ws/ { proxy_pass http://127.0.0.1:__PORT__/; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; From 9121cf2a9ddd0d582d19edd9707434bd71cd285a Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 5 Apr 2021 22:30:33 +0200 Subject: [PATCH 02/16] fix --- sources/extra_files/app/.gitignore | 2 -- sources/patches/.gitignore | 2 -- 2 files changed, 4 deletions(-) delete mode 100755 sources/extra_files/app/.gitignore delete mode 100755 sources/patches/.gitignore diff --git a/sources/extra_files/app/.gitignore b/sources/extra_files/app/.gitignore deleted file mode 100755 index 783a4ae..0000000 --- a/sources/extra_files/app/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -*~ -*.sw[op] diff --git a/sources/patches/.gitignore b/sources/patches/.gitignore deleted file mode 100755 index 783a4ae..0000000 --- a/sources/patches/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -*~ -*.sw[op] From 4bc706f8d0a063e79a98e400a72b7994b438d8d1 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 5 Apr 2021 23:05:06 +0200 Subject: [PATCH 03/16] Fix --- conf/config.json | 2 +- conf/nginx.conf | 4 ++++ scripts/install | 19 +++++++++++++++---- scripts/restore | 6 ++++-- scripts/upgrade | 11 +++++++---- 5 files changed, 31 insertions(+), 11 deletions(-) diff --git a/conf/config.json b/conf/config.json index 598421d..68b2272 100644 --- a/conf/config.json +++ b/conf/config.json @@ -5,7 +5,7 @@ "dbconfig": "postgres://__DB_NAME__:__DB_PWD__@localhost/__DB_NAME__?sslmode=disable&connect_timeout=10", "useSSL": false, "webpath": "./pack", - "filespath": "./files", + "filespath": "/home/yunohost.app/__APP__/files", "telemetry": false, "session_expire_time": 2592000, "session_refresh_time": 18000, diff --git a/conf/nginx.conf b/conf/nginx.conf index 67ac08b..7af9fdd 100755 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,3 +1,4 @@ +#sub_path_only rewrite ^__PATH__$ __PATH__/ permanent; location __PATH__/ { # Force usage of https @@ -47,3 +48,6 @@ location __PATH__/ws/ { proxy_read_timeout 1d; } +location __PATH__/uploads/ { + alias __FILES_PATH__/uploads/ ; +} diff --git a/scripts/install b/scripts/install index a64e968..38c71ea 100755 --- a/scripts/install +++ b/scripts/install @@ -73,7 +73,7 @@ ynh_install_app_dependencies $pkg_dependencies ynh_script_progression --message="Configuring system user..." --weight=11 # Create a system user -ynh_system_user_create --username=$app +ynh_system_user_create --username=$app --home_dir="$final_path" #================================================= # CREATE A POSTGRESQL DATABASE @@ -94,13 +94,22 @@ ynh_app_setting_set --app=$app --key=final_path --value=$final_path # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$final_path" +#================================================= +# CREATE DIRECTORIES +#================================================= + +files_path=/home/yunohost.app/$app +ynh_app_setting_set --app=$app --key=files_path --value=$files_path + +mkdir -p $files_path/files + #================================================= # NGINX CONFIGURATION #================================================= ynh_script_progression --message="Configuring NGINX web server..." --weight=2 # Create a dedicated NGINX config -ynh_add_nginx_config +ynh_add_nginx_config "files_path" #================================================= # SETUP SYSTEMD @@ -124,7 +133,9 @@ ynh_add_config --template="../conf/config.json" --destination="$final_path/confi # Set permissions to app files chown -R $app:$app $final_path -chmod -R o-rwx "$final_path" +chown -R $app:$app $files_path +#chmod -R o-rwx $final_path +chmod -R 755 $files_path chmod 600 $final_path/config.json #================================================= @@ -140,7 +151,7 @@ yunohost service add $app --description="A short description of the app" --log=" ynh_script_progression --message="Starting a systemd service..." --weight=1 # Start a systemd service -ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" +ynh_systemd_action --service_name=$app --action=start --log_path="/var/log/$app/$app.log" #================================================= # SETUP SSOWAT diff --git a/scripts/restore b/scripts/restore index d01a311..a265fc6 100755 --- a/scripts/restore +++ b/scripts/restore @@ -66,7 +66,7 @@ ynh_restore_file --origin_path="$final_path" ynh_script_progression --message="Recreating the dedicated system user..." --weight=2 # Create the dedicated user (if not existing) -ynh_system_user_create --username=$app +ynh_system_user_create --username=$app --home_dir="$final_path" #================================================= # RESTORE USER RIGHTS @@ -74,7 +74,9 @@ ynh_system_user_create --username=$app # Restore permissions on app files chown -R $app:$app $final_path -chmod -R o-rwx "$final_path" +chown -R $app:$app $files_path +#chmod -R o-rwx $final_path +chmod -R 755 $files_path chmod 600 $final_path/config.json #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 7b2d89a..5fdf70e 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -20,6 +20,7 @@ domain=$(ynh_app_setting_get --app=$app --key=domain) path_url=$(ynh_app_setting_get --app=$app --key=path) final_path=$(ynh_app_setting_get --app=$app --key=final_path) db_name=$(ynh_app_setting_get --app=$app --key=db_name) +files_path=$(ynh_app_setting_get --app=$app --key=files_path) #================================================= # CHECK VERSION @@ -60,7 +61,7 @@ ynh_abort_if_errors #================================================= ynh_script_progression --message="Stopping a systemd service..." --weight=1 -ynh_systemd_action --service_name=$app --action="stop" --log_path="/var/log/$app/$app.log" +ynh_systemd_action --service_name=$app --action=stop --log_path="/var/log/$app/$app.log" #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE @@ -95,7 +96,7 @@ ynh_install_app_dependencies $pkg_dependencies ynh_script_progression --message="Making sure dedicated system user exists..." --weight=3 # Create a dedicated user (if not existing) -ynh_system_user_create --username=$app +ynh_system_user_create --username=$app --home_dir="$final_path" #================================================= # SETUP SYSTEMD @@ -119,7 +120,9 @@ ynh_add_config --template="some_config_file" --destination="$final_path/some_con # Set permissions on app files chown -R $app:$app $final_path -chmod -R o-rwx "$final_path" +chown -R $app:$app $files_path +#chmod -R o-rwx "$final_path" +chmod -R 755 $files_path chmod 600 $final_path/config.json #================================================= @@ -142,7 +145,7 @@ yunohost service add $app --description="A short description of the app" --log=" #================================================= ynh_script_progression --message="Starting a systemd service..." --weight=1 -ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" +ynh_systemd_action --service_name=$app --action=start --log_path="/var/log/$app/$app.log" #================================================= # RELOAD NGINX From 031d7a294941d983eece95e39359e1321469259a Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 5 Apr 2021 23:09:36 +0200 Subject: [PATCH 04/16] Fix linter --- check_process.default | 5 ----- scripts/upgrade | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/check_process.default b/check_process.default index 62e1f83..79961be 100755 --- a/check_process.default +++ b/check_process.default @@ -1,8 +1,3 @@ -# See here for more information -# https://github.com/YunoHost/package_check#syntax-check_process-file - -# Move this file from check_process.default to check_process when you have filled it. - ;; Test complet ; Manifest domain="domain.tld" (DOMAIN) diff --git a/scripts/upgrade b/scripts/upgrade index 5fdf70e..4c8b8bb 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -128,7 +128,7 @@ chmod 600 $final_path/config.json #================================================= # SETUP LOGROTATE #================================================= -ynh_script_progression --message="Upgrading logrotate configuration..." --time --weight=2 +ynh_script_progression --message="Upgrading logrotate configuration..." --weight=2 # Use logrotate to manage app-specific logfile(s) ynh_use_logrotate --non-append From 2dd8444a65492dc764d866a664bd596f2f06a268 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 5 Apr 2021 23:10:27 +0200 Subject: [PATCH 05/16] Fix --- check_process.default => check_process | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename check_process.default => check_process (100%) diff --git a/check_process.default b/check_process similarity index 100% rename from check_process.default rename to check_process From 15c0ee55b3030380aed22195bc50e40fde8202ae Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 5 Apr 2021 23:15:34 +0200 Subject: [PATCH 06/16] Silent postgres --- scripts/install | 2 +- scripts/restore | 2 +- scripts/upgrade | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/install b/scripts/install index 38c71ea..13004b5 100755 --- a/scripts/install +++ b/scripts/install @@ -65,7 +65,7 @@ ynh_app_setting_set --app=$app --key=port --value=$port #================================================= ynh_script_progression --message="Installing dependencies..." --weight=1 -ynh_install_app_dependencies $pkg_dependencies +ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies #================================================= # CREATE DEDICATED USER diff --git a/scripts/restore b/scripts/restore index a265fc6..ecc3ccb 100755 --- a/scripts/restore +++ b/scripts/restore @@ -87,7 +87,7 @@ chmod 600 $final_path/config.json ynh_script_progression --message="Reinstalling dependencies..." --weight=1 # Define and install dependencies -ynh_install_app_dependencies $pkg_dependencies +ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies #================================================= # RESTORE THE POSTGRESQL DATABASE diff --git a/scripts/upgrade b/scripts/upgrade index 4c8b8bb..24eaee0 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -88,7 +88,7 @@ ynh_add_nginx_config #================================================= ynh_script_progression --message="Upgrading dependencies..." --weight=2 -ynh_install_app_dependencies $pkg_dependencies +ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies #================================================= # CREATE DEDICATED USER From 44363bf46388444e7c3c9e9c2b8b2b8807026bd5 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 5 Apr 2021 23:28:59 +0200 Subject: [PATCH 07/16] Fix --- check_process | 5 ++--- manifest.json | 6 +++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/check_process b/check_process index 79961be..41ad334 100755 --- a/check_process +++ b/check_process @@ -11,9 +11,9 @@ setup_private=1 setup_public=1 upgrade=1 - upgrade=1 from_commit=CommitHash + #upgrade=1 from_commit=CommitHash backup_restore=1 - multi_instance=1 + multi_instance=0 change_url=1 ;;; Options Email= @@ -22,4 +22,3 @@ Notification=none ; commit=CommitHash name=Name and date of the commit. manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr&is_public=1&password=pass&port=666& - diff --git a/manifest.json b/manifest.json index 2e07aad..e01528e 100755 --- a/manifest.json +++ b/manifest.json @@ -15,7 +15,7 @@ "requirements": { "yunohost": ">= 4.1.7" }, - "multi_instance": true, + "multi_instance": false, "services": [ "nginx", "mysql" @@ -30,6 +30,10 @@ { "name": "is_public", "type": "boolean", + "help": { + "en": "If enabled, Focalboard will be accessible by people who do not have an account. This can be changed later via the webadmin.", + "fr": "Si cette case est cochée, Focalboard sera accessible aux personnes n’ayant pas de compte. Vous pourrez changer ceci plus tard via la webadmin." + }, "default": true } ] From d8e5fbf4212e28162a7c597962c8e0a68f74a812 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 5 Apr 2021 23:30:25 +0200 Subject: [PATCH 08/16] Update restore --- scripts/restore | 2 -- 1 file changed, 2 deletions(-) diff --git a/scripts/restore b/scripts/restore index ecc3ccb..e6e5e49 100755 --- a/scripts/restore +++ b/scripts/restore @@ -74,9 +74,7 @@ ynh_system_user_create --username=$app --home_dir="$final_path" # Restore permissions on app files chown -R $app:$app $final_path -chown -R $app:$app $files_path #chmod -R o-rwx $final_path -chmod -R 755 $files_path chmod 600 $final_path/config.json #================================================= From a85103655fdb04e1293fd594ae22b1cba47987f7 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 5 Apr 2021 23:32:43 +0200 Subject: [PATCH 09/16] Update change_url --- scripts/change_url | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/change_url b/scripts/change_url index dca5b5b..40aad55 100755 --- a/scripts/change_url +++ b/scripts/change_url @@ -28,6 +28,7 @@ ynh_script_progression --message="Loading installation settings..." --weight=1 # Needed for helper "ynh_add_nginx_config" final_path=$(ynh_app_setting_get --app=$app --key=final_path) +port=$(ynh_app_setting_get --app=$app --key=port) #================================================= # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP From ad4c1659680611737887495d98140e91bdd7e243 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 5 Apr 2021 23:37:34 +0200 Subject: [PATCH 10/16] Update manifest.json --- manifest.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/manifest.json b/manifest.json index e01528e..dbbb673 100755 --- a/manifest.json +++ b/manifest.json @@ -30,10 +30,6 @@ { "name": "is_public", "type": "boolean", - "help": { - "en": "If enabled, Focalboard will be accessible by people who do not have an account. This can be changed later via the webadmin.", - "fr": "Si cette case est cochée, Focalboard sera accessible aux personnes n’ayant pas de compte. Vous pourrez changer ceci plus tard via la webadmin." - }, "default": true } ] From 71176c77531ce29dceef755c65d5635b8c7f45aa Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 5 Apr 2021 23:40:22 +0200 Subject: [PATCH 11/16] Update manifest.json --- manifest.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/manifest.json b/manifest.json index dbbb673..e01528e 100755 --- a/manifest.json +++ b/manifest.json @@ -30,6 +30,10 @@ { "name": "is_public", "type": "boolean", + "help": { + "en": "If enabled, Focalboard will be accessible by people who do not have an account. This can be changed later via the webadmin.", + "fr": "Si cette case est cochée, Focalboard sera accessible aux personnes n’ayant pas de compte. Vous pourrez changer ceci plus tard via la webadmin." + }, "default": true } ] From bcda5b6d9a3111dd3dc8ba79a8d9a9fe7d3ab23d Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 6 Apr 2021 00:07:55 +0200 Subject: [PATCH 12/16] Fix --- scripts/install | 2 +- scripts/restore | 15 +++------------ scripts/upgrade | 3 ++- 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/scripts/install b/scripts/install index 13004b5..4c0efc9 100755 --- a/scripts/install +++ b/scripts/install @@ -143,7 +143,7 @@ chmod 600 $final_path/config.json #================================================= ynh_script_progression --message="Integrating service in YunoHost..." --weight=4 -yunohost service add $app --description="A short description of the app" --log="/var/log/$app/$app.log" +yunohost service add $app --description="Self-hosted kanban board" --log="/var/log/$app/$app.log" #================================================= # START SYSTEMD SERVICE diff --git a/scripts/restore b/scripts/restore index e6e5e49..18df492 100755 --- a/scripts/restore +++ b/scripts/restore @@ -109,22 +109,14 @@ systemctl enable $app.service --quiet #================================================= ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 -yunohost service add $app --description="A short description of the app" --log="/var/log/$app/$app.log" +yunohost service add $app --description="Self-hosted kanban board" --log="/var/log/$app/$app.log" #================================================= # START SYSTEMD SERVICE #================================================= ynh_script_progression --message="Starting a systemd service..." --weight=1 -ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" - -#================================================= -# RESTORE VARIOUS FILES -#================================================= - -ynh_restore_file --origin_path="/etc/cron.d/$app" - -ynh_restore_file --origin_path="/etc/$app/" +ynh_systemd_action --service_name=$app --action=start --log_path="/var/log/$app/$app.log" #================================================= # RESTORE THE LOGROTATE CONFIGURATION @@ -137,9 +129,8 @@ ynh_restore_file --origin_path="/etc/logrotate.d/$app" #================================================= # RELOAD NGINX AND PHP-FPM #================================================= -ynh_script_progression --message="Reloading NGINX web server and PHP-FPM..." --weight=2 +ynh_script_progression --message="Reloading NGINX web server..." --weight=2 -ynh_systemd_action --service_name=php$phpversion-fpm --action=reload ynh_systemd_action --service_name=nginx --action=reload #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 24eaee0..3e51719 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -21,6 +21,7 @@ path_url=$(ynh_app_setting_get --app=$app --key=path) final_path=$(ynh_app_setting_get --app=$app --key=final_path) db_name=$(ynh_app_setting_get --app=$app --key=db_name) files_path=$(ynh_app_setting_get --app=$app --key=files_path) +port=$(ynh_app_setting_get --app=$app --key=port) #================================================= # CHECK VERSION @@ -138,7 +139,7 @@ ynh_use_logrotate --non-append #================================================= ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 -yunohost service add $app --description="A short description of the app" --log="/var/log/$app/$app.log" +yunohost service add $app --description="Self-hosted kanban board" --log="/var/log/$app/$app.log" #================================================= # START SYSTEMD SERVICE From 4d6e13fd3a710340283c2e0fc9f43bffa231767d Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 6 Apr 2021 08:01:09 +0200 Subject: [PATCH 13/16] fix --- scripts/remove | 8 -------- scripts/restore | 6 ------ scripts/upgrade | 8 -------- 3 files changed, 22 deletions(-) diff --git a/scripts/remove b/scripts/remove index 56f8b5c..1a56281 100755 --- a/scripts/remove +++ b/scripts/remove @@ -75,14 +75,6 @@ ynh_script_progression --message="Removing NGINX web server configuration..." -- # Remove the dedicated NGINX config ynh_remove_nginx_config -#================================================= -# REMOVE LOGROTATE CONFIGURATION -#================================================= -ynh_script_progression --message="Removing logrotate configuration..." --weight=2 - -# Remove the app-specific logrotate config -ynh_remove_logrotate - #================================================= # GENERIC FINALIZATION #================================================= diff --git a/scripts/restore b/scripts/restore index 18df492..46f856b 100755 --- a/scripts/restore +++ b/scripts/restore @@ -118,12 +118,6 @@ ynh_script_progression --message="Starting a systemd service..." --weight=1 ynh_systemd_action --service_name=$app --action=start --log_path="/var/log/$app/$app.log" -#================================================= -# RESTORE THE LOGROTATE CONFIGURATION -#================================================= - -ynh_restore_file --origin_path="/etc/logrotate.d/$app" - #================================================= # GENERIC FINALIZATION #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 3e51719..5458dc2 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -126,14 +126,6 @@ chown -R $app:$app $files_path chmod -R 755 $files_path chmod 600 $final_path/config.json -#================================================= -# SETUP LOGROTATE -#================================================= -ynh_script_progression --message="Upgrading logrotate configuration..." --weight=2 - -# Use logrotate to manage app-specific logfile(s) -ynh_use_logrotate --non-append - #================================================= # INTEGRATE SERVICE IN YUNOHOST #================================================= From b8f623b5f624d110df6d73feece0686b7529d958 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 6 Apr 2021 08:30:05 +0200 Subject: [PATCH 14/16] Update upgrade --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 3e51719..8f00975 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -111,7 +111,7 @@ ynh_add_systemd_config # UPDATE A CONFIG FILE #================================================= -ynh_add_config --template="some_config_file" --destination="$final_path/some_config_file" +ynh_add_config --template="../conf/config.json" --destination="$final_path/config.json" #================================================= # GENERIC FINALIZATION From 74d66d70e06122358c903659f9f2cf3cd45c5ac7 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 6 Apr 2021 08:58:51 +0200 Subject: [PATCH 15/16] Update upgrade --- scripts/upgrade | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index c395b34..09d8156 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -72,8 +72,23 @@ if [ "$upgrade_type" == "UPGRADE_APP" ] then ynh_script_progression --message="Upgrading source files..." --weight=1 + # Create a temporary directory + tmpdir="$(mktemp -d)" + + # Backup the config file in the temp dir + cp -a "$final_path/config.json" "$tmpdir/config.json" + + # 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" + + # Copy the admin saved settings from tmp directory to final path + cp -a "$tmpdir/config.json" "$final_path/config.json" + + # Remove the tmp directory securely + ynh_secure_remove --file="$tmpdir" fi #================================================= @@ -107,12 +122,6 @@ ynh_script_progression --message="Upgrading systemd configuration..." --weight=1 # Create a dedicated systemd config ynh_add_systemd_config -#================================================= -# UPDATE A CONFIG FILE -#================================================= - -ynh_add_config --template="../conf/config.json" --destination="$final_path/config.json" - #================================================= # GENERIC FINALIZATION #================================================= From e97ba8a6d16284183fa4491f0d0f9fdff013a86e Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 6 Apr 2021 09:00:33 +0200 Subject: [PATCH 16/16] Update upgrade --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 09d8156..2101585 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -82,7 +82,7 @@ then ynh_secure_remove --file="$final_path" # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$final_path" + ynh_setup_source --dest_dir="$final_path" #--keep="foo bar" to integrate when https://github.com/YunoHost/yunohost/pull/1200 is upstream # Copy the admin saved settings from tmp directory to final path cp -a "$tmpdir/config.json" "$final_path/config.json"