From e528a302467fdae831aa7899f215e04d9e5759ec Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 28 Nov 2020 10:38:48 +0100 Subject: [PATCH] fix --- check_process | 4 ---- scripts/backup | 7 ------- scripts/install | 7 +++++-- scripts/remove | 2 +- scripts/restore | 1 - 5 files changed, 6 insertions(+), 15 deletions(-) diff --git a/check_process b/check_process index 3bd13be..0441658 100644 --- a/check_process +++ b/check_process @@ -11,7 +11,6 @@ language="fr" is_public=1 (PUBLIC|public=1|private=0) password="pass" - port="666" (PORT) ; Checks pkg_linter=1 setup_sub_dir=1 @@ -20,11 +19,8 @@ setup_private=1 setup_public=1 upgrade=1 - upgrade=1 from_commit=CommitHash backup_restore=1 multi_instance=1 - incorrect_path=1 - port_already_use=0 change_url=1 ;;; Options Email= diff --git a/scripts/backup b/scripts/backup index 001ea7d..cd87c45 100755 --- a/scripts/backup +++ b/scripts/backup @@ -6,7 +6,6 @@ # IMPORT GENERIC HELPERS #================================================= -#Keep this path for calling _common.sh inside the execution's context of backup and restore scripts source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers @@ -14,11 +13,6 @@ source /usr/share/yunohost/helpers # MANAGE SCRIPT FAILURE #================================================= -ynh_clean_setup () { - ### Remove this function if there's nothing to clean before calling the remove script. - true -} -# Exit if an error occurs during the execution of the script ynh_abort_if_errors #================================================= @@ -53,7 +47,6 @@ ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" #================================================= # BACKUP THE PHP-FPM CONFIGURATION #================================================= -ynh_print_info "Backing up PHP-FPM configuration..." ynh_backup --src_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" diff --git a/scripts/install b/scripts/install index 044dca3..597908c 100755 --- a/scripts/install +++ b/scripts/install @@ -159,6 +159,7 @@ ynh_store_file_checksum "$final_path/include/config.inc.php" # Set permissions to app files chown -R $app: $final_path +chown $app: $final_path/include/constant.php #================================================= # SETUP LOGROTATE @@ -172,7 +173,7 @@ ynh_use_logrotate # ADVERTISE SERVICE IN ADMIN PANEL #================================================= -yunohost service add $app --log "/var/log/$app/$app.log" +yunohost service add $app --description "Accounting free software" --log "/var/log/$app/$app.log" #================================================= # SETUP SSOWAT @@ -196,6 +197,8 @@ ynh_systemd_action --service_name=nginx --action=reload # END OF SCRIPT #================================================= -ynh_print_info "Installation of $app completed" +ynh_script_progression --message="Installation of $app completed" --last + + ynh_print_info "Default Noalyss admin / pass are phpcompta. Enjoy !" ynh_print_info "Go to https://$domain$path_url/install.php to continue !" diff --git a/scripts/remove b/scripts/remove index fb5524f..5161b95 100755 --- a/scripts/remove +++ b/scripts/remove @@ -28,7 +28,7 @@ final_path=$(ynh_app_setting_get $app final_path) # REMOVE SERVICE FROM ADMIN PANEL #================================================= -# Remove the service from the list of services known by Yunohost (added from `yunohost service add`) +# Remove the service from the list of services known by YunoHost (added from `yunohost service add`) if ynh_exec_warn_less yunohost service status $app >/dev/null then ynh_script_progression --message="Removing $app service integration..." --weight=1 diff --git a/scripts/restore b/scripts/restore index 50a008c..4cd0abf 100755 --- a/scripts/restore +++ b/scripts/restore @@ -6,7 +6,6 @@ # IMPORT GENERIC HELPERS #================================================= -#Keep this path for calling _common.sh inside the execution's context of backup and restore scripts source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers