From e0c04d6ce6d2c420502020b64fd5d73764590123 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 10 Apr 2021 12:35:07 +0200 Subject: [PATCH] Fix --- README.md | 4 ++-- README_fr.md | 5 +++-- check_process | 1 - scripts/change_url | 2 -- scripts/install | 10 +--------- scripts/remove | 8 -------- scripts/restore | 10 +--------- scripts/upgrade | 10 +--------- 8 files changed, 8 insertions(+), 42 deletions(-) diff --git a/README.md b/README.md index 35f0986..55f81aa 100644 --- a/README.md +++ b/README.md @@ -22,8 +22,8 @@ Clone of 2048 game. You need to reach 243. #### Supported architectures -* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/243%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/243/) -* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/243%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/243/) +* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/243.svg)](https://ci-apps.yunohost.org/ci/apps/243/) +* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/243.svg)](https://ci-apps-arm.yunohost.org/ci/apps/243/) ## Links diff --git a/README_fr.md b/README_fr.md index 6745d51..76aa641 100644 --- a/README_fr.md +++ b/README_fr.md @@ -22,8 +22,9 @@ Clone du jeu 2048. Il vous faut atteindre 243. #### Architectures supportées -* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/243%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/243/) -* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/243%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/243/) +* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/243.svg)](https://ci-apps.yunohost.org/ci/apps/243/) +* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/243.svg)](https://ci-apps-arm.yunohost.org/ci/apps/243/) + ## Liens diff --git a/check_process b/check_process index 8d5802c..7970cbc 100644 --- a/check_process +++ b/check_process @@ -14,6 +14,5 @@ upgrade=1 backup_restore=1 multi_instance=1 - port_already_use=0 change_url=1 \ No newline at end of file diff --git a/scripts/change_url b/scripts/change_url index e912667..6e8d89a 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -8,8 +8,6 @@ source /usr/share/yunohost/helpers -ynh_abort_if_errors - #================================================= # RETRIEVE ARGUMENTS #================================================= diff --git a/scripts/install b/scripts/install index 1d0c256..c7da5b0 100755 --- a/scripts/install +++ b/scripts/install @@ -45,14 +45,6 @@ ynh_script_progression --message="Storing installation settings..." --weight=2 ynh_app_setting_set --app=$app --key=domain --value=$domain ynh_app_setting_set --app=$app --key=path --value=$path_url -#================================================= -# CREATE DEDICATED USER -#================================================= -ynh_script_progression --message="Configuring system user..." --weight=2 - -# Create a system user -ynh_system_user_create --username=$app --home_dir="$final_path" - #================================================= # STANDARD MODIFICATIONS #================================================= @@ -80,7 +72,7 @@ ynh_add_nginx_config #================================================= # Set permissions to app files -chown -R $app: $final_path +chown -R root: $final_path #================================================= # SETUP SSOWAT diff --git a/scripts/remove b/scripts/remove index 0ccc587..2123569 100755 --- a/scripts/remove +++ b/scripts/remove @@ -36,14 +36,6 @@ ynh_script_progression --message="Removing NGINX web server configuration..." -- # Remove the dedicated NGINX config ynh_remove_nginx_config -#================================================= -# REMOVE DEDICATED USER -#================================================= -ynh_script_progression --message="Removing the dedicated system user..." --weight=1 - -# Delete a system user -ynh_system_user_delete --username=$app - #================================================= # END OF SCRIPT #================================================= diff --git a/scripts/restore b/scripts/restore index 4c5d7b5..0885e6d 100644 --- a/scripts/restore +++ b/scripts/restore @@ -43,14 +43,6 @@ test ! -d $final_path \ ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" -#================================================= -# RECREATE THE DEDICATED USER -#================================================= -ynh_script_progression --message="Recreating the dedicated system user..." --weight=1 - -# Create the dedicated user (if not existing) -ynh_system_user_create --username=$app --home_dir="$final_path" - #================================================= # RESTORE THE APP MAIN DIR #================================================= @@ -63,7 +55,7 @@ ynh_restore_file --origin_path="$final_path" #================================================= # Restore permissions on app files -chown -R $app: $final_path +chown -R root: $final_path #================================================= # GENERIC FINALIZATION diff --git a/scripts/upgrade b/scripts/upgrade index 62d2ce1..e3d475a 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -57,14 +57,6 @@ ynh_clean_setup () { # Exit if an error occurs during the execution of the script ynh_abort_if_errors -#================================================= -# CREATE DEDICATED USER -#================================================= -ynh_script_progression --message="Making sure dedicated system user exists..." --weight=1 - -# Create a dedicated user (if not existing) -ynh_system_user_create --username=$app --home_dir="$final_path" - #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= @@ -90,7 +82,7 @@ ynh_add_nginx_config #================================================= # Set permissions on app files -chown -R $app: $final_path +chown -R root: $final_path #================================================= # RELOAD NGINX