From 6e00b74648a797f7ecc4ceb85439674caf0510db Mon Sep 17 00:00:00 2001 From: yalh76 Date: Wed, 19 Jan 2022 19:40:05 +0100 Subject: [PATCH] Apply example_ynh --- check_process | 2 +- conf/nginx.conf | 5 ----- doc/DESCRIPTION.md | 1 + manifest.json | 4 ++-- scripts/remove | 16 ++++++++-------- 5 files changed, 12 insertions(+), 16 deletions(-) create mode 100644 doc/DESCRIPTION.md diff --git a/check_process b/check_process index dea08bc..422446a 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 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 #=================================================