diff --git a/README.md b/README.md index 94354f7..38ba0af 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in ## Overview -Monitoring tool for diverse IT components, including networks, servers, VMs and cloud services +A monitoring tool for diverse IT components, including networks, servers, VMs and cloud services. **Shipped version:** 4.4~ynh3 diff --git a/README_fr.md b/README_fr.md index 8ee709e..ca062df 100644 --- a/README_fr.md +++ b/README_fr.md @@ -11,7 +11,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour ## Vue d'ensemble -Outil pour monitorer des réseaux, des serveurs, des VMs et autres services en ligne +A monitoring tool for diverse IT components, including networks, servers, VMs and cloud services. **Version incluse :** 4.4~ynh3 diff --git a/check_process b/check_process index dea08bc..7d93315 100644 --- a/check_process +++ b/check_process @@ -1,7 +1,7 @@ ;; Test complet ; Manifest domain="domain.tld" - path="/path" + path="/path" admin="john" language="fr_FR" is_public=1 @@ -15,7 +15,10 @@ setup_private=1 setup_public=1 upgrade=1 + # 4.4~ynh1 upgrade=1 from_commit=5cd502c98fdf4731938503541cf64a59aa43eda7 + # 4.4~ynh3 + upgrade=1 from_commit=9c1395710db75a5af897edc6ce6bcc8b1fc2d167 backup_restore=1 multi_instance=0 port_already_use=1 @@ -27,3 +30,5 @@ Notification=none ; commit=5cd502c98fdf4731938503541cf64a59aa43eda7 name=4.4~ynh1. manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr&is_public=1&password=pass&port=PORT& + ; commit=9c1395710db75a5af897edc6ce6bcc8b1fc2d167 + name=4.4~ynh3 diff --git a/conf/nginx.conf b/conf/nginx.conf index 3b51ed0..245e9be 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_http.php; # Common parameter to increase upload size limit in conjunction with dedicated php-fpm file diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md new file mode 100644 index 0000000..2b7c662 --- /dev/null +++ b/doc/DESCRIPTION.md @@ -0,0 +1 @@ +A monitoring tool for diverse IT components, including networks, servers, VMs and cloud services. \ No newline at end of file diff --git a/manifest.json b/manifest.json index 7e25226..7292eda 100644 --- a/manifest.json +++ b/manifest.json @@ -21,7 +21,7 @@ "url": "http://www.librement-votre.fr" }, "requirements": { - "yunohost": ">= 4.1.3" + "yunohost": ">= 4.3.0" }, "multi_instance": false, "services": [ @@ -30,7 +30,7 @@ "mysql" ], "arguments": { - "install" : [ + "install": [ { "name": "domain", "type": "domain" diff --git a/scripts/remove b/scripts/remove index 1cc78c8..f66349f 100644 --- a/scripts/remove +++ b/scripts/remove @@ -59,6 +59,14 @@ ynh_script_progression --message="Removing the MySQL database..." # Remove a database if it exists, along with the associated user ynh_mysql_remove_db --db_user=$db_user --db_name=$db_name +#================================================= +# REMOVE NGINX CONFIGURATION +#================================================= +ynh_script_progression --message="Removing NGINX web server configuration..." + +# Remove the dedicated NGINX config +ynh_remove_nginx_config + #================================================= # REMOVE PHP-FPM CONFIGURATION #================================================= @@ -89,14 +97,6 @@ ynh_script_progression --message="Removing app main directory..." ynh_secure_remove --file="$final_path" ynh_secure_remove --file="/usr/share/$app" -#================================================= -# REMOVE NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Removing NGINX web server configuration..." - -# Remove the dedicated NGINX config -ynh_remove_nginx_config - #================================================= # SPECIFIC REMOVE #=================================================