From bd3b28ee6324b683f1f7c215ade3a464c116292e Mon Sep 17 00:00:00 2001 From: tituspijean Date: Tue, 13 Feb 2024 20:56:04 +0100 Subject: [PATCH 1/3] Give higher .well-known priority vs nextcloud --- conf/server_name.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/server_name.conf b/conf/server_name.conf index 4cb77de..578cfa7 100644 --- a/conf/server_name.conf +++ b/conf/server_name.conf @@ -1,10 +1,10 @@ -location /.well-known/matrix/server { +location = /.well-known/matrix/server { return 200 '{"m.server": "__DOMAIN__:__SYNAPSE_TLS_PORT__"}'; add_header Content-Type application/json; add_header Access-Control-Allow-Origin '*'; } -location /.well-known/matrix/client { +location = /.well-known/matrix/client { return 200 '{ "m.homeserver": { "base_url": "https://__DOMAIN__" }, "im.vector.riot.jitsi": {"preferredDomain": "__JITSI_SERVER__"}, From ab159eebbee97d2d17ca7d0d42c88f44c81c58c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Wed, 14 Feb 2024 02:06:17 +0100 Subject: [PATCH 2/3] Upgrade synapse to 1.101.0 --- conf/armv7_bookworm.src | 4 ++-- conf/armv7_bullseye.src | 4 ++-- conf/requirement_bookworm.txt | 16 ++++++++-------- conf/requirement_bullseye.txt | 16 ++++++++-------- manifest.json | 2 +- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/conf/armv7_bookworm.src b/conf/armv7_bookworm.src index 3ad69c1..dde29fa 100644 --- a/conf/armv7_bookworm.src +++ b/conf/armv7_bookworm.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.100.0/matrix-synapse_1.100.0-bookworm-bin1_armv7l.tar.gz -SOURCE_SUM=8a3b27f951761430949c845e3f7c01c66d472c893f87e6f3246937dd815f10ec +SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.101.0/matrix-synapse_1.101.0-bookworm-bin1_armv7l.tar.gz +SOURCE_SUM=26b1e23d04bd23b924ea343eeff0cbddc33dff54de73034ed51c10872a0abf6f # (Optional) Program to check the integrity (sha256sum, md5sum...) # default: sha256 SOURCE_SUM_PRG=sha256sum diff --git a/conf/armv7_bullseye.src b/conf/armv7_bullseye.src index e5b5c25..a9ed05d 100644 --- a/conf/armv7_bullseye.src +++ b/conf/armv7_bullseye.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.100.0/matrix-synapse_1.100.0-bullseye-bin1_armv7l.tar.gz -SOURCE_SUM=968d71330eb0ed4aed50d6e467045a9710242e14092670e5b463cf10a392047b +SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.101.0/matrix-synapse_1.101.0-bullseye-bin1_armv7l.tar.gz +SOURCE_SUM=87046651724467fe504735a30debf518925b2995e2e2c8d34285c60bcb567a59 # (Optional) Program to check the integrity (sha256sum, md5sum...) # default: sha256 SOURCE_SUM_PRG=sha256sum diff --git a/conf/requirement_bookworm.txt b/conf/requirement_bookworm.txt index e7d3a77..7ac8ca7 100644 --- a/conf/requirement_bookworm.txt +++ b/conf/requirement_bookworm.txt @@ -4,7 +4,7 @@ Automat==22.10.0 bcrypt==4.1.2 bleach==6.1.0 canonicaljson==2.0.0 -certifi==2023.11.17 +certifi==2024.2.2 cffi==1.16.0 charset-normalizer==3.3.2 constantly==23.10.4 @@ -19,30 +19,30 @@ jsonschema==4.21.1 jsonschema-specifications==2023.12.1 ldap3==2.9.1 lxml==5.1.0 -MarkupSafe==2.1.4 +MarkupSafe==2.1.5 matrix-common==1.3.0 -matrix-synapse==1.100.0 +matrix-synapse==1.101.0 matrix-synapse-ldap3==0.3.0 msgpack==1.0.7 ndg-httpsclient==0.5.1 -netaddr==0.10.1 +netaddr==1.0.0 packaging==23.2 -phonenumbers==8.13.29 +phonenumbers==8.13.30 pillow==10.2.0 prometheus-client==0.19.0 psycopg2==2.9.9 pyasn1==0.5.1 pyasn1-modules==0.3.0 pycparser==2.21 -pydantic==2.6.0 -pydantic_core==2.16.1 +pydantic==2.6.1 +pydantic_core==2.16.2 pymacaroons==0.13.0 PyNaCl==1.5.0 pyOpenSSL==24.0.0 PyYAML==6.0.1 referencing==0.33.0 requests==2.31.0 -rpds-py==0.17.1 +rpds-py==0.18.0 semantic-version==2.10.0 service-identity==24.1.0 setuptools-rust==1.8.1 diff --git a/conf/requirement_bullseye.txt b/conf/requirement_bullseye.txt index c049b21..545c3e5 100644 --- a/conf/requirement_bullseye.txt +++ b/conf/requirement_bullseye.txt @@ -4,7 +4,7 @@ Automat==22.10.0 bcrypt==4.1.2 bleach==6.1.0 canonicaljson==2.0.0 -certifi==2023.11.17 +certifi==2024.2.2 cffi==1.16.0 charset-normalizer==3.3.2 constantly==23.10.4 @@ -19,15 +19,15 @@ jsonschema==4.21.1 jsonschema-specifications==2023.12.1 ldap3==2.9.1 lxml==5.1.0 -MarkupSafe==2.1.4 +MarkupSafe==2.1.5 matrix-common==1.3.0 -matrix-synapse==1.100.0 +matrix-synapse==1.101.0 matrix-synapse-ldap3==0.3.0 msgpack==1.0.7 ndg-httpsclient==0.5.1 -netaddr==0.10.1 +netaddr==1.0.0 packaging==23.2 -phonenumbers==8.13.29 +phonenumbers==8.13.30 pillow==10.2.0 pkg_resources==0.0.0 prometheus-client==0.19.0 @@ -35,15 +35,15 @@ psycopg2==2.9.9 pyasn1==0.5.1 pyasn1-modules==0.3.0 pycparser==2.21 -pydantic==2.6.0 -pydantic_core==2.16.1 +pydantic==2.6.1 +pydantic_core==2.16.2 pymacaroons==0.13.0 PyNaCl==1.5.0 pyOpenSSL==24.0.0 PyYAML==6.0.1 referencing==0.33.0 requests==2.31.0 -rpds-py==0.17.1 +rpds-py==0.18.0 semantic-version==2.10.0 service-identity==24.1.0 setuptools-rust==1.8.1 diff --git a/manifest.json b/manifest.json index e4a541b..9a23f77 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Instant messaging server which uses Matrix", "fr": "Serveur de messagerie instantané basé sur Matrix" }, - "version": "1.100.0~ynh1", + "version": "1.101.0~ynh1", "url": "http://matrix.org", "license": "Apache-2.0", "maintainer": { From ddfba13fddaa7662d54f2c9b77fc052612d48a6d Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 14 Feb 2024 12:10:02 +0000 Subject: [PATCH 3/3] 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 544a7df..d6a646f 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.100.0~ynh1 +**Shipped version:** 1.101.0~ynh1 ## Disclaimers / important information ## Configuration diff --git a/README_fr.md b/README_fr.md index adbc308..c97c796 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.100.0~ynh1 +**Version incluse :** 1.101.0~ynh1 ## Avertissements / informations importantes ## Configuration