From 60d8cbe481ec12c2821f2bc1a0f718ecb21110e6 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 31 Jan 2022 23:25:11 +0100 Subject: [PATCH 1/2] Set env path --- scripts/install | 3 +-- scripts/upgrade | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/scripts/install b/scripts/install index 23c4c4d..6dbebbe 100644 --- a/scripts/install +++ b/scripts/install @@ -107,8 +107,7 @@ ynh_add_nginx_config #================================================= ynh_script_progression --message="Configuring a systemd service..." --weight=1 -ynh_replace_string --match_string="__ENV_PATH__" --replace_string="$PATH" --target_file="../conf/systemd.service" - +env_path="$PATH" ynh_add_systemd_config #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 0cafe05..ec81c07 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -134,8 +134,7 @@ popd #================================================= ynh_script_progression --message="Upgrading systemd configuration..." --weight=1 -ynh_replace_string --match_string="__ENV_PATH__" --replace_string="$PATH" --target_file="../conf/systemd.service" - +env_path="$PATH" # Create a dedicated systemd config ynh_add_systemd_config From eed8dac48b149f77416b68c38b31daa51273d710 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 31 Jan 2022 23:25:54 +0100 Subject: [PATCH 2/2] Set 4.3 --- conf/nginx.conf | 5 ----- manifest.json | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 6f67957..1fd74de 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,10 +1,5 @@ location ^~ / { - # Force usage of https - if ($scheme = http) { - rewrite ^ https://$server_name$request_uri? permanent; - } - proxy_pass http://127.0.0.1:__PORT__; proxy_redirect off; proxy_set_header Host $host; diff --git a/manifest.json b/manifest.json index dc4451c..dbe6564 100644 --- a/manifest.json +++ b/manifest.json @@ -22,7 +22,7 @@ "url": "https://frju365.yunohost.support" }, "requirements": { - "yunohost": ">= 4.2.4" + "yunohost": ">= 4.3.0" }, "multi_instance": false, "services": [