diff --git a/README.md b/README.md index 590d828..d9b78ec 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Script that checks whether your websites and servers are up and running -**Shipped version:** 3.5.2~ynh4 +**Shipped version:** 3.5.2~ynh5 @@ -35,7 +35,6 @@ Script that checks whether your websites and servers are up and running ## Documentation and resources * Official app website: www.phpservermonitor.org -* Official user documentation: https://yunohost.org/apps * Official admin documentation: http://docs.phpservermonitor.org/en/latest/ * Upstream app code repository: https://github.com/phpservermon/phpservermon/ * YunoHost documentation for this app: https://yunohost.org/app_phpservermon diff --git a/README_fr.md b/README_fr.md index 5905113..f0e6da9 100644 --- a/README_fr.md +++ b/README_fr.md @@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Application pour vérifier que vos sites web et serveurs fonctionnent -**Version incluse :** 3.5.2~ynh4 +**Version incluse :** 3.5.2~ynh5 @@ -31,7 +31,6 @@ Application pour vérifier que vos sites web et serveurs fonctionnent ## Documentations et ressources * Site officiel de l'app : www.phpservermonitor.org -* Documentation officielle utilisateur : https://yunohost.org/apps * Documentation officielle de l'admin : http://docs.phpservermonitor.org/en/latest/ * Dépôt de code officiel de l'app : https://github.com/phpservermon/phpservermon/ * Documentation YunoHost pour cette app : https://yunohost.org/app_phpservermon diff --git a/conf/app.src b/conf/app.src index 2d91119..67092eb 100644 --- a/conf/app.src +++ b/conf/app.src @@ -3,5 +3,3 @@ SOURCE_SUM=8edc850aac341c8f0e9d3c95ba376f374195a3cf143d38c1603e7285aa43cc01 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=2 -SOURCE_FILENAME= -SOURCE_EXTRACT= diff --git a/manifest.json b/manifest.json index 2f1c301..e516c86 100644 --- a/manifest.json +++ b/manifest.json @@ -6,13 +6,12 @@ "en": "Script that checks whether your websites and servers are up and running", "fr": "Application pour vérifier que vos sites web et serveurs fonctionnent" }, - "version": "3.5.2~ynh4", + "version": "3.5.2~ynh5", "url": "www.phpservermonitor.org", "upstream": { "license": "GPL-3.0-or-later", "website": "www.phpservermonitor.org", "admindoc": "http://docs.phpservermonitor.org/en/latest/", - "userdoc": "https://yunohost.org/apps", "code": "https://github.com/phpservermon/phpservermon/" }, "license": "GPL-3.0-or-later", @@ -22,7 +21,7 @@ "url": "" }, "requirements": { - "yunohost": ">= 4.2.4" + "yunohost": ">= 4.3.0" }, "multi_instance": true, "services": [ @@ -34,8 +33,7 @@ "install" : [ { "name": "domain", - "type": "domain", - "example": "example.com" + "type": "domain" }, { "name": "path", diff --git a/scripts/_common.sh b/scripts/_common.sh index e9f1197..81e0081 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -6,7 +6,7 @@ YNH_PHP_VERSION="7.3" -extra_php_dependencies="php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-common php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-xml" +pkg_dependencies="php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-common php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-xml" #================================================= # PERSONAL HELPERS diff --git a/scripts/install b/scripts/install index 8f05f4c..5547330 100755 --- a/scripts/install +++ b/scripts/install @@ -49,6 +49,13 @@ ynh_script_progression --message="Storing installation settings..." --weight=1 ynh_app_setting_set --app=$app --key=domain --value=$domain ynh_app_setting_set --app=$app --key=path --value=$path_url +#================================================= +# INSTALL DEPENDENCIES +#================================================= +ynh_script_progression --message="Installing dependencies..." --weight=1 + +ynh_install_app_dependencies $pkg_dependencies + #================================================= # CREATE DEDICATED USER #================================================= @@ -94,7 +101,7 @@ ynh_add_nginx_config ynh_script_progression --message="Configuring PHP-FPM..." --weight=1 # Create a dedicated PHP-FPM config -ynh_add_fpm_config --package="$extra_php_dependencies" +ynh_add_fpm_config phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= diff --git a/scripts/remove b/scripts/remove index 7dbae82..e84aabe 100755 --- a/scripts/remove +++ b/scripts/remove @@ -29,6 +29,14 @@ ynh_script_progression --message="Removing the MySQL database..." --weight=1 # Remove a database if it exists, along with the associated user ynh_mysql_remove_db --db_user=$db_user --db_name=$db_name +#================================================= +# REMOVE DEPENDENCIES +#================================================= +ynh_script_progression --message="Removing dependencies..." --weight=1 + +# Remove metapackage and its dependencies +ynh_remove_app_dependencies + #================================================= # REMOVE APP MAIN DIR #================================================= diff --git a/scripts/restore b/scripts/restore index 2f15da0..da6de0e 100755 --- a/scripts/restore +++ b/scripts/restore @@ -40,8 +40,6 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= ynh_script_progression --message="Validating restoration parameters..." --weight=1 -ynh_webpath_available --domain=$domain --path_url=$path_url \ - || ynh_die --message="Path not available: ${domain}${path_url}" test ! -d $final_path \ || ynh_die --message="There is already a directory: $final_path " @@ -80,6 +78,14 @@ ynh_script_progression --message="Restoring the PHP-FPM configuration..." --weig ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" +#================================================= +# REINSTALL DEPENDENCIES +#================================================= +ynh_script_progression --message="Reinstalling dependencies..." --weight=1 + +# Define and install dependencies +ynh_install_app_dependencies $pkg_dependencies + #================================================= # RESTORE THE CRON FILE #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 70f6903..915713c 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -72,13 +72,20 @@ ynh_script_progression --message="Upgrading NGINX web server configuration..." - # Create a dedicated NGINX config ynh_add_nginx_config +#================================================= +# UPGRADE DEPENDENCIES +#================================================= +ynh_script_progression --message="Upgrading dependencies..." --weight=1 + +ynh_install_app_dependencies $pkg_dependencies + #================================================= # PHP-FPM CONFIGURATION #================================================= ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=1 # Create a dedicated PHP-FPM config -ynh_add_fpm_config --package="$extra_php_dependencies" +ynh_add_fpm_config #================================================= # UPDATE THE CRON JOB