From d68b05b0632802321db7803cd31e3a1b612dbeeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Wed, 17 Apr 2024 02:29:35 +0200 Subject: [PATCH 1/4] Upgrade synapse to 1.105.0 --- conf/requirement_bookworm.txt | 14 +++++++------- conf/requirement_bullseye.txt | 14 +++++++------- manifest.toml | 10 +++++----- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/conf/requirement_bookworm.txt b/conf/requirement_bookworm.txt index 038ad41..b62ba9f 100644 --- a/conf/requirement_bookworm.txt +++ b/conf/requirement_bookworm.txt @@ -10,7 +10,7 @@ charset-normalizer==3.3.2 constantly==23.10.4 cryptography==42.0.5 hyperlink==21.0.0 -idna==3.6 +idna==3.7 ijson==3.2.3 immutabledict==4.2.0 incremental==22.10.0 @@ -21,21 +21,21 @@ ldap3==2.9.1 lxml==5.2.1 MarkupSafe==2.1.5 matrix-common==1.3.0 -matrix-synapse==1.104.0 +matrix-synapse==1.105.0 matrix-synapse-ldap3==0.3.0 msgpack==1.0.8 ndg-httpsclient==0.5.1 netaddr==1.2.1 packaging==24.0 -phonenumbers==8.13.33 +phonenumbers==8.13.34 pillow==10.3.0 prometheus_client==0.20.0 psycopg2==2.9.9 pyasn1==0.6.0 pyasn1_modules==0.4.0 pycparser==2.22 -pydantic==2.6.4 -pydantic_core==2.16.3 +pydantic==2.7.0 +pydantic_core==2.18.1 pymacaroons==0.13.0 PyNaCl==1.5.0 pyOpenSSL==24.1.0 @@ -51,8 +51,8 @@ six==1.16.0 sortedcontainers==2.4.0 treq==23.11.0 Twisted==24.3.0 -typing_extensions==4.10.0 +typing_extensions==4.11.0 unpaddedbase64==2.1.0 urllib3==2.2.1 webencodings==0.5.1 -zope.interface==6.2 +zope.interface==6.3 diff --git a/conf/requirement_bullseye.txt b/conf/requirement_bullseye.txt index ddd38f4..2179cc0 100644 --- a/conf/requirement_bullseye.txt +++ b/conf/requirement_bullseye.txt @@ -10,7 +10,7 @@ charset-normalizer==3.3.2 constantly==23.10.4 cryptography==42.0.5 hyperlink==21.0.0 -idna==3.6 +idna==3.7 ijson==3.2.3 immutabledict==4.2.0 incremental==22.10.0 @@ -21,21 +21,21 @@ ldap3==2.9.1 lxml==5.2.1 MarkupSafe==2.1.5 matrix-common==1.3.0 -matrix-synapse==1.104.0 +matrix-synapse==1.105.0 matrix-synapse-ldap3==0.3.0 msgpack==1.0.8 ndg-httpsclient==0.5.1 netaddr==1.2.1 packaging==24.0 -phonenumbers==8.13.33 +phonenumbers==8.13.34 pillow==10.3.0 prometheus_client==0.20.0 psycopg2==2.9.9 pyasn1==0.6.0 pyasn1_modules==0.4.0 pycparser==2.22 -pydantic==2.6.4 -pydantic_core==2.16.3 +pydantic==2.7.0 +pydantic_core==2.18.1 pymacaroons==0.13.0 PyNaCl==1.5.0 pyOpenSSL==24.1.0 @@ -52,8 +52,8 @@ sortedcontainers==2.4.0 tomli==2.0.1 treq==23.11.0 Twisted==24.3.0 -typing_extensions==4.10.0 +typing_extensions==4.11.0 unpaddedbase64==2.1.0 urllib3==2.2.1 webencodings==0.5.1 -zope.interface==6.2 +zope.interface==6.3 diff --git a/manifest.toml b/manifest.toml index 2ce52f0..2d56a24 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Synapse" description.en = "Instant messaging server which uses Matrix" description.fr = "Serveur de messagerie instantané basé sur Matrix" -version = "1.104.0~ynh1" +version = "1.105.0~ynh1" maintainers = ["Josué Tille"] @@ -63,13 +63,13 @@ ram.runtime = "1G" [resources] [resources.sources.synapse_prebuilt_armv7_bookworm] prefetch = false - armhf.url = "https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.104.0/matrix-synapse_1.104.0-bookworm-bin1_armv7l.tar.gz" - armhf.sha256 = "880c3507a424277cd5414363e22dc2018407e572c5f7bb388a6560707ae4231e" + armhf.url = "https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.105.0/matrix-synapse_1.105.0-bookworm-bin1_armv7l.tar.gz" + armhf.sha256 = "8d997452056311b97f3a758cf1e1673dc8b9463d9dc1abb696f01a5335344470" [resources.sources.synapse_prebuilt_armv7_bullseye] prefetch = false - armhf.url = "https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.104.0/matrix-synapse_1.104.0-bullseye-bin1_armv7l.tar.gz" - armhf.sha256 = "8f2f957d25566e5051aa0d5c88bcedacf6ea1615cc7aca84491a7ded84fbae11" + armhf.url = "https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.105.0/matrix-synapse_1.105.0-bullseye-bin1_armv7l.tar.gz" + armhf.sha256 = "6721340e6ef15ba7e90715d0e7f0d316f045123a0517b5294cc889b0a47c0185" [resources.system_user] allow_email = true From ebfcb9f0810cc64f6909e057119bb5304709c437 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 17 Apr 2024 06:25:34 +0000 Subject: [PATCH 2/4] Auto-update READMEs --- README.md | 2 +- README_eu.md | 2 +- README_fr.md | 2 +- README_gl.md | 2 +- README_zh_Hans.md | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 44fe87f..bebfe13 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ Instant messaging server matrix network. Yunohost chatroom with matrix : [https://matrix.to/#/#yunohost:matrix.org](https://matrix.to/#/#yunohost:matrix.org) -**Shipped version:** 1.104.0~ynh1 +**Shipped version:** 1.105.0~ynh1 ## Documentation and resources - Official app website: diff --git a/README_eu.md b/README_eu.md index a883d88..1204e74 100644 --- a/README_eu.md +++ b/README_eu.md @@ -21,7 +21,7 @@ Instant messaging server matrix network. Yunohost chatroom with matrix : [https://matrix.to/#/#yunohost:matrix.org](https://matrix.to/#/#yunohost:matrix.org) -**Paketatutako bertsioa:** 1.104.0~ynh1 +**Paketatutako bertsioa:** 1.105.0~ynh1 ## Dokumentazioa eta baliabideak - Aplikazioaren webgune ofiziala: diff --git a/README_fr.md b/README_fr.md index 1eef383..4c672a7 100644 --- a/README_fr.md +++ b/README_fr.md @@ -21,7 +21,7 @@ Instant messaging server matrix network. Yunohost chatroom with matrix : [https://matrix.to/#/#yunohost:matrix.org](https://matrix.to/#/#yunohost:matrix.org) -**Version incluse :** 1.104.0~ynh1 +**Version incluse :** 1.105.0~ynh1 ## Documentations et ressources - Site officiel de l’app : diff --git a/README_gl.md b/README_gl.md index b52f8c3..48f62a1 100644 --- a/README_gl.md +++ b/README_gl.md @@ -21,7 +21,7 @@ Instant messaging server matrix network. Yunohost chatroom with matrix : [https://matrix.to/#/#yunohost:matrix.org](https://matrix.to/#/#yunohost:matrix.org) -**Versión proporcionada:** 1.104.0~ynh1 +**Versión proporcionada:** 1.105.0~ynh1 ## Documentación e recursos - Web oficial da app: diff --git a/README_zh_Hans.md b/README_zh_Hans.md index 935f098..7fcb0c6 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -21,7 +21,7 @@ Instant messaging server matrix network. Yunohost chatroom with matrix : [https://matrix.to/#/#yunohost:matrix.org](https://matrix.to/#/#yunohost:matrix.org) -**分发版本：** 1.104.0~ynh1 +**分发版本：** 1.105.0~ynh1 ## 文档与资源 - 官方应用网站： From b7e6a352a19c3f47f657358c8f7d0f79cb37d9d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Wed, 17 Apr 2024 08:44:41 +0200 Subject: [PATCH 3/4] Move turn server password definition in same place than other definition --- scripts/_common.sh | 5 +++++ scripts/install | 3 --- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 1c22c97..24ce3ae 100755 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -102,6 +102,11 @@ ensure_vars_set() { ynh_app_setting_set --app="$app" --key=e2e_enabled_by_default --value="$e2e_enabled_by_default" fi + if [ -z "${turnserver_pwd:-}" ]; then + turnserver_pwd=$(ynh_string_random --length=30) + ynh_app_setting_set --app="$app" --key=turnserver_pwd --value="$turnserver_pwd" + fi + if [ -z "${web_client_location:-}" ] then web_client_location="https://matrix.to/" diff --git a/scripts/install b/scripts/install index 530964c..9d7f46a 100644 --- a/scripts/install +++ b/scripts/install @@ -156,9 +156,6 @@ configure_nginx #================================================= ynh_script_progression --message="Configuring Synapse..." --weight=2 -# Find password for turnserver and database -turnserver_pwd=$(ynh_string_random --length=30) -ynh_app_setting_set --app=$app --key=turnserver_pwd --value=$turnserver_pwd ynh_add_jinja_config --template="homeserver.yaml" --destination="/etc/matrix-$app/homeserver.yaml" ynh_add_config --template="log.yaml" --destination="/etc/matrix-$app/log.yaml" From 77aca763d65d97028ffc297a2282d2704ba53c45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nathana=C3=ABl?= <7300309+nathanael-h@users.noreply.github.com> Date: Wed, 17 Apr 2024 15:41:08 +0200 Subject: [PATCH 4/4] chg: fix user in update_synapse_for_appservice.sh Since the migration to the packaging v2 in https://github.com/YunoHost-Apps/synapse_ynh/pull/426 the system user for this app is $app and not matrix-$app anymore. --- sources/update_synapse_for_appservice.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sources/update_synapse_for_appservice.sh b/sources/update_synapse_for_appservice.sh index bf6979c..5abacfe 100644 --- a/sources/update_synapse_for_appservice.sh +++ b/sources/update_synapse_for_appservice.sh @@ -18,8 +18,8 @@ for f in $(ls /etc/matrix-$app/app-service/); do done # Set permissions -chown matrix-$app $service_config_file -chown matrix-$app /etc/matrix-$app/app-service/* +chown $app $service_config_file +chown $app /etc/matrix-$app/app-service/* chmod 600 $service_config_file chmod 600 /etc/matrix-$app/app-service/*