YunoHost-Apps/phpservermon_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/phpservermon_ynh.git synced 2024-09-03 19:56:40 +02:00
Code Issues Activity Actions

Merge pull request #12 from YunoHost-Apps/4.3

Browse source 
4.3
This commit is contained in:
Éric Gaspar 2021-11-15 07:21:45 +01:00 committed by GitHub
commit de67dd6bee
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 38 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
README.md
View file

@ -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 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 ## Documentation and resources
* Official app website: www.phpservermonitor.org * Official app website: www.phpservermonitor.org
* Official user documentation: https://yunohost.org/apps
* Official admin documentation: http://docs.phpservermonitor.org/en/latest/ * Official admin documentation: http://docs.phpservermonitor.org/en/latest/
* Upstream app code repository: https://github.com/phpservermon/phpservermon/ * Upstream app code repository: https://github.com/phpservermon/phpservermon/
* YunoHost documentation for this app: https://yunohost.org/app_phpservermon * YunoHost documentation for this app: https://yunohost.org/app_phpservermon

3
README_fr.md
View file

@ -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 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 ## Documentations et ressources
* Site officiel de l'app : www.phpservermonitor.org * 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/ * 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/ * Dépôt de code officiel de l'app : https://github.com/phpservermon/phpservermon/
* Documentation YunoHost pour cette app : https://yunohost.org/app_phpservermon * Documentation YunoHost pour cette app : https://yunohost.org/app_phpservermon

2
conf/app.src
View file

@ -3,5 +3,3 @@ SOURCE_SUM=8edc850aac341c8f0e9d3c95ba376f374195a3cf143d38c1603e7285aa43cc01
SOURCE_SUM_PRG=sha256sum SOURCE_SUM_PRG=sha256sum
SOURCE_FORMAT=tar.gz SOURCE_FORMAT=tar.gz
SOURCE_IN_SUBDIR=2 SOURCE_IN_SUBDIR=2
SOURCE_FILENAME=
SOURCE_EXTRACT=

8
manifest.json
View file

@ -6,13 +6,12 @@
"en": "Script that checks whether your websites and servers are up and running", "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" "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", "url": "www.phpservermonitor.org",
"upstream": { "upstream": {
"license": "GPL-3.0-or-later", "license": "GPL-3.0-or-later",
"website": "www.phpservermonitor.org", "website": "www.phpservermonitor.org",
"admindoc": "http://docs.phpservermonitor.org/en/latest/", "admindoc": "http://docs.phpservermonitor.org/en/latest/",
"userdoc": "https://yunohost.org/apps",
"code": "https://github.com/phpservermon/phpservermon/" "code": "https://github.com/phpservermon/phpservermon/"
}, },
"license": "GPL-3.0-or-later", "license": "GPL-3.0-or-later",
@ -22,7 +21,7 @@
"url": "" "url": ""
}, },
"requirements": { "requirements": {
"yunohost": ">= 4.2.4" "yunohost": ">= 4.3.0"
}, },
"multi_instance": true, "multi_instance": true,
"services": [ "services": [
@ -34,8 +33,7 @@
"install" : [ "install" : [
{ {
"name": "domain", "name": "domain",
"type": "domain", "type": "domain"
"example": "example.com"
}, },
{ {
"name": "path", "name": "path",

2
scripts/_common.sh
View file

@ -6,7 +6,7 @@
YNH_PHP_VERSION="7.3" 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 # PERSONAL HELPERS

9
scripts/install
View file

@ -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=domain --value=$domain
ynh_app_setting_set --app=$app --key=path --value=$path_url 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 # CREATE DEDICATED USER
#================================================= #=================================================
@ -94,7 +101,7 @@ ynh_add_nginx_config
ynh_script_progression --message="Configuring PHP-FPM..." --weight=1 ynh_script_progression --message="Configuring PHP-FPM..." --weight=1
# Create a dedicated PHP-FPM config # 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) phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
#================================================= #=================================================

8
scripts/remove
View file

@ -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 # Remove a database if it exists, along with the associated user
ynh_mysql_remove_db --db_user=$db_user --db_name=$db_name 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 # REMOVE APP MAIN DIR
#================================================= #=================================================

10
scripts/restore
View file

@ -40,8 +40,6 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
#================================================= #=================================================
ynh_script_progression --message="Validating restoration parameters..." --weight=1 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 \ test ! -d $final_path \
|| ynh_die --message="There is already a directory: $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" 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 # RESTORE THE CRON FILE
#================================================= #=================================================

9
scripts/upgrade
View file

@ -72,13 +72,20 @@ ynh_script_progression --message="Upgrading NGINX web server configuration..." -
# Create a dedicated NGINX config # Create a dedicated NGINX config
ynh_add_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 # PHP-FPM CONFIGURATION
#================================================= #=================================================
ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=1 ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=1
# Create a dedicated PHP-FPM config # Create a dedicated PHP-FPM config
ynh_add_fpm_config --package="$extra_php_dependencies" ynh_add_fpm_config
#================================================= #=================================================
# UPDATE THE CRON JOB # UPDATE THE CRON JOB