From ad8ba251efc734aadc228f641601616e79ffdfab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 26 Aug 2022 21:33:10 +0200 Subject: [PATCH 1/6] Fix path --- manifest.json | 2 +- scripts/upgrade | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index eab33ff..ce71f36 100644 --- a/manifest.json +++ b/manifest.json @@ -21,7 +21,7 @@ "email": "" }, "requirements": { - "yunohost": ">= 4.3.0" + "yunohost": ">= 11.0.9" }, "multi_instance": true, "services": [ diff --git a/scripts/upgrade b/scripts/upgrade index 034e5df..2a17b49 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -83,7 +83,7 @@ then ynh_script_progression --message="Upgrading source files..." --weight=5 # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$final_path" --keep="$final_path/.env" + ynh_setup_source --dest_dir="$final_path" --keep=".env" fi chmod 750 "$final_path" From 819ec64beea07b1a3c10c0e32a359f80f1aa5ae7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 26 Aug 2022 23:10:22 +0200 Subject: [PATCH 2/6] Update nginx.conf --- conf/nginx.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 9a8bed9..acbcc51 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,4 +1,5 @@ -location / { +#sub_path_only rewrite ^__PATH__$ __PATH__/ permanent; +location __PATH__/ { proxy_pass http://127.0.0.1:__PORT__; proxy_set_header X-Real-IP $remote_addr; From f4081e2cda5e355ca24c32b3c115322435c6f64a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 6 Sep 2022 08:18:27 +0200 Subject: [PATCH 3/6] Fix --- conf/app.src | 4 ++-- manifest.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/app.src b/conf/app.src index d52772c..4258024 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/mikecao/umami/archive/refs/tags/v1.37.0.tar.gz -SOURCE_SUM=39290871484579fa1176edd6d1b266bc8d77175881c0f50553ba95088da8d517 +SOURCE_URL=https://github.com/mikecao/umami/archive/refs/tags/v1.38.0.tar.gz +SOURCE_SUM=69f1f0704c947c1874e779a5e76237502c4e5a9ab74609987e4a3f36c54ae522 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 5027da6..db0f75c 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Simple, fast, privacy-focused alternative to Google Analytics", "fr": "Analyse de trafic web simple et respectueux" }, - "version": "1.37.0~ynh1", + "version": "1.38.0~ynh1", "url": "https://umami.is/", "upstream": { "license": "MIT", From 7d7ede2445651670720df50277878daf197b0b80 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 6 Sep 2022 06:18:33 +0000 Subject: [PATCH 4/6] 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 a6e2a72..89ac9e5 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ Umami is a simple, easy to use, self-hosted web analytics solution. The goal is - Open-source -**Shipped version:** 1.37.0~ynh1 +**Shipped version:** 1.38.0~ynh1 **Demo:** https://app.umami.is/share/8rmHaheU/umami.is diff --git a/README_fr.md b/README_fr.md index bcab1f7..aba9adc 100644 --- a/README_fr.md +++ b/README_fr.md @@ -31,7 +31,7 @@ Umami is a simple, easy to use, self-hosted web analytics solution. The goal is - Open-source -**Version incluse :** 1.37.0~ynh1 +**Version incluse :** 1.38.0~ynh1 **Démo :** https://app.umami.is/share/8rmHaheU/umami.is From 48167495fa44ee510cdaf3d31cd3edfec58388bd Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 20 Oct 2022 12:02:49 +0200 Subject: [PATCH 5/6] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 514a447..fcf7c5b 100755 --- a/scripts/install +++ b/scripts/install @@ -130,7 +130,7 @@ chown $app:$app "$final_path/.env" ynh_script_progression --message="Configuring the app..." --weight=15 pushd $final_path - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn install + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn install --production ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn build ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn update-db popd From 726890af96b8f0350512dd4f799311993122eb6a Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 20 Oct 2022 10:02:59 +0000 Subject: [PATCH 6/6] Auto-update README --- README.md | 1 - README_fr.md | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/README.md b/README.md index 89ac9e5..49181a3 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,6 @@ Umami is a simple, easy to use, self-hosted web analytics solution. The goal is **Shipped version:** 1.38.0~ynh1 - **Demo:** https://app.umami.is/share/8rmHaheU/umami.is ## Screenshots diff --git a/README_fr.md b/README_fr.md index aba9adc..5bc1ee1 100644 --- a/README_fr.md +++ b/README_fr.md @@ -31,8 +31,7 @@ Umami is a simple, easy to use, self-hosted web analytics solution. The goal is - Open-source -**Version incluse :** 1.38.0~ynh1 - +**Version incluse :** 1.38.0~ynh1 **Démo :** https://app.umami.is/share/8rmHaheU/umami.is