From b3702fc5ec085972dcd737f607e2f4233cf250e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 21 Sep 2023 09:52:55 +0200 Subject: [PATCH 1/6] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index bc44416..0c56949 100644 --- a/manifest.toml +++ b/manifest.toml @@ -62,7 +62,7 @@ ram.runtime = "50M" api.url = "/api" api.show_tile = false api.allowed = "visitors" - api.auth_header = false + api.auth_header = false script.url = "/script.js" script.show_tile = false script.allowed = "visitors" From 0416e4b9778e5d30b06b3f613bb629b5ae639505 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 21 Sep 2023 09:53:39 +0200 Subject: [PATCH 2/6] Update _common.sh --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 9195d57..44277c5 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,7 +4,7 @@ # COMMON VARIABLES #================================================= -nodejs_version=18 +nodejs_version=20 #================================================= # PERSONAL HELPERS From f2e0577f23f5bd30593e4ab32b90910b2ebcbb6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 21 Sep 2023 11:24:01 +0200 Subject: [PATCH 3/6] Update _common.sh --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 44277c5..9195d57 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,7 +4,7 @@ # COMMON VARIABLES #================================================= -nodejs_version=20 +nodejs_version=18 #================================================= # PERSONAL HELPERS From 14b2a166adce28cb7d1131c37e099f53e54c65b4 Mon Sep 17 00:00:00 2001 From: orhtej2 <2871798+orhtej2@users.noreply.github.com> Date: Thu, 21 Sep 2023 13:11:33 +0200 Subject: [PATCH 4/6] Provision pgcrypto outside of prisma migration. --- scripts/install | 4 ++++ scripts/restore | 2 ++ scripts/upgrade | 5 ++++- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 91403ca..4beff87 100755 --- a/scripts/install +++ b/scripts/install @@ -51,6 +51,10 @@ ynh_add_config --template="../conf/.env" --destination="$install_dir/.env" chmod 650 "$install_dir/.env" chown $app:$app "$install_dir/.env" +ynh_script_progression --message="Provisioning pgcrypto..." --weight=1 + +ynh_psql_execute_as_root --sql="CREATE EXTENSION IF NOT EXISTS pgcrypto;" --database="$db_name" + #================================================= # CONFIGURE THE APP #================================================= diff --git a/scripts/restore b/scripts/restore index e214e48..266e8b5 100755 --- a/scripts/restore +++ b/scripts/restore @@ -35,6 +35,8 @@ ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version #================================================= ynh_script_progression --message="Restoring the database..." --weight=6 +ynh_psql_execute_as_root --sql="CREATE EXTENSION IF NOT EXISTS pgcrypto;" --database="$db_name" + ynh_psql_execute_file_as_root --file="./db.sql" --database=$db_name #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index ab27cd3..17363d2 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -83,6 +83,10 @@ ynh_add_config --template="../conf/.env" --destination="$install_dir/.env" chmod 650 "$install_dir/.env" chown $app:$app "$install_dir/.env" +ynh_script_progression --message="Provisioning pgcrypto..." --weight=1 + +ynh_psql_execute_as_root --sql="CREATE EXTENSION IF NOT EXISTS pgcrypto;" --database="$db_name" + #================================================= # CONFIGURE THE APP #================================================= @@ -92,7 +96,6 @@ pushd $install_dir ynh_use_nodejs 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 NEXT_TELEMETRY_DISABLED=1 yarn build - #ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH npx @umami/migrate-v1-v2@latest popd #================================================= From 3a8e967c1458412a53a2e7c5e001fb11b16adb76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 21 Sep 2023 18:07:47 +0200 Subject: [PATCH 5/6] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 0c56949..7695946 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Umami" description.en = "Simple, fast, privacy-focused alternative to Google Analytics" description.fr = "Analyse de trafic web simple et respectueux" -version = "2.6.2~ynh3" +version = "2.6.2~ynh4" maintainers = ["eric_G"] From acb0042e0fa53ba01316602c2a47823a5e1b5309 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 21 Sep 2023 16:07:52 +0000 Subject: [PATCH 6/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 adc23c1..c4ff5b8 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 - Privacy-focused -**Shipped version:** 2.6.2~ynh3 +**Shipped version:** 2.6.2~ynh4 **Demo:** https://app.umami.is/share/8rmHaheU/umami.is diff --git a/README_fr.md b/README_fr.md index f4eee48..97fb6d7 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 - Privacy-focused -**Version incluse :** 2.6.2~ynh3 +**Version incluse :** 2.6.2~ynh4 **Démo :** https://app.umami.is/share/8rmHaheU/umami.is