From 8f7e0a02d3ab80e44387dfbe685f07036dac1ee1 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 12 Dec 2020 09:34:04 +0100 Subject: [PATCH] Fix --- README.md | 8 ++++---- check_process | 2 +- scripts/change_url | 10 +++++----- scripts/install | 3 ++- scripts/remove | 4 ++-- scripts/upgrade | 5 +---- 6 files changed, 15 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index 7eb3cfa..f47f066 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,13 @@ -# LibreTo for YunoHost +# Libreto for YunoHost [![Integration level](https://dash.yunohost.org/integration/libreto.svg)](https://dash.yunohost.org/appci/app/libreto) ![](https://ci-apps.yunohost.org/ci/badges/libreto.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/libreto.maintain.svg) -[![Install LibreTo with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=libreto) +[![Install Libreto with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=libreto) -> *This package allow you to install LibreTo quickly and simply on a YunoHost server. +> *This package allow you to install Libreto quickly and simply on a YunoHost server. If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to know how to install and enjoy it.* ## Overview -Libreto let you aggregate your pad (etherpad lite) to create a kind of wiki easily. +Libreto let you aggregate your pad (Etherpad lite) to create a kind of wiki easily. **Shipped version:** 0.0.20180605 diff --git a/check_process b/check_process index 5770b70..10ea98e 100644 --- a/check_process +++ b/check_process @@ -15,7 +15,7 @@ backup_restore=1 multi_instance=1 port_already_use=0 - change_url=0 + change_url=1 ;;; Options Email=ljf+libreto_ynh@reflexlibre.net Notification=down diff --git a/scripts/change_url b/scripts/change_url index dcc468b..876fb11 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -71,19 +71,19 @@ ynh_script_progression --message="Updating NGINX web server configuration..." -- nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf -# Change the path in the nginx config file +# Change the path in the NGINX config file if [ $change_path -eq 1 ] then - # Make a backup of the original nginx config file if modified + # Make a backup of the original NGINX config file if modified ynh_backup_if_checksum_is_different "$nginx_conf_path" - # Set global variables for nginx helper + # Set global variables for NGINX helper domain="$old_domain" path_url="$new_path" - # Create a dedicated nginx config + # Create a dedicated NGINX config ynh_add_nginx_config fi -# Change the domain for nginx +# Change the domain for NGINX if [ $change_domain -eq 1 ] then # Delete file checksum for the old conf file location diff --git a/scripts/install b/scripts/install index 2f87852..9e305d1 100755 --- a/scripts/install +++ b/scripts/install @@ -89,7 +89,8 @@ ynh_system_user_create --username=$app # PHP-FPM CONFIGURATION #================================================= ynh_script_progression --message="Configuring PHP-FPM..." --weight=2 -# Create a dedicated php-fpm config + +# Create a dedicated PHP-FPM config ynh_add_fpm_config phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) diff --git a/scripts/remove b/scripts/remove index 433234e..d460e90 100755 --- a/scripts/remove +++ b/scripts/remove @@ -34,7 +34,7 @@ ynh_secure_remove --file="$final_path" #================================================= ynh_script_progression --message="Removing NGINX web server configuration..." --weight=2 -# Remove the dedicated nginx config +# Remove the dedicated NGINX config ynh_remove_nginx_config #================================================= @@ -42,7 +42,7 @@ ynh_remove_nginx_config #================================================= ynh_script_progression --message="Removing PHP-FPM configuration..." --weight=1 -# Remove the dedicated php-fpm config +# Remove the dedicated PHP-FPM config ynh_remove_fpm_config #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index e04469d..fb1abfe 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -70,15 +70,13 @@ ynh_system_user_create --username=$app # PHP-FPM CONFIGURATION #================================================= ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=2 -# Create a dedicated php-fpm config +# Create a dedicated PHP-FPM config ynh_add_fpm_config #================================================= # SPECIFIC UPGRADE #================================================= -### Verify the checksum of a file, stored by `ynh_store_file_checksum` in the install script. -### And create a backup of this file if the checksum is different. So the file will be backed up if the admin had modified it. ynh_backup_if_checksum_is_different "$final_path/config.php" # Recalculate and store the checksum of the file for the next upgrade. ynh_store_file_checksum "$final_path/config.php" @@ -120,4 +118,3 @@ ynh_systemd_action --service_name=nginx --action=reload #================================================= ynh_script_progression --message="Upgrade of $app completed" --last -