From dff0c5aee7c28496659011ff63ec5383d6e63066 Mon Sep 17 00:00:00 2001 From: orhtej2 <2871798+orhtej2@users.noreply.github.com> Date: Fri, 8 Sep 2023 12:01:47 +0200 Subject: [PATCH 1/4] Nuke build directory before update. --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 28dce37..af90e8c 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -46,7 +46,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="$install_dir" #--keep=".env" + ynh_setup_source --dest_dir="$install_dir" --full_replace=1 #--keep=".env" fi chmod -R o-rwx "$install_dir" From d973ab85e612d3809ae10ced18038e5bf599153b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 8 Sep 2023 13:29:46 +0200 Subject: [PATCH 2/4] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index eb56f2c..bc44416 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~ynh2" +version = "2.6.2~ynh3" maintainers = ["eric_G"] From 7c1ed2b7522785e287f38e8fc746eb9ee4c73973 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 8 Sep 2023 11:29:52 +0000 Subject: [PATCH 3/4] 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 9f43fb4..adc23c1 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~ynh2 +**Shipped version:** 2.6.2~ynh3 **Demo:** https://app.umami.is/share/8rmHaheU/umami.is diff --git a/README_fr.md b/README_fr.md index c35e3f8..f4eee48 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~ynh2 +**Version incluse :** 2.6.2~ynh3 **Démo :** https://app.umami.is/share/8rmHaheU/umami.is From 27cc7693dc28ac243944bf6a2b722668d3931a82 Mon Sep 17 00:00:00 2001 From: orhtej2 <2871798+orhtej2@users.noreply.github.com> Date: Mon, 11 Sep 2023 12:12:49 +0200 Subject: [PATCH 4/4] Disable umami and next.js telemetry. --- conf/.env | 2 +- conf/systemd.service | 3 ++- scripts/install | 2 +- scripts/upgrade | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/conf/.env b/conf/.env index e2d7381..865c609 100644 --- a/conf/.env +++ b/conf/.env @@ -1,5 +1,5 @@ DATABASE_TYPE=postgresql DATABASE_URL=postgresql://__DB_USER__:__DB_PWD__@127.0.0.1:5432/__DB_NAME__ -DISABLE_TELEMETRY=0 +DISABLE_TELEMETRY=1 PORT=__PORT__ DEFAULT_LOCALE="__LANGUAGE__" diff --git a/conf/systemd.service b/conf/systemd.service index cb2ee0d..3606d61 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -7,8 +7,9 @@ Type=simple User=__APP__ Group=__APP__ WorkingDirectory=__INSTALL_DIR__/ -#Environment=NODE_ENV=production +Environment=NODE_ENV=production Environment="__YNH_NODE_LOAD_PATH__" +Environment=NEXT_TELEMETRY_DISABLED=1 ExecStart=__YNH_NPM__ run start-env # Sandboxing options to harden security diff --git a/scripts/install b/scripts/install index 6d4e23c..91403ca 100755 --- a/scripts/install +++ b/scripts/install @@ -59,7 +59,7 @@ ynh_script_progression --message="Configuring the app..." --weight=15 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 yarn build + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH NEXT_TELEMETRY_DISABLED=1 yarn build popd #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index af90e8c..ab27cd3 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -91,7 +91,7 @@ ynh_script_progression --message="Configuring the app..." --weight=15 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 yarn build + 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