From c409d4ca5192a7faa7ca7cf58f678705da578a78 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 5 Jul 2024 03:37:44 +0200 Subject: [PATCH 1/3] Upgrade to v2024.07.04 --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index 73d6475..e7963bf 100644 --- a/manifest.toml +++ b/manifest.toml @@ -7,7 +7,7 @@ name = "Glitch-Soc" description.en = "Libre and federated social network, fork of Mastodon" description.fr = "Réseau social libre et fédéré, scission de Mastodon" -version = "2024.03.20~ynh1" +version = "2024.07.04~ynh1" maintainers = ["Tagada"] @@ -50,8 +50,8 @@ ram.runtime = "500M" [resources] [resources.sources] [resources.sources.main] - url = "https://github.com/glitch-soc/mastodon/archive/3341db939cd077820ad598b0445d02ab2382eaf4.tar.gz" - sha256 = "abf095bbf7f879d35b3e62f3fd4f339ff99b6aac98023fcc836baccfe91a0b97" + url = "https://github.com/glitch-soc/mastodon/archive/05cfe04415084995ccc01b6c737edb39c9dd8411.tar.gz" + sha256 = "a8947d8f1171c1099852f0d1501cecd0ca9ad95c77b69395c4d2e78feebc1142" autoupdate.strategy = "latest_github_commit" From 18161d53bc7186a9d663b9f24303c95fe00f0842 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 5 Jul 2024 01:37:45 +0000 Subject: [PATCH 2/3] Auto-update READMEs --- README.md | 2 +- README_es.md | 2 +- README_eu.md | 2 +- README_fr.md | 2 +- README_gl.md | 2 +- README_zh_Hans.md | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index e0239bb..6ed60c6 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ It shall NOT be edited by hand. See more [on the documentation](https://glitch-soc.github.io/docs/). -**Shipped version:** 2024.03.20~ynh1 +**Shipped version:** 2024.07.04~ynh1 ## Documentation and resources - Official app website: diff --git a/README_es.md b/README_es.md index 820aad5..538030e 100644 --- a/README_es.md +++ b/README_es.md @@ -45,7 +45,7 @@ No se debe editar a mano. See more [on the documentation](https://glitch-soc.github.io/docs/). -**Versión actual:** 2024.03.20~ynh1 +**Versión actual:** 2024.07.04~ynh1 ## Documentaciones y recursos - Sitio web oficial: diff --git a/README_eu.md b/README_eu.md index c1c45b6..f2d2f37 100644 --- a/README_eu.md +++ b/README_eu.md @@ -45,7 +45,7 @@ EZ editatu eskuz. See more [on the documentation](https://glitch-soc.github.io/docs/). -**Paketatutako bertsioa:** 2024.03.20~ynh1 +**Paketatutako bertsioa:** 2024.07.04~ynh1 ## Dokumentazioa eta baliabideak - Aplikazioaren webgune ofiziala: diff --git a/README_fr.md b/README_fr.md index 1d50100..925ebd7 100644 --- a/README_fr.md +++ b/README_fr.md @@ -45,7 +45,7 @@ Il NE doit PAS être modifié à la main. Voir plus [sur la documentation](https://glitch-soc.github.io/docs/) (en anglais). -**Version incluse :** 2024.03.20~ynh1 +**Version incluse :** 2024.07.04~ynh1 ## Documentations et ressources - Site officiel de l’app : diff --git a/README_gl.md b/README_gl.md index a4a2563..cf547fa 100644 --- a/README_gl.md +++ b/README_gl.md @@ -45,7 +45,7 @@ NON debe editarse manualmente. See more [on the documentation](https://glitch-soc.github.io/docs/). -**Versión proporcionada:** 2024.03.20~ynh1 +**Versión proporcionada:** 2024.07.04~ynh1 ## Documentación e recursos - Web oficial da app: diff --git a/README_zh_Hans.md b/README_zh_Hans.md index a39ce8a..2707ac5 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -45,7 +45,7 @@ See more [on the documentation](https://glitch-soc.github.io/docs/). -**分发版本：** 2024.03.20~ynh1 +**分发版本：** 2024.07.04~ynh1 ## 文档与资源 - 官方应用网站： From 51f2e913771f94a3e11b040d6bd4f3fe453aaf6b Mon Sep 17 00:00:00 2001 From: Tagada <36127788+Tagadda@users.noreply.github.com> Date: Fri, 5 Jul 2024 21:10:09 +0200 Subject: [PATCH 3/3] Adds new env variables required by mastodon --- conf/.env.production.sample | 3 +++ scripts/install | 9 +++++++++ scripts/upgrade | 11 +++++++++++ 3 files changed, 23 insertions(+) diff --git a/conf/.env.production.sample b/conf/.env.production.sample index 4bd4d52..bf8ade3 100644 --- a/conf/.env.production.sample +++ b/conf/.env.production.sample @@ -80,6 +80,9 @@ OTP_SECRET=__OTP_SECRET__ VAPID_PRIVATE_KEY=__VAPID_PRIVATE_KEY__ VAPID_PUBLIC_KEY=__VAPID_PUBLIC_KEY__ +ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY=__ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY__ +ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=__ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY__ +ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=__ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT__ # Registrations # ------------- diff --git a/scripts/install b/scripts/install index 94f9a2f..7536183 100644 --- a/scripts/install +++ b/scripts/install @@ -50,6 +50,15 @@ ynh_app_setting_set --app="$app" --key=secret_key_base --value="$secret_key_base otp_secret=$(ynh_string_random --length=128) ynh_app_setting_set --app="$app" --key=otp_secret --value="$otp_secret" +active_record_encryption_primary_key=$(ynh_string_random --length=32) +ynh_app_setting_set --app="$app" --key=active_record_encryption_primary_key --value="$active_record_encryption_primary_key" + +active_record_encryption_deterministic_key=$(ynh_string_random --length=32) +ynh_app_setting_set --app="$app" --key=active_record_encryption_deterministic_key --value="$active_record_encryption_deterministic_key" + +active_record_encryption_key_derivation_salt=$(ynh_string_random --length=32) +ynh_app_setting_set --app="$app" --key=active_record_encryption_key_derivation_salt --value="$active_record_encryption_key_derivation_salt" + #================================================= # INSTALL DEPENDENCIES #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 76db4f9..3b5ee1e 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -24,6 +24,17 @@ fi #Remove previous added repository ynh_remove_extra_repo +if ynh_compare_current_package_version --comparison lt --version 2024.05.01~ynh1; then + active_record_encryption_primary_key=$(ynh_string_random --length=32) + ynh_app_setting_set --app="$app" --key=active_record_encryption_primary_key --value="$active_record_encryption_primary_key" + + active_record_encryption_deterministic_key=$(ynh_string_random --length=32) + ynh_app_setting_set --app="$app" --key=active_record_encryption_deterministic_key --value="$active_record_encryption_deterministic_key" + + active_record_encryption_key_derivation_salt=$(ynh_string_random --length=32) + ynh_app_setting_set --app="$app" --key=active_record_encryption_key_derivation_salt --value="$active_record_encryption_key_derivation_salt" +fi + #================================================= # STOP SYSTEMD SERVICE #=================================================