From 1d68440f471bd90f34a7406802feab6f1bda3698 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 14 Jan 2022 08:41:07 +0100 Subject: [PATCH 1/2] 1.19.0 --- conf/nginx.conf | 5 ----- manifest.json | 5 ++--- scripts/_common.sh | 2 +- scripts/restore | 3 +-- 4 files changed, 4 insertions(+), 11 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 5cd4c7f..d7fa401 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,10 +1,5 @@ #sub_path_only rewrite ^__PATH__$ __PATH__/ permanent; location __PATH__/ { - - # Force usage of https - if ($scheme = http) { - rewrite ^ https://$server_name$request_uri? permanent; - } proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; diff --git a/manifest.json b/manifest.json index bc3457e..42d2a02 100644 --- a/manifest.json +++ b/manifest.json @@ -6,14 +6,13 @@ "en": "Forum software built for the modern web", "fr": "Logiciel de forum conçu pour le Web moderne" }, - "version": "1.18.5~ynh1", + "version": "1.19.0~ynh1", "url": "https://nodebb.org", "upstream": { "license": "GPL-3.0", "website": "https://nodebb.org", "demo": "https://try.nodebb.org", "admindoc": "https://docs.nodebb.org", - "userdoc": "https://yunohost.org/apps", "code": "https://github.com/NodeBB/NodeBB" }, "license": "GPL-3.0", @@ -22,7 +21,7 @@ "email": "abld@tutanota.com" }, "requirements": { - "yunohost": ">> 4.2.4" + "yunohost": ">> 4.3.0" }, "multi_instance": true, "services": [ diff --git a/scripts/_common.sh b/scripts/_common.sh index 088dd05..b305e6d 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -7,7 +7,7 @@ # dependencies used by the app pkg_dependencies="postgresql" nodejs_version=14 -nodebb_version=v1.18.x +nodebb_version=v1.19.x #================================================= # PERSONAL HELPERS diff --git a/scripts/restore b/scripts/restore index c1dc329..0dfddd8 100644 --- a/scripts/restore +++ b/scripts/restore @@ -40,8 +40,7 @@ db_pwd=$(ynh_app_setting_get --app=$app --key=psqlpwd) #================================================= ynh_script_progression --message="Validating restoration parameters..." --weight=1 -test ! -d $final_path \ - || ynh_die --message="There is already a directory: $final_path " +test ! -d $final_path || ynh_die --message="There is already a directory: $final_path " #================================================= # STANDARD RESTORATION STEPS From 605be175b744eaee7138a7867f9965d223e42da4 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Fri, 14 Jan 2022 07:41:14 +0000 Subject: [PATCH 2/2] Auto-update README --- README.md | 3 +-- README_fr.md | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 6c78a73..f1abd7d 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in NodeBB is built using the Node.js server-side Javascript platform, delivering unmatched performance. Building on this high performance platform means fast and dependable performance that will support even the biggest and most active community. -**Shipped version:** 1.18.5~ynh1 +**Shipped version:** 1.19.0~ynh1 **Demo:** https://try.nodebb.org @@ -33,7 +33,6 @@ Building on this high performance platform means fast and dependable performance ## Documentation and resources * Official app website: https://nodebb.org -* Official user documentation: https://yunohost.org/apps * Official admin documentation: https://docs.nodebb.org * Upstream app code repository: https://github.com/NodeBB/NodeBB * YunoHost documentation for this app: https://yunohost.org/app_nodebb diff --git a/README_fr.md b/README_fr.md index 56686dd..bd7024a 100644 --- a/README_fr.md +++ b/README_fr.md @@ -14,7 +14,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour NodeBB is built using the Node.js server-side Javascript platform, delivering unmatched performance. Building on this high performance platform means fast and dependable performance that will support even the biggest and most active community. -**Version incluse :** 1.18.5~ynh1 +**Version incluse :** 1.19.0~ynh1 **Démo :** https://try.nodebb.org @@ -29,7 +29,6 @@ Building on this high performance platform means fast and dependable performance ## Documentations et ressources * Site officiel de l'app : https://nodebb.org -* Documentation officielle utilisateur : https://yunohost.org/apps * Documentation officielle de l'admin : https://docs.nodebb.org * Dépôt de code officiel de l'app : https://github.com/NodeBB/NodeBB * Documentation YunoHost pour cette app : https://yunohost.org/app_nodebb