From e9e6589e6d0679fc098af8d09400ca7d56e1eca9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 10 Jan 2023 18:56:13 +0100 Subject: [PATCH] Fix --- doc/DESCRIPTION.md | 4 ---- doc/DISCLAIMER.md | 4 ---- manifest.json | 9 ++------- scripts/backup | 8 -------- scripts/install | 10 ---------- scripts/remove | 8 -------- scripts/restore | 16 ---------------- scripts/upgrade | 18 ------------------ 8 files changed, 2 insertions(+), 75 deletions(-) diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md index 966fa82..3f2dfe0 100644 --- a/doc/DESCRIPTION.md +++ b/doc/DESCRIPTION.md @@ -1,5 +1 @@ This is a probe program for PHP environment. It can show your server information and readable easily. - - -[![X Prober preview](https://raw.githubusercontent.com/kmvan/x-prober/master/screenshots/preview.webp)](https://raw.githubusercontent.com/kmvan/x-prober/master/screenshots/preview.webp) - diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md index 823b22d..3f2dfe0 100644 --- a/doc/DISCLAIMER.md +++ b/doc/DISCLAIMER.md @@ -1,5 +1 @@ This is a probe program for PHP environment. It can show your server information and readable easily. - -more info here: https://github.com/kmvan/x-prober/blob/master/README.md - -Note that the app works only in public mode for now. diff --git a/manifest.json b/manifest.json index 9f1eaa3..728a24a 100644 --- a/manifest.json +++ b/manifest.json @@ -44,13 +44,8 @@ { "name": "is_public", "type": "boolean", - "default": true, - "help": { - "en": "Must be set to public to work for now", - "fr": "Vous devriez le laisser public, ne fonctionne pas en mode privé pour l'instant" - } - } - + "default": true + } ] } } diff --git a/scripts/backup b/scripts/backup index 07bba6a..2efaa42 100755 --- a/scripts/backup +++ b/scripts/backup @@ -55,14 +55,6 @@ ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" ynh_backup --src_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" -#================================================= -# SPECIFIC BACKUP -#================================================= -# BACKUP LOGROTATE -#================================================= - -ynh_backup --src_path="/etc/logrotate.d/$app" - #================================================= # END OF SCRIPT #================================================= diff --git a/scripts/install b/scripts/install index 0dd8691..5052f2e 100755 --- a/scripts/install +++ b/scripts/install @@ -96,16 +96,6 @@ ynh_script_progression --message="Configuring NGINX web server..." --weight=1 # Create a dedicated NGINX config ynh_add_nginx_config -#================================================= -# GENERIC FINALIZATION -#================================================= -# SETUP LOGROTATE -#================================================= -ynh_script_progression --message="Configuring log rotation..." --weight=1 - -# Use logrotate to manage application logfile(s) -ynh_use_logrotate - #================================================= # SETUP SSOWAT #================================================= diff --git a/scripts/remove b/scripts/remove index 61b33eb..4a7848b 100755 --- a/scripts/remove +++ b/scripts/remove @@ -19,14 +19,6 @@ app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get --app=$app --key=domain) final_path=$(ynh_app_setting_get --app=$app --key=final_path) -#================================================= -# REMOVE LOGROTATE CONFIGURATION -#================================================= -ynh_script_progression --message="Removing logrotate configuration..." --weight=1 - -# Remove the app-specific logrotate config -ynh_remove_logrotate - #================================================= # REMOVE APP MAIN DIR #================================================= diff --git a/scripts/restore b/scripts/restore index 1c40374..900c312 100755 --- a/scripts/restore +++ b/scripts/restore @@ -44,15 +44,6 @@ ynh_script_progression --message="Validating restoration parameters..." --weight test ! -d $final_path \ || ynh_die --message="There is already a directory: $final_path " -#================================================= -# STANDARD RESTORATION STEPS -#================================================= -# REINSTALL DEPENDENCIES -#================================================= -ynh_script_progression --message="Reinstalling dependencies..." --weight=2 - -ynh_install_app_dependencies - #================================================= # RESTORE THE NGINX CONFIGURATION #================================================= @@ -89,13 +80,6 @@ ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" # Recreate a dedicated php-fpm config ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint --phpversion=$phpversion -#================================================= -# RESTORE THE LOGROTATE CONFIGURATION -#================================================= -ynh_script_progression --message="Restoring the logrotate configuration..." --weight=1 - -ynh_restore_file --origin_path="/etc/logrotate.d/$app" - #================================================= # GENERIC FINALIZATION #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 9ac2ace..4b61a09 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -83,14 +83,6 @@ ynh_script_progression --message="Making sure dedicated system user exists..." - # Create a dedicated user (if not existing) ynh_system_user_create --username=$app --home_dir="$final_path" -#================================================= -# REINSTALL DEPENDENCIES -#================================================= - -ynh_script_progression --message="Reinstalling dependencies..." --weight=2 - -ynh_install_app_dependencies "php${phpversion}-fpm" - #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= @@ -124,16 +116,6 @@ ynh_script_progression --message="Upgrading NGINX web server configuration..." - # Create a dedicated NGINX config ynh_add_nginx_config -#================================================= -# GENERIC FINALIZATION -#================================================= -# SETUP LOGROTATE -#================================================= -ynh_script_progression --message="Upgrading logrotate configuration..." --weight=1 - -# Use logrotate to manage app-specific logfile(s) -ynh_use_logrotate --non-append - #================================================= # RELOAD NGINX #=================================================