From 692696225a0e1dc950b7e9271c7f3a847484760b Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 20 Nov 2021 22:25:50 +0100 Subject: [PATCH] Fix --- conf/app.src | 5 ++--- conf/nginx.conf | 4 ---- manifest.json | 5 ++--- scripts/install | 4 ++-- 4 files changed, 6 insertions(+), 12 deletions(-) diff --git a/conf/app.src b/conf/app.src index 2b3a701..41c9e20 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,6 +1,5 @@ -SOURCE_URL=https://github.com/timeoff-management/timeoff-management-application/archive/refs/tags/1.3.3.tar.gz -SOURCE_SUM=e320350dbf1d1ce272cee1db845e3658945d57e49eb97a56df3d00cf63ab6fe6 +SOURCE_URL=https://github.com/timeoff-management/timeoff-management-application/archive/refs/tags/1.4.0.tar.gz +SOURCE_SUM=2831826b689cf1f4bc7e7ae03ac42c4c846a56a8c3e1368f3a1326f46977cdcc SOURCE_SUM_PRG=sha256sum ARCH_FORMAT=tar.gz SOURCE_IN_SUBDIR=true -SOURCE_FILENAME= diff --git a/conf/nginx.conf b/conf/nginx.conf index 9b08268..a927d57 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,8 +1,4 @@ location __PATH__/ { - - if ($scheme = http) { - rewrite ^ https://$server_name$request_uri? permanent; - } proxy_pass http://127.0.0.1:__PORT__/; proxy_set_header Host $host; diff --git a/manifest.json b/manifest.json index 63f3da9..a78ceef 100644 --- a/manifest.json +++ b/manifest.json @@ -21,7 +21,7 @@ "email": "ju@paraiso.me" }, "requirements": { - "yunohost": ">= 4.2.4" + "yunohost": ">= 4.3.0" }, "multi_instance": false, "services": [ @@ -31,8 +31,7 @@ "install" : [ { "name": "domain", - "type": "domain", - "example": "example.com" + "type": "domain" }, { "name": "is_public", diff --git a/scripts/install b/scripts/install index 348f87f..df9bf0e 100644 --- a/scripts/install +++ b/scripts/install @@ -136,7 +136,7 @@ ynh_script_progression --message="Installing TimeOff..." pushd $final_path ynh_use_nodejs - ynh_exec_warn_less NODE_ENV=production npm install -g npm + ynh_exec_as $app env $ynh_node_load_PATH npm install -g npm popd #================================================= @@ -153,7 +153,7 @@ ynh_add_config --template="../conf/db.json" --destination="$final_path/config/db ynh_script_progression --message="Configuring a systemd service..." ynh_replace_string --match_string="__ENV_PATH__" --replace_string="$PATH" --target_file="../conf/systemd.service" -ynh_replace_string --match_string="__YNH_NODE__" --replace_string="$ynh_node" --target_file="../conf/systemd.service" + ynh_add_systemd_config #=================================================