From f0d3de1ce034f55e26d0831960c801b02419945c Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 14 Nov 2021 15:42:49 +0100 Subject: [PATCH 1/8] update to 4.3 --- conf/app.src | 2 -- manifest.json | 8 +++----- scripts/_common.sh | 2 +- scripts/install | 9 ++++++++- scripts/remove | 8 ++++++++ scripts/restore | 8 ++++++++ scripts/upgrade | 9 ++++++++- 7 files changed, 36 insertions(+), 10 deletions(-) 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..2af009a 100755 --- a/scripts/restore +++ b/scripts/restore @@ -80,6 +80,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 From 9e807d7a44e822e379eb7de386fea3803edb41bb Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Sun, 14 Nov 2021 14:42:55 +0000 Subject: [PATCH 2/8] Auto-update README --- README.md | 3 +-- README_fr.md | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) 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 From 04463d008eaf5631049637fc093a97169c8c5ca7 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 15 Nov 2021 07:21:22 +0100 Subject: [PATCH 3/8] Update restore --- scripts/restore | 2 -- 1 file changed, 2 deletions(-) diff --git a/scripts/restore b/scripts/restore index 2af009a..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 " From 84741faf20344bcf64c0169d77e97a38641c13dc Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 15 Mar 2022 17:08:10 +0100 Subject: [PATCH 4/8] Update nginx.conf --- conf/nginx.conf | 5 ----- 1 file changed, 5 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 556b622..549b52a 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -4,11 +4,6 @@ location __PATH__/ { # Path to source alias __FINALPATH__/ ; - # Force usage of https - if ($scheme = http) { - rewrite ^ https://$server_name$request_uri? permanent; - } - index index.php; # Common parameter to increase upload size limit in conjunction with dedicated php-fpm file From 33a1440b0866b9e0549cc50a87d31c2cb67ecf34 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 15 Aug 2022 18:35:06 +0200 Subject: [PATCH 5/8] set relative path for --keep opt --- manifest.json | 4 ++-- scripts/_common.sh | 2 +- scripts/upgrade | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/manifest.json b/manifest.json index e516c86..9df5a37 100644 --- a/manifest.json +++ b/manifest.json @@ -21,12 +21,12 @@ "url": "" }, "requirements": { - "yunohost": ">= 4.3.0" + "yunohost": ">= 11.0.9" }, "multi_instance": true, "services": [ "nginx", - "php7.3-fpm", + "php7.4-fpm", "mysql" ], "arguments": { diff --git a/scripts/_common.sh b/scripts/_common.sh index 81e0081..3588a76 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,7 +4,7 @@ # COMMON VARIABLES #================================================= -YNH_PHP_VERSION="7.3" +YNH_PHP_VERSION="7.4" pkg_dependencies="php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-common php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-xml" diff --git a/scripts/upgrade b/scripts/upgrade index 915713c..c1f38ef 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -57,7 +57,7 @@ then ynh_script_progression --message="Upgrading source files..." --weight=1 # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$final_path" --keep="$final_path/config.php" + ynh_setup_source --dest_dir="$final_path" --keep="config.php" fi chmod 750 "$final_path" From fe94bd0e09529d7e3dd0d6c4e8b017d55c528bdb Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 15 Aug 2022 16:35:14 +0000 Subject: [PATCH 6/8] Auto-update README --- README.md | 20 ++++++++++---------- README_fr.md | 28 ++++++++++++++++------------ 2 files changed, 26 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index d9b78ec..db5c691 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ It shall NOT be edited by hand. # PHP Server Monitor for YunoHost -[![Integration level](https://dash.yunohost.org/integration/phpservermon.svg)](https://dash.yunohost.org/appci/app/phpservermon) ![](https://ci-apps.yunohost.org/ci/badges/phpservermon.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/phpservermon.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/phpservermon.svg)](https://dash.yunohost.org/appci/app/phpservermon) ![Working status](https://ci-apps.yunohost.org/ci/badges/phpservermon.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/phpservermon.maintain.svg) [![Install PHP Server Monitor with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=phpservermon) *[Lire ce readme en français.](./README_fr.md)* @@ -20,10 +20,9 @@ Script that checks whether your websites and servers are up and running **Shipped version:** 3.5.2~ynh5 - ## Screenshots -![](./doc/screenshots/screenshot.png) +![Screenshot of PHP Server Monitor](./doc/screenshots/screenshot.png) ## Disclaimers / important information @@ -34,21 +33,22 @@ Script that checks whether your websites and servers are up and running ## Documentation and resources -* Official app website: www.phpservermonitor.org -* 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 -* Report a bug: https://github.com/YunoHost-Apps/phpservermon_ynh/issues +* Official app website: +* Official admin documentation: +* Upstream app code repository: +* YunoHost documentation for this app: +* Report a bug: ## Developer info Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/phpservermon_ynh/tree/testing). To try the testing branch, please proceed like that. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/phpservermon_ynh/tree/testing --debug or sudo yunohost app upgrade phpservermon -u https://github.com/YunoHost-Apps/phpservermon_ynh/tree/testing --debug ``` -**More info regarding app packaging:** https://yunohost.org/packaging_apps \ No newline at end of file +**More info regarding app packaging:** diff --git a/README_fr.md b/README_fr.md index f0e6da9..d7d416a 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,10 +1,14 @@ + + # PHP Server Monitor pour YunoHost -[![Niveau d'intégration](https://dash.yunohost.org/integration/phpservermon.svg)](https://dash.yunohost.org/appci/app/phpservermon) ![](https://ci-apps.yunohost.org/ci/badges/phpservermon.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/phpservermon.maintain.svg) +[![Niveau d'intégration](https://dash.yunohost.org/integration/phpservermon.svg)](https://dash.yunohost.org/appci/app/phpservermon) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/phpservermon.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/phpservermon.maintain.svg) [![Installer PHP Server Monitor avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=phpservermon) *[Read this readme in english.](./README.md)* -*[Lire ce readme en français.](./README_fr.md)* > *Ce package vous permet d'installer PHP Server Monitor rapidement et simplement sur un serveur YunoHost. Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.* @@ -13,13 +17,12 @@ 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~ynh5 - +**Version incluse :** 3.5.2~ynh5 ## Captures d'écran -![](./doc/screenshots/screenshot.png) +![Capture d'écran de PHP Server Monitor](./doc/screenshots/screenshot.png) ## Avertissements / informations importantes @@ -30,21 +33,22 @@ Application pour vérifier que vos sites web et serveurs fonctionnent ## Documentations et ressources -* Site officiel de l'app : www.phpservermonitor.org -* 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 -* Signaler un bug : https://github.com/YunoHost-Apps/phpservermon_ynh/issues +* Site officiel de l'app : +* Documentation officielle de l'admin : +* Dépôt de code officiel de l'app : +* Documentation YunoHost pour cette app : +* Signaler un bug : ## Informations pour les développeurs Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/phpservermon_ynh/tree/testing). Pour essayer la branche testing, procédez comme suit. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/phpservermon_ynh/tree/testing --debug ou sudo yunohost app upgrade phpservermon -u https://github.com/YunoHost-Apps/phpservermon_ynh/tree/testing --debug ``` -**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps \ No newline at end of file +**Plus d'infos sur le packaging d'applications :** From 74752f7bead1a61147a76ea4f56cfaf01450e54a Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 15 Aug 2022 18:35:44 +0200 Subject: [PATCH 7/8] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 9df5a37..3f411c1 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "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~ynh5", + "version": "3.5.2~ynh6", "url": "www.phpservermonitor.org", "upstream": { "license": "GPL-3.0-or-later", From 7272c073d1e350e3c7c1370336e6726005ececd6 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 15 Aug 2022 16:35:55 +0000 Subject: [PATCH 8/8] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index db5c691..88e0776 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~ynh5 +**Shipped version:** 3.5.2~ynh6 ## Screenshots diff --git a/README_fr.md b/README_fr.md index d7d416a..8ca73f8 100644 --- a/README_fr.md +++ b/README_fr.md @@ -17,7 +17,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~ynh5 +**Version incluse :** 3.5.2~ynh6 ## Captures d'écran