From c092dc773555df1f2e471a29ab1cc4fec546b8cd Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 28 Jul 2021 06:56:38 +0200 Subject: [PATCH 1/5] Upgrade to 3.4.0 --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 398e25c..7f50119 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -9,7 +9,7 @@ pkg_dependencies="" nodejs_version=14 -facilmap_version=3.3.0 +facilmap_version=3.4.0 #================================================= # PERSONAL HELPERS From 34463779661b7877c1a2612d43cd00e03cb922c9 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 21 Nov 2021 10:04:52 +0100 Subject: [PATCH 2/5] cleaning up --- conf/nginx.conf | 5 ----- manifest.json | 5 ++--- scripts/_common.sh | 3 --- scripts/install | 1 - scripts/restore | 3 --- scripts/upgrade | 1 - 6 files changed, 2 insertions(+), 16 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 244e4cc..7003b29 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,11 +1,6 @@ #sub_path_only rewrite ^__PATH__$ __PATH__/ permanent; location __PATH__/ { - # 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 0feacd2..aa89b95 100644 --- a/manifest.json +++ b/manifest.json @@ -23,7 +23,7 @@ "url": "https://squeak.eauchat.org" }, "requirements": { - "yunohost": ">= 4.2.4" + "yunohost": ">= 4.3.0" }, "multi_instance": true, "services": [ @@ -34,8 +34,7 @@ "install" : [ { "name": "domain", - "type": "domain", - "example": "example.com" + "type": "domain" }, { "name": "path", diff --git a/scripts/_common.sh b/scripts/_common.sh index 7f50119..aeabb7d 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,9 +4,6 @@ # COMMON VARIABLES #================================================= -# dependencies used by the app -pkg_dependencies="" - nodejs_version=14 facilmap_version=3.4.0 diff --git a/scripts/install b/scripts/install index 08201b1..c0ca828 100755 --- a/scripts/install +++ b/scripts/install @@ -78,7 +78,6 @@ ynh_app_setting_set --app=$app --key=port --value=$port #================================================= ynh_script_progression --message="Installing dependencies..." --weight=6 -ynh_install_app_dependencies $pkg_dependencies ynh_install_nodejs --nodejs_version=$nodejs_version #================================================= diff --git a/scripts/restore b/scripts/restore index 1ed2dab..5bbfdde 100755 --- a/scripts/restore +++ b/scripts/restore @@ -38,8 +38,6 @@ db_user=$db_name #================================================= ynh_script_progression --message="Validating restoration parameters..." --weight=2 -ynh_webpath_available --domain=$domain --path_url=$path_url \ - || ynh_die --message="Path not available: ${domain}${path_url}" test ! -d $final_path \ || ynh_die --message="There is already a directory: $final_path " @@ -78,7 +76,6 @@ chown -R $app:www-data "$final_path" ynh_script_progression --message="Reinstalling dependencies..." --weight=10 # Define and install dependencies -ynh_install_app_dependencies $pkg_dependencies ynh_install_nodejs --nodejs_version=$nodejs_version #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 2e29f94..44a2d74 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -81,7 +81,6 @@ ynh_add_nginx_config #================================================= ynh_script_progression --message="Upgrading dependencies..." --weight=10 -ynh_install_app_dependencies $pkg_dependencies ynh_install_nodejs --nodejs_version=$nodejs_version #================================================= From a67d23bff43c4a227c9a5a3c288bea77b29f2e5a Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 22 Nov 2021 17:16:54 +0100 Subject: [PATCH 3/5] Update install --- scripts/install | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index c0ca828..ff3ab13 100755 --- a/scripts/install +++ b/scripts/install @@ -102,7 +102,7 @@ ynh_system_user_create --username=$app --home_dir="$final_path" #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= -ynh_script_progression --message="Setting up source files..." --weight=100 +ynh_script_progression --message="Setting up source files..." --weight=10 ynh_app_setting_set --app=$app --key=final_path --value=$final_path @@ -119,7 +119,7 @@ ynh_add_nginx_config #================================================= # BUILD NODE DEPENDENCIES #================================================= -ynh_script_progression --message="Building node dependencies..." --weight=200 +ynh_script_progression --message="Building node dependencies..." --weight=20 mkdir -p $final_path chown -R $app $final_path From 665085d65886b03fb76b1007af1c467278a1b97a Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Mon, 29 Nov 2021 18:38:25 +0100 Subject: [PATCH 4/5] Bump version to 3.4.0 --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 280456c..3f539da 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Collaborative maps and routing with a straightforward interface", "fr": "Carte collaborative avec une interface simple et pratique" }, - "version": "3.3.0~ynh2", + "version": "3.4.0~ynh1", "url": "https://github.com/FacilMap/facilmap", "upstream": { "license": "AGPL-3.0", From 62dd95880edaad86042f23b64dd6b626c5f4762b Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Mon, 29 Nov 2021 17:38:28 +0000 Subject: [PATCH 5/5] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index cc68c34..7313020 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Collaborative maps and routing with a straightforward interface -**Shipped version:** 3.3.0~ynh2 +**Shipped version:** 3.4.0~ynh1 **Demo:** https://facilmap.org/ diff --git a/README_fr.md b/README_fr.md index 57ec4a6..03ac7e9 100644 --- a/README_fr.md +++ b/README_fr.md @@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Carte collaborative avec une interface simple et pratique -**Version incluse :** 3.3.0~ynh2 +**Version incluse :** 3.4.0~ynh1 **Démo :** https://facilmap.org/