From f4bcdb77948146f937099f1809ba7a3ced6a1d28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Wed, 26 Apr 2023 01:22:47 +0200 Subject: [PATCH 01/36] Upgrade synapse to 1.82.0 --- conf/armv7_bookworm.src | 4 ++-- conf/armv7_bullseye.src | 4 ++-- conf/requirement_bookworm.txt | 14 +++++++------- conf/requirement_bullseye.txt | 14 +++++++------- manifest.json | 2 +- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/conf/armv7_bookworm.src b/conf/armv7_bookworm.src index 837272f..510556c 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.81.0/matrix-synapse_1.81.0-bookworm-bin1_armv7l.tar.gz -SOURCE_SUM=429e1d7570322b44da083f003adfda0e2ebfd1773d9991dd5b9ad6df5ff56804 +SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.82.0/matrix-synapse_1.82.0-bookworm-bin1_armv7l.tar.gz +SOURCE_SUM=7deb6309f5fa11dcc19d1a8cae52e95233a66766329741ad99f2108732d6b050 # (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 c8b5300..93498d0 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.81.0/matrix-synapse_1.81.0-bullseye-bin1_armv7l.tar.gz -SOURCE_SUM=7469e9e303fa72f3c6bd2700a77fb5bfda8f8e2bbafdb6d4b4074d1fe6be4043 +SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.82.0/matrix-synapse_1.82.0-bullseye-bin1_armv7l.tar.gz +SOURCE_SUM=72de8dd713ae9f390b0c50f5fd3bcbdecc1adf6b3ce2d0537e550a7bb3501312 # (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 450eb0f..42e4ae9 100644 --- a/conf/requirement_bookworm.txt +++ b/conf/requirement_bookworm.txt @@ -1,4 +1,4 @@ -attrs==22.2.0 +attrs==23.1.0 Automat==22.10.0 bcrypt==4.0.1 bleach==6.0.0 @@ -7,7 +7,7 @@ certifi==2022.12.7 cffi==1.15.1 charset-normalizer==3.1.0 constantly==15.1.0 -cryptography==40.0.1 +cryptography==40.0.2 hyperlink==21.0.0 idna==3.4 ijson==3.2.0.post0 @@ -19,18 +19,18 @@ ldap3==2.9.1 lxml==4.9.2 MarkupSafe==2.1.2 matrix-common==1.3.0 -matrix-synapse==1.81.0 +matrix-synapse==1.82.0 matrix-synapse-ldap3==0.2.2 msgpack==1.0.5 ndg-httpsclient==0.5.1 netaddr==0.8.0 -packaging==23.0 -phonenumbers==8.13.9 +packaging==23.1 +phonenumbers==8.13.10 Pillow==9.5.0 prometheus-client==0.16.0 psycopg2==2.9.6 -pyasn1==0.4.8 -pyasn1-modules==0.2.8 +pyasn1==0.5.0 +pyasn1-modules==0.3.0 pycparser==2.21 pydantic==1.10.7 pymacaroons==0.13.0 diff --git a/conf/requirement_bullseye.txt b/conf/requirement_bullseye.txt index 18fa347..02ff766 100644 --- a/conf/requirement_bullseye.txt +++ b/conf/requirement_bullseye.txt @@ -1,4 +1,4 @@ -attrs==22.2.0 +attrs==23.1.0 Automat==22.10.0 bcrypt==4.0.1 bleach==6.0.0 @@ -7,7 +7,7 @@ certifi==2022.12.7 cffi==1.15.1 charset-normalizer==3.1.0 constantly==15.1.0 -cryptography==40.0.1 +cryptography==40.0.2 hyperlink==21.0.0 idna==3.4 ijson==3.2.0.post0 @@ -19,19 +19,19 @@ ldap3==2.9.1 lxml==4.9.2 MarkupSafe==2.1.2 matrix-common==1.3.0 -matrix-synapse==1.81.0 +matrix-synapse==1.82.0 matrix-synapse-ldap3==0.2.2 msgpack==1.0.5 ndg-httpsclient==0.5.1 netaddr==0.8.0 -packaging==23.0 -phonenumbers==8.13.9 +packaging==23.1 +phonenumbers==8.13.10 Pillow==9.5.0 pkg_resources==0.0.0 prometheus-client==0.16.0 psycopg2==2.9.6 -pyasn1==0.4.8 -pyasn1-modules==0.2.8 +pyasn1==0.5.0 +pyasn1-modules==0.3.0 pycparser==2.21 pydantic==1.10.7 pymacaroons==0.13.0 diff --git a/manifest.json b/manifest.json index dcad619..7545408 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.81.0~ynh1", + "version": "1.82.0~ynh1", "url": "http://matrix.org", "license": "Apache-2.0", "maintainer": { From 3135a537fe811067977a716c8e6f0d38ce96687d Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 27 Apr 2023 10:38:06 +0000 Subject: [PATCH 02/36] 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 0c5852e..c2f2d29 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.81.0~ynh1 +**Shipped version:** 1.82.0~ynh1 ## Disclaimers / important information ## Configuration diff --git a/README_fr.md b/README_fr.md index d1476b1..570562c 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.81.0~ynh1 +**Version incluse :** 1.82.0~ynh1 ## Avertissements / informations importantes ## Configuration From a890096313481a3070ece231f10a3990f8f9e6e8 Mon Sep 17 00:00:00 2001 From: PxBCPG Date: Sat, 6 May 2023 22:18:51 +0200 Subject: [PATCH 03/36] nginx config changes --- conf/nginx.conf | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/conf/nginx.conf b/conf/nginx.conf index 98bafc3..8957d4a 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -17,3 +17,13 @@ location __PATH__/ { fastcgi_param SCRIPT_FILENAME cas_server.php; } } + + +location /_synapse/ { + proxy_pass http://localhost:__PORT__; + proxy_set_header X-Forwarded-For $remote_addr; + proxy_set_header X-Forwarded-Proto $scheme; + proxy_set_header Host $host; + + client_max_body_size 10M; +} From 3dbd81ed70b74d67a45af0bd68564093d7e90180 Mon Sep 17 00:00:00 2001 From: Josue-T Date: Wed, 10 May 2023 00:27:04 +0200 Subject: [PATCH 04/36] Update conf/nginx.conf --- conf/nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 8957d4a..94bc415 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -19,7 +19,7 @@ location __PATH__/ { } -location /_synapse/ { +location _synapse/ { proxy_pass http://localhost:__PORT__; proxy_set_header X-Forwarded-For $remote_addr; proxy_set_header X-Forwarded-Proto $scheme; From 7ab53e186b96ddb531b14ba99ee948b3cb38aa17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Wed, 10 May 2023 01:41:36 +0200 Subject: [PATCH 05/36] Upgrade synapse to 1.83.0 --- conf/armv7_bookworm.src | 4 ++-- conf/armv7_bullseye.src | 4 ++-- conf/requirement_bookworm.txt | 12 ++++++------ conf/requirement_bullseye.txt | 12 ++++++------ manifest.json | 2 +- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/conf/armv7_bookworm.src b/conf/armv7_bookworm.src index 510556c..c95389e 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.82.0/matrix-synapse_1.82.0-bookworm-bin1_armv7l.tar.gz -SOURCE_SUM=7deb6309f5fa11dcc19d1a8cae52e95233a66766329741ad99f2108732d6b050 +SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.83.0/matrix-synapse_1.83.0-bookworm-bin1_armv7l.tar.gz +SOURCE_SUM=a35cf8c149d9949f433f039a594ff7f99fa7574ece490a1f70a130a5e6840365 # (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 93498d0..1301f1b 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.82.0/matrix-synapse_1.82.0-bullseye-bin1_armv7l.tar.gz -SOURCE_SUM=72de8dd713ae9f390b0c50f5fd3bcbdecc1adf6b3ce2d0537e550a7bb3501312 +SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.83.0/matrix-synapse_1.83.0-bullseye-bin1_armv7l.tar.gz +SOURCE_SUM=3d6536beaf9186d6a466d9a64a699ea26ff1948cd3f1110e89dcd13ab267ee31 # (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 42e4ae9..3d38a79 100644 --- a/conf/requirement_bookworm.txt +++ b/conf/requirement_bookworm.txt @@ -3,7 +3,7 @@ Automat==22.10.0 bcrypt==4.0.1 bleach==6.0.0 canonicaljson==2.0.0 -certifi==2022.12.7 +certifi==2023.5.7 cffi==1.15.1 charset-normalizer==3.1.0 constantly==15.1.0 @@ -19,13 +19,13 @@ ldap3==2.9.1 lxml==4.9.2 MarkupSafe==2.1.2 matrix-common==1.3.0 -matrix-synapse==1.82.0 +matrix-synapse==1.83.0 matrix-synapse-ldap3==0.2.2 msgpack==1.0.5 ndg-httpsclient==0.5.1 netaddr==0.8.0 packaging==23.1 -phonenumbers==8.13.10 +phonenumbers==8.13.11 Pillow==9.5.0 prometheus-client==0.16.0 psycopg2==2.9.6 @@ -38,10 +38,10 @@ PyNaCl==1.5.0 pyOpenSSL==23.1.1 pyrsistent==0.19.3 PyYAML==6.0 -requests==2.28.2 +requests==2.30.0 semantic-version==2.10.0 service-identity==21.1.0 -setuptools-rust==1.5.2 +setuptools-rust==1.6.0 signedjson==1.1.4 six==1.16.0 sortedcontainers==2.4.0 @@ -49,6 +49,6 @@ treq==22.2.0 Twisted==22.10.0 typing_extensions==4.5.0 unpaddedbase64==2.1.0 -urllib3==1.26.15 +urllib3==2.0.2 webencodings==0.5.1 zope.interface==6.0 diff --git a/conf/requirement_bullseye.txt b/conf/requirement_bullseye.txt index 02ff766..af010ee 100644 --- a/conf/requirement_bullseye.txt +++ b/conf/requirement_bullseye.txt @@ -3,7 +3,7 @@ Automat==22.10.0 bcrypt==4.0.1 bleach==6.0.0 canonicaljson==2.0.0 -certifi==2022.12.7 +certifi==2023.5.7 cffi==1.15.1 charset-normalizer==3.1.0 constantly==15.1.0 @@ -19,13 +19,13 @@ ldap3==2.9.1 lxml==4.9.2 MarkupSafe==2.1.2 matrix-common==1.3.0 -matrix-synapse==1.82.0 +matrix-synapse==1.83.0 matrix-synapse-ldap3==0.2.2 msgpack==1.0.5 ndg-httpsclient==0.5.1 netaddr==0.8.0 packaging==23.1 -phonenumbers==8.13.10 +phonenumbers==8.13.11 Pillow==9.5.0 pkg_resources==0.0.0 prometheus-client==0.16.0 @@ -39,10 +39,10 @@ PyNaCl==1.5.0 pyOpenSSL==23.1.1 pyrsistent==0.19.3 PyYAML==6.0 -requests==2.28.2 +requests==2.30.0 semantic-version==2.10.0 service-identity==21.1.0 -setuptools-rust==1.5.2 +setuptools-rust==1.6.0 signedjson==1.1.4 six==1.16.0 sortedcontainers==2.4.0 @@ -50,6 +50,6 @@ treq==22.2.0 Twisted==22.10.0 typing_extensions==4.5.0 unpaddedbase64==2.1.0 -urllib3==1.26.15 +urllib3==2.0.2 webencodings==0.5.1 zope.interface==6.0 diff --git a/manifest.json b/manifest.json index 7545408..3e7e12d 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.82.0~ynh1", + "version": "1.83.0~ynh1", "url": "http://matrix.org", "license": "Apache-2.0", "maintainer": { From f903b127c508a869bf97e0a3d3957953713fef91 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 10 May 2023 10:04:43 +0000 Subject: [PATCH 06/36] 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 c2f2d29..f3438bb 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.82.0~ynh1 +**Shipped version:** 1.83.0~ynh1 ## Disclaimers / important information ## Configuration diff --git a/README_fr.md b/README_fr.md index 570562c..1239da9 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.82.0~ynh1 +**Version incluse :** 1.83.0~ynh1 ## Avertissements / informations importantes ## Configuration From 17080cd504a42d2dc588386a0881bb17b823b5a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Wed, 24 May 2023 01:34:28 +0200 Subject: [PATCH 07/36] Upgrade synapse to 1.84.0 --- conf/armv7_bookworm.src | 4 ++-- conf/armv7_bullseye.src | 4 ++-- conf/requirement_bookworm.txt | 8 ++++---- conf/requirement_bullseye.txt | 8 ++++---- manifest.json | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/conf/armv7_bookworm.src b/conf/armv7_bookworm.src index c95389e..587dfa5 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.83.0/matrix-synapse_1.83.0-bookworm-bin1_armv7l.tar.gz -SOURCE_SUM=a35cf8c149d9949f433f039a594ff7f99fa7574ece490a1f70a130a5e6840365 +SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.84.0/matrix-synapse_1.84.0-bookworm-bin1_armv7l.tar.gz +SOURCE_SUM=ca1c7a0f83e2394a9a1313b0c23cd33fb831630435c8a5f480a5241db1c30153 # (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 1301f1b..cd26c36 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.83.0/matrix-synapse_1.83.0-bullseye-bin1_armv7l.tar.gz -SOURCE_SUM=3d6536beaf9186d6a466d9a64a699ea26ff1948cd3f1110e89dcd13ab267ee31 +SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.84.0/matrix-synapse_1.84.0-bullseye-bin1_armv7l.tar.gz +SOURCE_SUM=51e6ea132f7b957340488c5a7e76f33f8f958f3592b49616601f7d7488b3bf7e # (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 3d38a79..97b8364 100644 --- a/conf/requirement_bookworm.txt +++ b/conf/requirement_bookworm.txt @@ -19,7 +19,7 @@ ldap3==2.9.1 lxml==4.9.2 MarkupSafe==2.1.2 matrix-common==1.3.0 -matrix-synapse==1.83.0 +matrix-synapse==1.84.0 matrix-synapse-ldap3==0.2.2 msgpack==1.0.5 ndg-httpsclient==0.5.1 @@ -32,13 +32,13 @@ psycopg2==2.9.6 pyasn1==0.5.0 pyasn1-modules==0.3.0 pycparser==2.21 -pydantic==1.10.7 +pydantic==1.10.8 pymacaroons==0.13.0 PyNaCl==1.5.0 pyOpenSSL==23.1.1 pyrsistent==0.19.3 PyYAML==6.0 -requests==2.30.0 +requests==2.31.0 semantic-version==2.10.0 service-identity==21.1.0 setuptools-rust==1.6.0 @@ -47,7 +47,7 @@ six==1.16.0 sortedcontainers==2.4.0 treq==22.2.0 Twisted==22.10.0 -typing_extensions==4.5.0 +typing_extensions==4.6.0 unpaddedbase64==2.1.0 urllib3==2.0.2 webencodings==0.5.1 diff --git a/conf/requirement_bullseye.txt b/conf/requirement_bullseye.txt index af010ee..62a9db6 100644 --- a/conf/requirement_bullseye.txt +++ b/conf/requirement_bullseye.txt @@ -19,7 +19,7 @@ ldap3==2.9.1 lxml==4.9.2 MarkupSafe==2.1.2 matrix-common==1.3.0 -matrix-synapse==1.83.0 +matrix-synapse==1.84.0 matrix-synapse-ldap3==0.2.2 msgpack==1.0.5 ndg-httpsclient==0.5.1 @@ -33,13 +33,13 @@ psycopg2==2.9.6 pyasn1==0.5.0 pyasn1-modules==0.3.0 pycparser==2.21 -pydantic==1.10.7 +pydantic==1.10.8 pymacaroons==0.13.0 PyNaCl==1.5.0 pyOpenSSL==23.1.1 pyrsistent==0.19.3 PyYAML==6.0 -requests==2.30.0 +requests==2.31.0 semantic-version==2.10.0 service-identity==21.1.0 setuptools-rust==1.6.0 @@ -48,7 +48,7 @@ six==1.16.0 sortedcontainers==2.4.0 treq==22.2.0 Twisted==22.10.0 -typing_extensions==4.5.0 +typing_extensions==4.6.0 unpaddedbase64==2.1.0 urllib3==2.0.2 webencodings==0.5.1 diff --git a/manifest.json b/manifest.json index 3e7e12d..4b936f3 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.83.0~ynh1", + "version": "1.84.0~ynh1", "url": "http://matrix.org", "license": "Apache-2.0", "maintainer": { From 56c2a7e45b274edb1e79d4252ed8322eff1bdf8e Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 24 May 2023 19:12:38 +0000 Subject: [PATCH 08/36] 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 f3438bb..b3b9fe6 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.83.0~ynh1 +**Shipped version:** 1.84.0~ynh1 ## Disclaimers / important information ## Configuration diff --git a/README_fr.md b/README_fr.md index 1239da9..21ad28e 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.83.0~ynh1 +**Version incluse :** 1.84.0~ynh1 ## Avertissements / informations importantes ## Configuration From b1968a55cb1ab413e5c4a7e2b1082760a7fae6d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Thu, 25 May 2023 12:38:09 +0200 Subject: [PATCH 09/36] Fix app_service config file --- scripts/install | 2 +- scripts/upgrade | 2 +- sources/update_synapse_for_appservice.sh | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/scripts/install b/scripts/install index bc8587a..d29754c 100644 --- a/scripts/install +++ b/scripts/install @@ -184,7 +184,7 @@ mkdir -p $data_path mkdir -p /var/log/matrix-$app mkdir -p /etc/matrix-$app/conf.d mkdir -p /etc/matrix-$app/app-service -echo "app_service_config_files:" > /etc/matrix-$app/conf.d/app_service.yaml +touch /etc/matrix-$app/conf.d/app_service.yaml # Install synapse in virtualenv install_sources diff --git a/scripts/upgrade b/scripts/upgrade index 7d26ac9..e78c188 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -380,7 +380,7 @@ ynh_add_config --template="../sources/update_synapse_for_appservice.sh" --destin # Ensure app-service folder has exists and the config file exit (Migration) mkdir -p /etc/matrix-$app/app-service -test -e /etc/matrix-$app/conf.d/app_service.yaml || echo "app_service_config_files:" > /etc/matrix-$app/conf.d/app_service.yaml +test -e /etc/matrix-$app/conf.d/app_service.yaml || touch /etc/matrix-$app/conf.d/app_service.yaml #================================================= # ADVERTISE SERVICE IN ADMIN PANEL diff --git a/sources/update_synapse_for_appservice.sh b/sources/update_synapse_for_appservice.sh index 193b1f0..fda5ddb 100644 --- a/sources/update_synapse_for_appservice.sh +++ b/sources/update_synapse_for_appservice.sh @@ -6,7 +6,9 @@ service_config_file=/etc/matrix-$app/conf.d/app_service.yaml # Backup the previous config file cp $service_config_file /tmp/app_service_backup.yaml -echo "app_service_config_files:" > $service_config_file +if [ -n "$(ls /etc/matrix-$app/app-service/)" ]; then + echo "app_service_config_files:" > $service_config_file +fi for f in $(ls /etc/matrix-$app/app-service/); do echo " - /etc/matrix-$app/app-service/$f" >> $service_config_file done From 0c2a572598f3d8e17b11abdd9bd499c0d9e9e9a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Sat, 27 May 2023 01:03:23 +0200 Subject: [PATCH 10/36] Upgrade synapse to 1.84.1 --- conf/armv7_bookworm.src | 4 ++-- conf/armv7_bullseye.src | 4 ++-- conf/requirement_bookworm.txt | 6 +++--- conf/requirement_bullseye.txt | 6 +++--- manifest.json | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/conf/armv7_bookworm.src b/conf/armv7_bookworm.src index 587dfa5..5bef691 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.84.0/matrix-synapse_1.84.0-bookworm-bin1_armv7l.tar.gz -SOURCE_SUM=ca1c7a0f83e2394a9a1313b0c23cd33fb831630435c8a5f480a5241db1c30153 +SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.84.1/matrix-synapse_1.84.1-bookworm-bin1_armv7l.tar.gz +SOURCE_SUM=fd516b379687540aa74c828a8d93cb05e59a04c03508258cfb6b331cfb80ea18 # (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 cd26c36..1b5e931 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.84.0/matrix-synapse_1.84.0-bullseye-bin1_armv7l.tar.gz -SOURCE_SUM=51e6ea132f7b957340488c5a7e76f33f8f958f3592b49616601f7d7488b3bf7e +SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.84.1/matrix-synapse_1.84.1-bullseye-bin1_armv7l.tar.gz +SOURCE_SUM=70ea244b3527ccaaba5384106078c60ef1482b104924311af02406bd52eebf3c # (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 97b8364..6fe6510 100644 --- a/conf/requirement_bookworm.txt +++ b/conf/requirement_bookworm.txt @@ -19,7 +19,7 @@ ldap3==2.9.1 lxml==4.9.2 MarkupSafe==2.1.2 matrix-common==1.3.0 -matrix-synapse==1.84.0 +matrix-synapse==1.84.1 matrix-synapse-ldap3==0.2.2 msgpack==1.0.5 ndg-httpsclient==0.5.1 @@ -27,7 +27,7 @@ netaddr==0.8.0 packaging==23.1 phonenumbers==8.13.11 Pillow==9.5.0 -prometheus-client==0.16.0 +prometheus-client==0.17.0 psycopg2==2.9.6 pyasn1==0.5.0 pyasn1-modules==0.3.0 @@ -47,7 +47,7 @@ six==1.16.0 sortedcontainers==2.4.0 treq==22.2.0 Twisted==22.10.0 -typing_extensions==4.6.0 +typing_extensions==4.6.2 unpaddedbase64==2.1.0 urllib3==2.0.2 webencodings==0.5.1 diff --git a/conf/requirement_bullseye.txt b/conf/requirement_bullseye.txt index 62a9db6..364c485 100644 --- a/conf/requirement_bullseye.txt +++ b/conf/requirement_bullseye.txt @@ -19,7 +19,7 @@ ldap3==2.9.1 lxml==4.9.2 MarkupSafe==2.1.2 matrix-common==1.3.0 -matrix-synapse==1.84.0 +matrix-synapse==1.84.1 matrix-synapse-ldap3==0.2.2 msgpack==1.0.5 ndg-httpsclient==0.5.1 @@ -28,7 +28,7 @@ packaging==23.1 phonenumbers==8.13.11 Pillow==9.5.0 pkg_resources==0.0.0 -prometheus-client==0.16.0 +prometheus-client==0.17.0 psycopg2==2.9.6 pyasn1==0.5.0 pyasn1-modules==0.3.0 @@ -48,7 +48,7 @@ six==1.16.0 sortedcontainers==2.4.0 treq==22.2.0 Twisted==22.10.0 -typing_extensions==4.6.0 +typing_extensions==4.6.2 unpaddedbase64==2.1.0 urllib3==2.0.2 webencodings==0.5.1 diff --git a/manifest.json b/manifest.json index 4b936f3..14b9e3b 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.84.0~ynh1", + "version": "1.84.1~ynh1", "url": "http://matrix.org", "license": "Apache-2.0", "maintainer": { From 145fafe1cc99de94c7e5afd410dbe83743dc1844 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 30 May 2023 17:44:32 +0000 Subject: [PATCH 11/36] 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 b3b9fe6..c4ea1f7 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.84.0~ynh1 +**Shipped version:** 1.84.1~ynh1 ## Disclaimers / important information ## Configuration diff --git a/README_fr.md b/README_fr.md index 21ad28e..87253c7 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.84.0~ynh1 +**Version incluse :** 1.84.1~ynh1 ## Avertissements / informations importantes ## Configuration From db4cecf095375b7876929e9bd40d13b8f0c29f26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Tue, 6 Jun 2023 08:48:53 +0200 Subject: [PATCH 12/36] Fix app service config file --- scripts/upgrade | 9 ++++++++- sources/update_synapse_for_appservice.sh | 2 ++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index e78c188..e48f9d8 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -380,7 +380,14 @@ ynh_add_config --template="../sources/update_synapse_for_appservice.sh" --destin # Ensure app-service folder has exists and the config file exit (Migration) mkdir -p /etc/matrix-$app/app-service -test -e /etc/matrix-$app/conf.d/app_service.yaml || touch /etc/matrix-$app/conf.d/app_service.yaml +if [ -e /etc/matrix-$app/conf.d/app_service.yaml ]; then + # ensure that the file is empty if no app service are installed (fix issue #385) + if [ ! "$(ls -A /etc/matrix-$app/app-service)" ]; then + echo "" > /etc/matrix-$app/conf.d/app_service.yaml + fi +else + touch /etc/matrix-$app/conf.d/app_service.yaml +fi #================================================= # ADVERTISE SERVICE IN ADMIN PANEL diff --git a/sources/update_synapse_for_appservice.sh b/sources/update_synapse_for_appservice.sh index fda5ddb..072c3dd 100644 --- a/sources/update_synapse_for_appservice.sh +++ b/sources/update_synapse_for_appservice.sh @@ -8,6 +8,8 @@ cp $service_config_file /tmp/app_service_backup.yaml if [ -n "$(ls /etc/matrix-$app/app-service/)" ]; then echo "app_service_config_files:" > $service_config_file +else + echo "" > $service_config_file fi for f in $(ls /etc/matrix-$app/app-service/); do echo " - /etc/matrix-$app/app-service/$f" >> $service_config_file From 86cde3452eee4f34708e4ea21d92daee14a3ecd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Tue, 6 Jun 2023 08:57:54 +0200 Subject: [PATCH 13/36] Update manifest --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 14b9e3b..bb3cee5 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.84.1~ynh1", + "version": "1.84.1~ynh2", "url": "http://matrix.org", "license": "Apache-2.0", "maintainer": { From 15df27f7b20ba0dd19d077f43f5de8442b045dce Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 6 Jun 2023 06:58:02 +0000 Subject: [PATCH 14/36] 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 c4ea1f7..0048b53 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.84.1~ynh1 +**Shipped version:** 1.84.1~ynh2 ## Disclaimers / important information ## Configuration diff --git a/README_fr.md b/README_fr.md index 87253c7..0fa0088 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.84.1~ynh1 +**Version incluse :** 1.84.1~ynh2 ## Avertissements / informations importantes ## Configuration From 9f96d2876bec62def404c0d6c4ef8b6b975e0ee0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Wed, 7 Jun 2023 01:57:42 +0200 Subject: [PATCH 15/36] Upgrade synapse to 1.85.0 --- conf/armv7_bookworm.src | 4 ++-- conf/armv7_bullseye.src | 4 ++-- conf/requirement_bookworm.txt | 12 ++++++------ conf/requirement_bullseye.txt | 12 ++++++------ manifest.json | 2 +- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/conf/armv7_bookworm.src b/conf/armv7_bookworm.src index 5bef691..a8bc66d 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.84.1/matrix-synapse_1.84.1-bookworm-bin1_armv7l.tar.gz -SOURCE_SUM=fd516b379687540aa74c828a8d93cb05e59a04c03508258cfb6b331cfb80ea18 +SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.85.0/matrix-synapse_1.85.0-bookworm-bin1_armv7l.tar.gz +SOURCE_SUM=c9a08180ccdb4da8fc5afd1074996de7b7a8c5dc49c90f6cd28429f05b8cb5ea # (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 1b5e931..445a3d5 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.84.1/matrix-synapse_1.84.1-bullseye-bin1_armv7l.tar.gz -SOURCE_SUM=70ea244b3527ccaaba5384106078c60ef1482b104924311af02406bd52eebf3c +SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.85.0/matrix-synapse_1.85.0-bullseye-bin1_armv7l.tar.gz +SOURCE_SUM=4fa1ce56fdf72e4baf47d2d39400bbe78723f42f34b39a662409f73c589346c0 # (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 6fe6510..0a131fe 100644 --- a/conf/requirement_bookworm.txt +++ b/conf/requirement_bookworm.txt @@ -7,7 +7,7 @@ certifi==2023.5.7 cffi==1.15.1 charset-normalizer==3.1.0 constantly==15.1.0 -cryptography==40.0.2 +cryptography==41.0.1 hyperlink==21.0.0 idna==3.4 ijson==3.2.0.post0 @@ -17,15 +17,15 @@ Jinja2==3.1.2 jsonschema==4.17.3 ldap3==2.9.1 lxml==4.9.2 -MarkupSafe==2.1.2 +MarkupSafe==2.1.3 matrix-common==1.3.0 -matrix-synapse==1.84.1 +matrix-synapse==1.85.0 matrix-synapse-ldap3==0.2.2 msgpack==1.0.5 ndg-httpsclient==0.5.1 netaddr==0.8.0 packaging==23.1 -phonenumbers==8.13.11 +phonenumbers==8.13.13 Pillow==9.5.0 prometheus-client==0.17.0 psycopg2==2.9.6 @@ -35,7 +35,7 @@ pycparser==2.21 pydantic==1.10.8 pymacaroons==0.13.0 PyNaCl==1.5.0 -pyOpenSSL==23.1.1 +pyOpenSSL==23.2.0 pyrsistent==0.19.3 PyYAML==6.0 requests==2.31.0 @@ -47,7 +47,7 @@ six==1.16.0 sortedcontainers==2.4.0 treq==22.2.0 Twisted==22.10.0 -typing_extensions==4.6.2 +typing_extensions==4.6.3 unpaddedbase64==2.1.0 urllib3==2.0.2 webencodings==0.5.1 diff --git a/conf/requirement_bullseye.txt b/conf/requirement_bullseye.txt index 364c485..8cd4e95 100644 --- a/conf/requirement_bullseye.txt +++ b/conf/requirement_bullseye.txt @@ -7,7 +7,7 @@ certifi==2023.5.7 cffi==1.15.1 charset-normalizer==3.1.0 constantly==15.1.0 -cryptography==40.0.2 +cryptography==41.0.1 hyperlink==21.0.0 idna==3.4 ijson==3.2.0.post0 @@ -17,15 +17,15 @@ Jinja2==3.1.2 jsonschema==4.17.3 ldap3==2.9.1 lxml==4.9.2 -MarkupSafe==2.1.2 +MarkupSafe==2.1.3 matrix-common==1.3.0 -matrix-synapse==1.84.1 +matrix-synapse==1.85.0 matrix-synapse-ldap3==0.2.2 msgpack==1.0.5 ndg-httpsclient==0.5.1 netaddr==0.8.0 packaging==23.1 -phonenumbers==8.13.11 +phonenumbers==8.13.13 Pillow==9.5.0 pkg_resources==0.0.0 prometheus-client==0.17.0 @@ -36,7 +36,7 @@ pycparser==2.21 pydantic==1.10.8 pymacaroons==0.13.0 PyNaCl==1.5.0 -pyOpenSSL==23.1.1 +pyOpenSSL==23.2.0 pyrsistent==0.19.3 PyYAML==6.0 requests==2.31.0 @@ -48,7 +48,7 @@ six==1.16.0 sortedcontainers==2.4.0 treq==22.2.0 Twisted==22.10.0 -typing_extensions==4.6.2 +typing_extensions==4.6.3 unpaddedbase64==2.1.0 urllib3==2.0.2 webencodings==0.5.1 diff --git a/manifest.json b/manifest.json index bb3cee5..4a12249 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.84.1~ynh2", + "version": "1.85.0~ynh1", "url": "http://matrix.org", "license": "Apache-2.0", "maintainer": { From a174d017e40c96fa9a72702c3762e5b18b1bd35d Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 7 Jun 2023 11:04:37 +0000 Subject: [PATCH 16/36] 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 0048b53..c1c4929 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.84.1~ynh2 +**Shipped version:** 1.85.0~ynh1 ## Disclaimers / important information ## Configuration diff --git a/README_fr.md b/README_fr.md index 0fa0088..9018a60 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.84.1~ynh2 +**Version incluse :** 1.85.0~ynh1 ## Avertissements / informations importantes ## Configuration From d8073bbea9b669b9411e19318315a6412b26c487 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Thu, 8 Jun 2023 02:07:21 +0200 Subject: [PATCH 17/36] Upgrade synapse to 1.85.1 --- conf/armv7_bookworm.src | 4 ++-- conf/armv7_bullseye.src | 4 ++-- conf/requirement_bookworm.txt | 6 +++--- conf/requirement_bullseye.txt | 6 +++--- manifest.json | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/conf/armv7_bookworm.src b/conf/armv7_bookworm.src index a8bc66d..35de0d3 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.85.0/matrix-synapse_1.85.0-bookworm-bin1_armv7l.tar.gz -SOURCE_SUM=c9a08180ccdb4da8fc5afd1074996de7b7a8c5dc49c90f6cd28429f05b8cb5ea +SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.85.1/matrix-synapse_1.85.1-bookworm-bin1_armv7l.tar.gz +SOURCE_SUM=9c2fb2b94324bfdda43d268c8a0de1e47c9696faba4b7d1bb46e1968ce5bc271 # (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 445a3d5..f480dd8 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.85.0/matrix-synapse_1.85.0-bullseye-bin1_armv7l.tar.gz -SOURCE_SUM=4fa1ce56fdf72e4baf47d2d39400bbe78723f42f34b39a662409f73c589346c0 +SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.85.1/matrix-synapse_1.85.1-bullseye-bin1_armv7l.tar.gz +SOURCE_SUM=55958516c8fd535c3469b3527e95ce3cf8575b5f72175a04a9d61937cbf2b27c # (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 0a131fe..ee04248 100644 --- a/conf/requirement_bookworm.txt +++ b/conf/requirement_bookworm.txt @@ -19,7 +19,7 @@ ldap3==2.9.1 lxml==4.9.2 MarkupSafe==2.1.3 matrix-common==1.3.0 -matrix-synapse==1.85.0 +matrix-synapse==1.85.1 matrix-synapse-ldap3==0.2.2 msgpack==1.0.5 ndg-httpsclient==0.5.1 @@ -32,7 +32,7 @@ psycopg2==2.9.6 pyasn1==0.5.0 pyasn1-modules==0.3.0 pycparser==2.21 -pydantic==1.10.8 +pydantic==1.10.9 pymacaroons==0.13.0 PyNaCl==1.5.0 pyOpenSSL==23.2.0 @@ -49,6 +49,6 @@ treq==22.2.0 Twisted==22.10.0 typing_extensions==4.6.3 unpaddedbase64==2.1.0 -urllib3==2.0.2 +urllib3==2.0.3 webencodings==0.5.1 zope.interface==6.0 diff --git a/conf/requirement_bullseye.txt b/conf/requirement_bullseye.txt index 8cd4e95..a5bf07d 100644 --- a/conf/requirement_bullseye.txt +++ b/conf/requirement_bullseye.txt @@ -19,7 +19,7 @@ ldap3==2.9.1 lxml==4.9.2 MarkupSafe==2.1.3 matrix-common==1.3.0 -matrix-synapse==1.85.0 +matrix-synapse==1.85.1 matrix-synapse-ldap3==0.2.2 msgpack==1.0.5 ndg-httpsclient==0.5.1 @@ -33,7 +33,7 @@ psycopg2==2.9.6 pyasn1==0.5.0 pyasn1-modules==0.3.0 pycparser==2.21 -pydantic==1.10.8 +pydantic==1.10.9 pymacaroons==0.13.0 PyNaCl==1.5.0 pyOpenSSL==23.2.0 @@ -50,6 +50,6 @@ treq==22.2.0 Twisted==22.10.0 typing_extensions==4.6.3 unpaddedbase64==2.1.0 -urllib3==2.0.2 +urllib3==2.0.3 webencodings==0.5.1 zope.interface==6.0 diff --git a/manifest.json b/manifest.json index 4a12249..f289d14 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.85.0~ynh1", + "version": "1.85.1~ynh1", "url": "http://matrix.org", "license": "Apache-2.0", "maintainer": { From 6646f34e725272e7b13045b8134995cd49353be9 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 8 Jun 2023 21:45:31 +0000 Subject: [PATCH 18/36] 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 c1c4929..9d42538 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.85.0~ynh1 +**Shipped version:** 1.85.1~ynh1 ## Disclaimers / important information ## Configuration diff --git a/README_fr.md b/README_fr.md index 9018a60..faea5fa 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.85.0~ynh1 +**Version incluse :** 1.85.1~ynh1 ## Avertissements / informations importantes ## Configuration From 80b7505c999fd033859338fddc51ea8dbe40f537 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Mon, 19 Jun 2023 19:06:47 +0200 Subject: [PATCH 19/36] Fix synapse admin API url --- conf/nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 94bc415..8957d4a 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -19,7 +19,7 @@ location __PATH__/ { } -location _synapse/ { +location /_synapse/ { proxy_pass http://localhost:__PORT__; proxy_set_header X-Forwarded-For $remote_addr; proxy_set_header X-Forwarded-Proto $scheme; From c0b0825b4f2227d64f0bcf9bcbb8c4a08a3ea8bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Fri, 9 Jun 2023 02:24:07 +0200 Subject: [PATCH 20/36] Upgrade synapse to 1.85.2 --- conf/armv7_bookworm.src | 4 ++-- conf/armv7_bullseye.src | 4 ++-- conf/requirement_bookworm.txt | 2 +- conf/requirement_bullseye.txt | 2 +- manifest.json | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/conf/armv7_bookworm.src b/conf/armv7_bookworm.src index 35de0d3..34c0379 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.85.1/matrix-synapse_1.85.1-bookworm-bin1_armv7l.tar.gz -SOURCE_SUM=9c2fb2b94324bfdda43d268c8a0de1e47c9696faba4b7d1bb46e1968ce5bc271 +SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.85.2/matrix-synapse_1.85.2-bookworm-bin1_armv7l.tar.gz +SOURCE_SUM=bb94952556fa2ff0a849d927dd3eb8f666154533ffb969e60b2bf50332dd1ca1 # (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 f480dd8..84f8660 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.85.1/matrix-synapse_1.85.1-bullseye-bin1_armv7l.tar.gz -SOURCE_SUM=55958516c8fd535c3469b3527e95ce3cf8575b5f72175a04a9d61937cbf2b27c +SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.85.2/matrix-synapse_1.85.2-bullseye-bin1_armv7l.tar.gz +SOURCE_SUM=07112bf8c98585b2cd58ea3b8af9ec09f60aa3b225d1b89f1a3ede5c4553c841 # (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 ee04248..706ca37 100644 --- a/conf/requirement_bookworm.txt +++ b/conf/requirement_bookworm.txt @@ -19,7 +19,7 @@ ldap3==2.9.1 lxml==4.9.2 MarkupSafe==2.1.3 matrix-common==1.3.0 -matrix-synapse==1.85.1 +matrix-synapse==1.85.2 matrix-synapse-ldap3==0.2.2 msgpack==1.0.5 ndg-httpsclient==0.5.1 diff --git a/conf/requirement_bullseye.txt b/conf/requirement_bullseye.txt index a5bf07d..c2efdaa 100644 --- a/conf/requirement_bullseye.txt +++ b/conf/requirement_bullseye.txt @@ -19,7 +19,7 @@ ldap3==2.9.1 lxml==4.9.2 MarkupSafe==2.1.3 matrix-common==1.3.0 -matrix-synapse==1.85.1 +matrix-synapse==1.85.2 matrix-synapse-ldap3==0.2.2 msgpack==1.0.5 ndg-httpsclient==0.5.1 diff --git a/manifest.json b/manifest.json index f289d14..0523034 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.85.1~ynh1", + "version": "1.85.2~ynh1", "url": "http://matrix.org", "license": "Apache-2.0", "maintainer": { From fc334a05c45085f5d78c0f3c82cf575aecc956a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Wed, 21 Jun 2023 00:53:41 +0200 Subject: [PATCH 21/36] Upgrade synapse to 1.86.0 --- conf/armv7_bookworm.src | 4 ++-- conf/armv7_bullseye.src | 4 ++-- conf/requirement_bookworm.txt | 8 ++++---- conf/requirement_bullseye.txt | 8 ++++---- manifest.json | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/conf/armv7_bookworm.src b/conf/armv7_bookworm.src index 34c0379..d36425f 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.85.2/matrix-synapse_1.85.2-bookworm-bin1_armv7l.tar.gz -SOURCE_SUM=bb94952556fa2ff0a849d927dd3eb8f666154533ffb969e60b2bf50332dd1ca1 +SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.86.0/matrix-synapse_1.86.0-bookworm-bin1_armv7l.tar.gz +SOURCE_SUM=06b214c1d32e4a7bb7a447999582d8ffbb361b381d02f5f15aaacaa5bfa951e9 # (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 84f8660..e8ccee3 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.85.2/matrix-synapse_1.85.2-bullseye-bin1_armv7l.tar.gz -SOURCE_SUM=07112bf8c98585b2cd58ea3b8af9ec09f60aa3b225d1b89f1a3ede5c4553c841 +SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.86.0/matrix-synapse_1.86.0-bullseye-bin1_armv7l.tar.gz +SOURCE_SUM=a24f4ddea4641ae38762383bbce7af656f715958203d11253f92e75026899b57 # (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 706ca37..753f1c6 100644 --- a/conf/requirement_bookworm.txt +++ b/conf/requirement_bookworm.txt @@ -10,7 +10,7 @@ constantly==15.1.0 cryptography==41.0.1 hyperlink==21.0.0 idna==3.4 -ijson==3.2.0.post0 +ijson==3.2.1 immutabledict==2.2.4 incremental==22.10.0 Jinja2==3.1.2 @@ -19,13 +19,13 @@ ldap3==2.9.1 lxml==4.9.2 MarkupSafe==2.1.3 matrix-common==1.3.0 -matrix-synapse==1.85.2 +matrix-synapse==1.86.0 matrix-synapse-ldap3==0.2.2 msgpack==1.0.5 ndg-httpsclient==0.5.1 netaddr==0.8.0 packaging==23.1 -phonenumbers==8.13.13 +phonenumbers==8.13.14 Pillow==9.5.0 prometheus-client==0.17.0 psycopg2==2.9.6 @@ -40,7 +40,7 @@ pyrsistent==0.19.3 PyYAML==6.0 requests==2.31.0 semantic-version==2.10.0 -service-identity==21.1.0 +service-identity==23.1.0 setuptools-rust==1.6.0 signedjson==1.1.4 six==1.16.0 diff --git a/conf/requirement_bullseye.txt b/conf/requirement_bullseye.txt index c2efdaa..b6e563e 100644 --- a/conf/requirement_bullseye.txt +++ b/conf/requirement_bullseye.txt @@ -10,7 +10,7 @@ constantly==15.1.0 cryptography==41.0.1 hyperlink==21.0.0 idna==3.4 -ijson==3.2.0.post0 +ijson==3.2.1 immutabledict==2.2.4 incremental==22.10.0 Jinja2==3.1.2 @@ -19,13 +19,13 @@ ldap3==2.9.1 lxml==4.9.2 MarkupSafe==2.1.3 matrix-common==1.3.0 -matrix-synapse==1.85.2 +matrix-synapse==1.86.0 matrix-synapse-ldap3==0.2.2 msgpack==1.0.5 ndg-httpsclient==0.5.1 netaddr==0.8.0 packaging==23.1 -phonenumbers==8.13.13 +phonenumbers==8.13.14 Pillow==9.5.0 pkg_resources==0.0.0 prometheus-client==0.17.0 @@ -41,7 +41,7 @@ pyrsistent==0.19.3 PyYAML==6.0 requests==2.31.0 semantic-version==2.10.0 -service-identity==21.1.0 +service-identity==23.1.0 setuptools-rust==1.6.0 signedjson==1.1.4 six==1.16.0 diff --git a/manifest.json b/manifest.json index 0523034..3402d58 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.85.2~ynh1", + "version": "1.86.0~ynh1", "url": "http://matrix.org", "license": "Apache-2.0", "maintainer": { From debfe63ee460e00cd19059d6bfa88b22be50afdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Wed, 5 Jul 2023 01:07:29 +0200 Subject: [PATCH 22/36] Upgrade synapse to 1.87.0 --- conf/armv7_bookworm.src | 4 ++-- conf/armv7_bullseye.src | 4 ++-- conf/requirement_bookworm.txt | 14 +++++++------- conf/requirement_bullseye.txt | 14 +++++++------- manifest.json | 2 +- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/conf/armv7_bookworm.src b/conf/armv7_bookworm.src index d36425f..05b6043 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.86.0/matrix-synapse_1.86.0-bookworm-bin1_armv7l.tar.gz -SOURCE_SUM=06b214c1d32e4a7bb7a447999582d8ffbb361b381d02f5f15aaacaa5bfa951e9 +SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.87.0/matrix-synapse_1.87.0-bookworm-bin1_armv7l.tar.gz +SOURCE_SUM=06ffecadab9328f5653bd5a8276085fa7c1f27c90c97096c24fa60a12c5e74b9 # (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 e8ccee3..174f53d 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.86.0/matrix-synapse_1.86.0-bullseye-bin1_armv7l.tar.gz -SOURCE_SUM=a24f4ddea4641ae38762383bbce7af656f715958203d11253f92e75026899b57 +SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.87.0/matrix-synapse_1.87.0-bullseye-bin1_armv7l.tar.gz +SOURCE_SUM=0196d46e7c0e935ed9a6713433de358f300cedcd0bf4017ef82432aa8551bcf4 # (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 753f1c6..e78a14c 100644 --- a/conf/requirement_bookworm.txt +++ b/conf/requirement_bookworm.txt @@ -10,8 +10,8 @@ constantly==15.1.0 cryptography==41.0.1 hyperlink==21.0.0 idna==3.4 -ijson==3.2.1 -immutabledict==2.2.4 +ijson==3.2.2 +immutabledict==2.2.5 incremental==22.10.0 Jinja2==3.1.2 jsonschema==4.17.3 @@ -19,20 +19,20 @@ ldap3==2.9.1 lxml==4.9.2 MarkupSafe==2.1.3 matrix-common==1.3.0 -matrix-synapse==1.86.0 +matrix-synapse==1.87.0 matrix-synapse-ldap3==0.2.2 msgpack==1.0.5 ndg-httpsclient==0.5.1 netaddr==0.8.0 packaging==23.1 -phonenumbers==8.13.14 -Pillow==9.5.0 +phonenumbers==8.13.15 +Pillow==10.0.0 prometheus-client==0.17.0 psycopg2==2.9.6 pyasn1==0.5.0 pyasn1-modules==0.3.0 pycparser==2.21 -pydantic==1.10.9 +pydantic==1.10.11 pymacaroons==0.13.0 PyNaCl==1.5.0 pyOpenSSL==23.2.0 @@ -47,7 +47,7 @@ six==1.16.0 sortedcontainers==2.4.0 treq==22.2.0 Twisted==22.10.0 -typing_extensions==4.6.3 +typing_extensions==4.7.1 unpaddedbase64==2.1.0 urllib3==2.0.3 webencodings==0.5.1 diff --git a/conf/requirement_bullseye.txt b/conf/requirement_bullseye.txt index b6e563e..be78c51 100644 --- a/conf/requirement_bullseye.txt +++ b/conf/requirement_bullseye.txt @@ -10,8 +10,8 @@ constantly==15.1.0 cryptography==41.0.1 hyperlink==21.0.0 idna==3.4 -ijson==3.2.1 -immutabledict==2.2.4 +ijson==3.2.2 +immutabledict==2.2.5 incremental==22.10.0 Jinja2==3.1.2 jsonschema==4.17.3 @@ -19,21 +19,21 @@ ldap3==2.9.1 lxml==4.9.2 MarkupSafe==2.1.3 matrix-common==1.3.0 -matrix-synapse==1.86.0 +matrix-synapse==1.87.0 matrix-synapse-ldap3==0.2.2 msgpack==1.0.5 ndg-httpsclient==0.5.1 netaddr==0.8.0 packaging==23.1 -phonenumbers==8.13.14 -Pillow==9.5.0 +phonenumbers==8.13.15 +Pillow==10.0.0 pkg_resources==0.0.0 prometheus-client==0.17.0 psycopg2==2.9.6 pyasn1==0.5.0 pyasn1-modules==0.3.0 pycparser==2.21 -pydantic==1.10.9 +pydantic==1.10.11 pymacaroons==0.13.0 PyNaCl==1.5.0 pyOpenSSL==23.2.0 @@ -48,7 +48,7 @@ six==1.16.0 sortedcontainers==2.4.0 treq==22.2.0 Twisted==22.10.0 -typing_extensions==4.6.3 +typing_extensions==4.7.1 unpaddedbase64==2.1.0 urllib3==2.0.3 webencodings==0.5.1 diff --git a/manifest.json b/manifest.json index 3402d58..b4e20e1 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.86.0~ynh1", + "version": "1.87.0~ynh1", "url": "http://matrix.org", "license": "Apache-2.0", "maintainer": { From 9077530074371b69d72dd36025dba49d6e0ea9d9 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 5 Jul 2023 09:08:39 +0000 Subject: [PATCH 23/36] 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 9d42538..44f1d2f 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.85.1~ynh1 +**Shipped version:** 1.87.0~ynh1 ## Disclaimers / important information ## Configuration diff --git a/README_fr.md b/README_fr.md index faea5fa..775cc07 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.85.1~ynh1 +**Version incluse :** 1.87.0~ynh1 ## Avertissements / informations importantes ## Configuration From c2848f5b3f534307f737423b7f0b765b6c5f640d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Wed, 19 Jul 2023 01:03:26 +0200 Subject: [PATCH 24/36] Upgrade synapse to 1.88.0 --- conf/armv7_bookworm.src | 4 ++-- conf/armv7_bullseye.src | 4 ++-- conf/requirement_bookworm.txt | 20 +++++++++++--------- conf/requirement_bullseye.txt | 20 +++++++++++--------- manifest.json | 2 +- 5 files changed, 27 insertions(+), 23 deletions(-) diff --git a/conf/armv7_bookworm.src b/conf/armv7_bookworm.src index 05b6043..231869d 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.87.0/matrix-synapse_1.87.0-bookworm-bin1_armv7l.tar.gz -SOURCE_SUM=06ffecadab9328f5653bd5a8276085fa7c1f27c90c97096c24fa60a12c5e74b9 +SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.88.0/matrix-synapse_1.88.0-bookworm-bin1_armv7l.tar.gz +SOURCE_SUM=41656466893c339b9f34a0a46db7563363fcfe4c1443d7078aaba14051a1ef85 # (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 174f53d..a47b02c 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.87.0/matrix-synapse_1.87.0-bullseye-bin1_armv7l.tar.gz -SOURCE_SUM=0196d46e7c0e935ed9a6713433de358f300cedcd0bf4017ef82432aa8551bcf4 +SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.88.0/matrix-synapse_1.88.0-bullseye-bin1_armv7l.tar.gz +SOURCE_SUM=048a26443449fef69fab0fc7adadd6ffb3324f67526090bd0296c8320592ee37 # (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 e78a14c..19ea390 100644 --- a/conf/requirement_bookworm.txt +++ b/conf/requirement_bookworm.txt @@ -5,29 +5,30 @@ bleach==6.0.0 canonicaljson==2.0.0 certifi==2023.5.7 cffi==1.15.1 -charset-normalizer==3.1.0 +charset-normalizer==3.2.0 constantly==15.1.0 -cryptography==41.0.1 +cryptography==41.0.2 hyperlink==21.0.0 idna==3.4 ijson==3.2.2 immutabledict==2.2.5 incremental==22.10.0 Jinja2==3.1.2 -jsonschema==4.17.3 +jsonschema==4.18.4 +jsonschema-specifications==2023.7.1 ldap3==2.9.1 -lxml==4.9.2 +lxml==4.9.3 MarkupSafe==2.1.3 matrix-common==1.3.0 -matrix-synapse==1.87.0 +matrix-synapse==1.88.0 matrix-synapse-ldap3==0.2.2 msgpack==1.0.5 ndg-httpsclient==0.5.1 netaddr==0.8.0 packaging==23.1 -phonenumbers==8.13.15 +phonenumbers==8.13.16 Pillow==10.0.0 -prometheus-client==0.17.0 +prometheus-client==0.17.1 psycopg2==2.9.6 pyasn1==0.5.0 pyasn1-modules==0.3.0 @@ -36,9 +37,10 @@ pydantic==1.10.11 pymacaroons==0.13.0 PyNaCl==1.5.0 pyOpenSSL==23.2.0 -pyrsistent==0.19.3 -PyYAML==6.0 +PyYAML==6.0.1 +referencing==0.30.0 requests==2.31.0 +rpds-py==0.9.2 semantic-version==2.10.0 service-identity==23.1.0 setuptools-rust==1.6.0 diff --git a/conf/requirement_bullseye.txt b/conf/requirement_bullseye.txt index be78c51..f741894 100644 --- a/conf/requirement_bullseye.txt +++ b/conf/requirement_bullseye.txt @@ -5,30 +5,31 @@ bleach==6.0.0 canonicaljson==2.0.0 certifi==2023.5.7 cffi==1.15.1 -charset-normalizer==3.1.0 +charset-normalizer==3.2.0 constantly==15.1.0 -cryptography==41.0.1 +cryptography==41.0.2 hyperlink==21.0.0 idna==3.4 ijson==3.2.2 immutabledict==2.2.5 incremental==22.10.0 Jinja2==3.1.2 -jsonschema==4.17.3 +jsonschema==4.18.4 +jsonschema-specifications==2023.7.1 ldap3==2.9.1 -lxml==4.9.2 +lxml==4.9.3 MarkupSafe==2.1.3 matrix-common==1.3.0 -matrix-synapse==1.87.0 +matrix-synapse==1.88.0 matrix-synapse-ldap3==0.2.2 msgpack==1.0.5 ndg-httpsclient==0.5.1 netaddr==0.8.0 packaging==23.1 -phonenumbers==8.13.15 +phonenumbers==8.13.16 Pillow==10.0.0 pkg_resources==0.0.0 -prometheus-client==0.17.0 +prometheus-client==0.17.1 psycopg2==2.9.6 pyasn1==0.5.0 pyasn1-modules==0.3.0 @@ -37,9 +38,10 @@ pydantic==1.10.11 pymacaroons==0.13.0 PyNaCl==1.5.0 pyOpenSSL==23.2.0 -pyrsistent==0.19.3 -PyYAML==6.0 +PyYAML==6.0.1 +referencing==0.30.0 requests==2.31.0 +rpds-py==0.9.2 semantic-version==2.10.0 service-identity==23.1.0 setuptools-rust==1.6.0 diff --git a/manifest.json b/manifest.json index b4e20e1..04dd94a 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.87.0~ynh1", + "version": "1.88.0~ynh1", "url": "http://matrix.org", "license": "Apache-2.0", "maintainer": { From f7c5140f5bf0b3bef04aec16540d2c58674f0e87 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 25 Jul 2023 07:08:22 +0000 Subject: [PATCH 25/36] 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 44f1d2f..2222907 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.87.0~ynh1 +**Shipped version:** 1.88.0~ynh1 ## Disclaimers / important information ## Configuration diff --git a/README_fr.md b/README_fr.md index 775cc07..771e319 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.87.0~ynh1 +**Version incluse :** 1.88.0~ynh1 ## Avertissements / informations importantes ## Configuration From 9ccb41083e8987adb6175ae952c873b7e8d0df2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Wed, 2 Aug 2023 01:17:51 +0200 Subject: [PATCH 26/36] Upgrade synapse to 1.89.0 --- conf/armv7_bookworm.src | 4 ++-- conf/armv7_bullseye.src | 4 ++-- conf/requirement_bookworm.txt | 16 ++++++++-------- conf/requirement_bullseye.txt | 14 +++++++------- manifest.json | 2 +- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/conf/armv7_bookworm.src b/conf/armv7_bookworm.src index 231869d..e6b4c23 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.88.0/matrix-synapse_1.88.0-bookworm-bin1_armv7l.tar.gz -SOURCE_SUM=41656466893c339b9f34a0a46db7563363fcfe4c1443d7078aaba14051a1ef85 +SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.89.0/matrix-synapse_1.89.0-bookworm-bin1_armv7l.tar.gz +SOURCE_SUM=aaf0d8d5a24b7a98c9e41fd43faa2ebfc8baa00ce56a0f7180cfe560a60a8842 # (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 a47b02c..ab1a8b9 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.88.0/matrix-synapse_1.88.0-bullseye-bin1_armv7l.tar.gz -SOURCE_SUM=048a26443449fef69fab0fc7adadd6ffb3324f67526090bd0296c8320592ee37 +SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.89.0/matrix-synapse_1.89.0-bullseye-bin1_armv7l.tar.gz +SOURCE_SUM=098caf6bff5ad1433e99e1c4950b1a3c1e4b661ca17ae6e1ca2d5c199bea7934 # (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 19ea390..bc4f56d 100644 --- a/conf/requirement_bookworm.txt +++ b/conf/requirement_bookworm.txt @@ -3,15 +3,15 @@ Automat==22.10.0 bcrypt==4.0.1 bleach==6.0.0 canonicaljson==2.0.0 -certifi==2023.5.7 +certifi==2023.7.22 cffi==1.15.1 charset-normalizer==3.2.0 constantly==15.1.0 -cryptography==41.0.2 +cryptography==41.0.3 hyperlink==21.0.0 idna==3.4 -ijson==3.2.2 -immutabledict==2.2.5 +ijson==3.2.3 +immutabledict==3.0.0 incremental==22.10.0 Jinja2==3.1.2 jsonschema==4.18.4 @@ -20,20 +20,20 @@ ldap3==2.9.1 lxml==4.9.3 MarkupSafe==2.1.3 matrix-common==1.3.0 -matrix-synapse==1.88.0 +matrix-synapse==1.89.0 matrix-synapse-ldap3==0.2.2 msgpack==1.0.5 ndg-httpsclient==0.5.1 netaddr==0.8.0 packaging==23.1 -phonenumbers==8.13.16 +phonenumbers==8.13.17 Pillow==10.0.0 prometheus-client==0.17.1 psycopg2==2.9.6 pyasn1==0.5.0 pyasn1-modules==0.3.0 pycparser==2.21 -pydantic==1.10.11 +pydantic==1.10.12 pymacaroons==0.13.0 PyNaCl==1.5.0 pyOpenSSL==23.2.0 @@ -51,6 +51,6 @@ treq==22.2.0 Twisted==22.10.0 typing_extensions==4.7.1 unpaddedbase64==2.1.0 -urllib3==2.0.3 +urllib3==2.0.4 webencodings==0.5.1 zope.interface==6.0 diff --git a/conf/requirement_bullseye.txt b/conf/requirement_bullseye.txt index f741894..c57872d 100644 --- a/conf/requirement_bullseye.txt +++ b/conf/requirement_bullseye.txt @@ -3,15 +3,15 @@ Automat==22.10.0 bcrypt==4.0.1 bleach==6.0.0 canonicaljson==2.0.0 -certifi==2023.5.7 +certifi==2023.7.22 cffi==1.15.1 charset-normalizer==3.2.0 constantly==15.1.0 cryptography==41.0.2 hyperlink==21.0.0 idna==3.4 -ijson==3.2.2 -immutabledict==2.2.5 +ijson==3.2.3 +immutabledict==3.0.0 incremental==22.10.0 Jinja2==3.1.2 jsonschema==4.18.4 @@ -20,13 +20,13 @@ ldap3==2.9.1 lxml==4.9.3 MarkupSafe==2.1.3 matrix-common==1.3.0 -matrix-synapse==1.88.0 +matrix-synapse==1.89.0 matrix-synapse-ldap3==0.2.2 msgpack==1.0.5 ndg-httpsclient==0.5.1 netaddr==0.8.0 packaging==23.1 -phonenumbers==8.13.16 +phonenumbers==8.13.17 Pillow==10.0.0 pkg_resources==0.0.0 prometheus-client==0.17.1 @@ -34,7 +34,7 @@ psycopg2==2.9.6 pyasn1==0.5.0 pyasn1-modules==0.3.0 pycparser==2.21 -pydantic==1.10.11 +pydantic==1.10.12 pymacaroons==0.13.0 PyNaCl==1.5.0 pyOpenSSL==23.2.0 @@ -52,6 +52,6 @@ treq==22.2.0 Twisted==22.10.0 typing_extensions==4.7.1 unpaddedbase64==2.1.0 -urllib3==2.0.3 +urllib3==2.0.4 webencodings==0.5.1 zope.interface==6.0 diff --git a/manifest.json b/manifest.json index 04dd94a..55e009c 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.88.0~ynh1", + "version": "1.89.0~ynh1", "url": "http://matrix.org", "license": "Apache-2.0", "maintainer": { From 42d08c8544daabe93e0fee7cc9ec7d12c023431d Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 2 Aug 2023 20:54:09 +0000 Subject: [PATCH 27/36] 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 2222907..2cd90aa 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.88.0~ynh1 +**Shipped version:** 1.89.0~ynh1 ## Disclaimers / important information ## Configuration diff --git a/README_fr.md b/README_fr.md index 771e319..a22ecc4 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.88.0~ynh1 +**Version incluse :** 1.89.0~ynh1 ## Avertissements / informations importantes ## Configuration From 8f3ab46059f895b81429475c658de81e5761c4c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Wed, 16 Aug 2023 01:07:13 +0200 Subject: [PATCH 28/36] Upgrade synapse to 1.90.0 --- conf/armv7_bookworm.src | 4 ++-- conf/armv7_bullseye.src | 4 ++-- conf/requirement_bookworm.txt | 10 +++++----- conf/requirement_bullseye.txt | 12 ++++++------ manifest.json | 2 +- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/conf/armv7_bookworm.src b/conf/armv7_bookworm.src index e6b4c23..7a08df6 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.89.0/matrix-synapse_1.89.0-bookworm-bin1_armv7l.tar.gz -SOURCE_SUM=aaf0d8d5a24b7a98c9e41fd43faa2ebfc8baa00ce56a0f7180cfe560a60a8842 +SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.90.0/matrix-synapse_1.90.0-bookworm-bin1_armv7l.tar.gz +SOURCE_SUM=6e869b587e30e905fa6d3efc1567595cdac9a6eb342dba3e8c14591bfcbb7870 # (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 ab1a8b9..054a831 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.89.0/matrix-synapse_1.89.0-bullseye-bin1_armv7l.tar.gz -SOURCE_SUM=098caf6bff5ad1433e99e1c4950b1a3c1e4b661ca17ae6e1ca2d5c199bea7934 +SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.90.0/matrix-synapse_1.90.0-bullseye-bin1_armv7l.tar.gz +SOURCE_SUM=09f2f573868f9c73a7cb1a9cdb42ca7a00b65d911e1d7eda01b68fbde90a30df # (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 bc4f56d..85f2639 100644 --- a/conf/requirement_bookworm.txt +++ b/conf/requirement_bookworm.txt @@ -14,22 +14,22 @@ ijson==3.2.3 immutabledict==3.0.0 incremental==22.10.0 Jinja2==3.1.2 -jsonschema==4.18.4 +jsonschema==4.19.0 jsonschema-specifications==2023.7.1 ldap3==2.9.1 lxml==4.9.3 MarkupSafe==2.1.3 matrix-common==1.3.0 -matrix-synapse==1.89.0 +matrix-synapse==1.90.0 matrix-synapse-ldap3==0.2.2 msgpack==1.0.5 ndg-httpsclient==0.5.1 netaddr==0.8.0 packaging==23.1 -phonenumbers==8.13.17 +phonenumbers==8.13.18 Pillow==10.0.0 prometheus-client==0.17.1 -psycopg2==2.9.6 +psycopg2==2.9.7 pyasn1==0.5.0 pyasn1-modules==0.3.0 pycparser==2.21 @@ -38,7 +38,7 @@ pymacaroons==0.13.0 PyNaCl==1.5.0 pyOpenSSL==23.2.0 PyYAML==6.0.1 -referencing==0.30.0 +referencing==0.30.2 requests==2.31.0 rpds-py==0.9.2 semantic-version==2.10.0 diff --git a/conf/requirement_bullseye.txt b/conf/requirement_bullseye.txt index c57872d..3a30145 100644 --- a/conf/requirement_bullseye.txt +++ b/conf/requirement_bullseye.txt @@ -7,30 +7,30 @@ certifi==2023.7.22 cffi==1.15.1 charset-normalizer==3.2.0 constantly==15.1.0 -cryptography==41.0.2 +cryptography==41.0.3 hyperlink==21.0.0 idna==3.4 ijson==3.2.3 immutabledict==3.0.0 incremental==22.10.0 Jinja2==3.1.2 -jsonschema==4.18.4 +jsonschema==4.19.0 jsonschema-specifications==2023.7.1 ldap3==2.9.1 lxml==4.9.3 MarkupSafe==2.1.3 matrix-common==1.3.0 -matrix-synapse==1.89.0 +matrix-synapse==1.90.0 matrix-synapse-ldap3==0.2.2 msgpack==1.0.5 ndg-httpsclient==0.5.1 netaddr==0.8.0 packaging==23.1 -phonenumbers==8.13.17 +phonenumbers==8.13.18 Pillow==10.0.0 pkg_resources==0.0.0 prometheus-client==0.17.1 -psycopg2==2.9.6 +psycopg2==2.9.7 pyasn1==0.5.0 pyasn1-modules==0.3.0 pycparser==2.21 @@ -39,7 +39,7 @@ pymacaroons==0.13.0 PyNaCl==1.5.0 pyOpenSSL==23.2.0 PyYAML==6.0.1 -referencing==0.30.0 +referencing==0.30.2 requests==2.31.0 rpds-py==0.9.2 semantic-version==2.10.0 diff --git a/manifest.json b/manifest.json index 55e009c..848ace3 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.89.0~ynh1", + "version": "1.90.0~ynh1", "url": "http://matrix.org", "license": "Apache-2.0", "maintainer": { From bd61bd9d75d056b8091e352ae106f3d442ee1fe9 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 16 Aug 2023 06:52:15 +0000 Subject: [PATCH 29/36] 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 2cd90aa..961eb1c 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.89.0~ynh1 +**Shipped version:** 1.90.0~ynh1 ## Disclaimers / important information ## Configuration diff --git a/README_fr.md b/README_fr.md index a22ecc4..f428103 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.89.0~ynh1 +**Version incluse :** 1.90.0~ynh1 ## Avertissements / informations importantes ## Configuration From 19c7d017502d525f4199cf1c4b960144f0739010 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 26 Aug 2023 12:01:31 +0200 Subject: [PATCH 30/36] Update check_process --- check_process | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/check_process b/check_process index 9c28469..ba82e45 100644 --- a/check_process +++ b/check_process @@ -15,7 +15,7 @@ upgrade=1 from_commit=0a485e0d6bcd14392b9203b3b27e7e1a7ba21d19 upgrade=1 from_commit=6af39e6e086e70e2063eb8f63c48a1e4a597300d backup_restore=1 - multi_instance=0 + multi_instance=1 incorrect_path=0 port_already_use=1 (8448) change_url=0 From a83c3438a5587badadb6584a33ade428e87a5ef7 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 26 Aug 2023 12:07:09 +0200 Subject: [PATCH 31/36] extra_php --- conf/extra_php-fpm.conf | 4 + conf/php-fpm.conf | 392 ---------------------------------------- scripts/install | 3 +- scripts/restore | 2 +- scripts/upgrade | 3 +- 5 files changed, 9 insertions(+), 395 deletions(-) create mode 100644 conf/extra_php-fpm.conf delete mode 100644 conf/php-fpm.conf diff --git a/conf/extra_php-fpm.conf b/conf/extra_php-fpm.conf new file mode 100644 index 0000000..f796032 --- /dev/null +++ b/conf/extra_php-fpm.conf @@ -0,0 +1,4 @@ +; Additional php.ini defines, specific to this pool of workers. + +php_admin_value[upload_max_filesize] = 100M +php_admin_value[post_max_size] = 100M diff --git a/conf/php-fpm.conf b/conf/php-fpm.conf deleted file mode 100644 index 223f72f..0000000 --- a/conf/php-fpm.conf +++ /dev/null @@ -1,392 +0,0 @@ -; Start a new pool named 'www'. -; the variable $pool can we used in any directive and will be replaced by the -; pool name ('www' here) -[__NAMETOCHANGE__] - -; Per pool prefix -; It only applies on the following directives: -; - 'slowlog' -; - 'listen' (unixsocket) -; - 'chroot' -; - 'chdir' -; - 'php_values' -; - 'php_admin_values' -; When not set, the global prefix (or /usr) applies instead. -; Note: This directive can also be relative to the global prefix. -; Default Value: none -;prefix = /path/to/pools/$pool - -; Unix user/group of processes -; Note: The user is mandatory. If the group is not set, the default user's group -; will be used. -user = matrix-__USER__ -group = matrix-__USER__ - -; The address on which to accept FastCGI requests. -; Valid syntaxes are: -; 'ip.add.re.ss:port' - to listen on a TCP socket to a specific address on -; a specific port; -; 'port' - to listen on a TCP socket to all addresses on a -; specific port; -; '/path/to/unix/socket' - to listen on a unix socket. -; Note: This value is mandatory. -listen = /run/php__PHPVERSION__-fpm-__NAMETOCHANGE__.sock - -; Set listen(2) backlog. A value of '-1' means unlimited. -; Default Value: 128 (-1 on FreeBSD and OpenBSD) -;listen.backlog = 128 - -; Set permissions for unix socket, if one is used. In Linux, read/write -; permissions must be set in order to allow connections from a web server. Many -; BSD-derived systems allow connections regardless of permissions. -; Default Values: user and group are set as the running user -; mode is set to 0660 -listen.owner = www-data -listen.group = www-data -;listen.mode = 0660 - -; List of ipv4 addresses of FastCGI clients which are allowed to connect. -; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original -; PHP FCGI (5.2.2+). Makes sense only with a tcp listening socket. Each address -; must be separated by a comma. If this value is left blank, connections will be -; accepted from any ip address. -; Default Value: any -;listen.allowed_clients = 127.0.0.1 - -; Specify the nice(2) priority to apply to the pool processes (only if set) -; The value can vary from -19 (highest priority) to 20 (lower priority) -; Note: - It will only work if the FPM master process is launched as root -; - The pool processes will inherit the master process priority -; unless it specified otherwise -; Default Value: no set -; priority = -19 - -; Choose how the process manager will control the number of child processes. -; Possible Values: -; static - a fixed number (pm.max_children) of child processes; -; dynamic - the number of child processes are set dynamically based on the -; following directives. With this process management, there will be -; always at least 1 children. -; pm.max_children - the maximum number of children that can -; be alive at the same time. -; pm.start_servers - the number of children created on startup. -; pm.min_spare_servers - the minimum number of children in 'idle' -; state (waiting to process). If the number -; of 'idle' processes is less than this -; number then some children will be created. -; pm.max_spare_servers - the maximum number of children in 'idle' -; state (waiting to process). If the number -; of 'idle' processes is greater than this -; number then some children will be killed. -; ondemand - no children are created at startup. Children will be forked when -; new requests will connect. The following parameter are used: -; pm.max_children - the maximum number of children that -; can be alive at the same time. -; pm.process_idle_timeout - The number of seconds after which -; an idle process will be killed. -; Note: This value is mandatory. -pm = dynamic - -; The number of child processes to be created when pm is set to 'static' and the -; maximum number of child processes when pm is set to 'dynamic' or 'ondemand'. -; This value sets the limit on the number of simultaneous requests that will be -; served. Equivalent to the ApacheMaxClients directive with mpm_prefork. -; Equivalent to the PHP_FCGI_CHILDREN environment variable in the original PHP -; CGI. The below defaults are based on a server without much resources. Don't -; forget to tweak pm.* to fit your needs. -; Note: Used when pm is set to 'static', 'dynamic' or 'ondemand' -; Note: This value is mandatory. -pm.max_children = 5 - -; The number of child processes created on startup. -; Note: Used only when pm is set to 'dynamic' -; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2 -pm.start_servers = 1 - -; The desired minimum number of idle server processes. -; Note: Used only when pm is set to 'dynamic' -; Note: Mandatory when pm is set to 'dynamic' -pm.min_spare_servers = 1 - -; The desired maximum number of idle server processes. -; Note: Used only when pm is set to 'dynamic' -; Note: Mandatory when pm is set to 'dynamic' -pm.max_spare_servers = 2 - -; The number of seconds after which an idle process will be killed. -; Note: Used only when pm is set to 'ondemand' -; Default Value: 10s -;pm.process_idle_timeout = 10s; - -; The number of requests each child process should execute before respawning. -; This can be useful to work around memory leaks in 3rd party libraries. For -; endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. -; Default Value: 0 -pm.max_requests = 500 - -; The URI to view the FPM status page. If this value is not set, no URI will be -; recognized as a status page. It shows the following informations: -; pool - the name of the pool; -; process manager - static, dynamic or ondemand; -; start time - the date and time FPM has started; -; start since - number of seconds since FPM has started; -; accepted conn - the number of request accepted by the pool; -; listen queue - the number of request in the queue of pending -; connections (see backlog in listen(2)); -; max listen queue - the maximum number of requests in the queue -; of pending connections since FPM has started; -; listen queue len - the size of the socket queue of pending connections; -; idle processes - the number of idle processes; -; active processes - the number of active processes; -; total processes - the number of idle + active processes; -; max active processes - the maximum number of active processes since FPM -; has started; -; max children reached - number of times, the process limit has been reached, -; when pm tries to start more children (works only for -; pm 'dynamic' and 'ondemand'); -; Value are updated in real time. -; Example output: -; pool: www -; process manager: static -; start time: 01/Jul/2011:17:53:49 +0200 -; start since: 62636 -; accepted conn: 190460 -; listen queue: 0 -; max listen queue: 1 -; listen queue len: 42 -; idle processes: 4 -; active processes: 11 -; total processes: 15 -; max active processes: 12 -; max children reached: 0 -; -; By default the status page output is formatted as text/plain. Passing either -; 'html', 'xml' or 'json' in the query string will return the corresponding -; output syntax. Example: -; http://www.foo.bar/status -; http://www.foo.bar/status?json -; http://www.foo.bar/status?html -; http://www.foo.bar/status?xml -; -; By default the status page only outputs short status. Passing 'full' in the -; query string will also return status for each pool process. -; Example: -; http://www.foo.bar/status?full -; http://www.foo.bar/status?json&full -; http://www.foo.bar/status?html&full -; http://www.foo.bar/status?xml&full -; The Full status returns for each process: -; pid - the PID of the process; -; state - the state of the process (Idle, Running, ...); -; start time - the date and time the process has started; -; start since - the number of seconds since the process has started; -; requests - the number of requests the process has served; -; request duration - the duration in µs of the requests; -; request method - the request method (GET, POST, ...); -; request URI - the request URI with the query string; -; content length - the content length of the request (only with POST); -; user - the user (PHP_AUTH_USER) (or '-' if not set); -; script - the main script called (or '-' if not set); -; last request cpu - the %cpu the last request consumed -; it's always 0 if the process is not in Idle state -; because CPU calculation is done when the request -; processing has terminated; -; last request memory - the max amount of memory the last request consumed -; it's always 0 if the process is not in Idle state -; because memory calculation is done when the request -; processing has terminated; -; If the process is in Idle state, then informations are related to the -; last request the process has served. Otherwise informations are related to -; the current request being served. -; Example output: -; ************************ -; pid: 31330 -; state: Running -; start time: 01/Jul/2011:17:53:49 +0200 -; start since: 63087 -; requests: 12808 -; request duration: 1250261 -; request method: GET -; request URI: /test_mem.php?N=10000 -; content length: 0 -; user: - -; script: /home/fat/web/docs/php/test_mem.php -; last request cpu: 0.00 -; last request memory: 0 -; -; Note: There is a real-time FPM status monitoring sample web page available -; It's available in: ${prefix}/share/fpm/status.html -; -; Note: The value must start with a leading slash (/). The value can be -; anything, but it may not be a good idea to use the .php extension or it -; may conflict with a real PHP file. -; Default Value: not set -;pm.status_path = /status - -; The ping URI to call the monitoring page of FPM. If this value is not set, no -; URI will be recognized as a ping page. This could be used to test from outside -; that FPM is alive and responding, or to -; - create a graph of FPM availability (rrd or such); -; - remove a server from a group if it is not responding (load balancing); -; - trigger alerts for the operating team (24/7). -; Note: The value must start with a leading slash (/). The value can be -; anything, but it may not be a good idea to use the .php extension or it -; may conflict with a real PHP file. -; Default Value: not set -;ping.path = /ping - -; This directive may be used to customize the response of a ping request. The -; response is formatted as text/plain with a 200 response code. -; Default Value: pong -;ping.response = pong - -; The access log file -; Default: not set -;access.log = log/$pool.access.log - -; The access log format. -; The following syntax is allowed -; %%: the '%' character -; %C: %CPU used by the request -; it can accept the following format: -; - %{user}C for user CPU only -; - %{system}C for system CPU only -; - %{total}C for user + system CPU (default) -; %d: time taken to serve the request -; it can accept the following format: -; - %{seconds}d (default) -; - %{miliseconds}d -; - %{mili}d -; - %{microseconds}d -; - %{micro}d -; %e: an environment variable (same as $_ENV or $_SERVER) -; it must be associated with embraces to specify the name of the env -; variable. Some exemples: -; - server specifics like: %{REQUEST_METHOD}e or %{SERVER_PROTOCOL}e -; - HTTP headers like: %{HTTP_HOST}e or %{HTTP_USER_AGENT}e -; %f: script filename -; %l: content-length of the request (for POST request only) -; %m: request method -; %M: peak of memory allocated by PHP -; it can accept the following format: -; - %{bytes}M (default) -; - %{kilobytes}M -; - %{kilo}M -; - %{megabytes}M -; - %{mega}M -; %n: pool name -; %o: ouput header -; it must be associated with embraces to specify the name of the header: -; - %{Content-Type}o -; - %{X-Powered-By}o -; - %{Transfert-Encoding}o -; - .... -; %p: PID of the child that serviced the request -; %P: PID of the parent of the child that serviced the request -; %q: the query string -; %Q: the '?' character if query string exists -; %r: the request URI (without the query string, see %q and %Q) -; %R: remote IP address -; %s: status (response code) -; %t: server time the request was received -; it can accept a strftime(3) format: -; %d/%b/%Y:%H:%M:%S %z (default) -; %T: time the log has been written (the request has finished) -; it can accept a strftime(3) format: -; %d/%b/%Y:%H:%M:%S %z (default) -; %u: remote user -; -; Default: "%R - %u %t \"%m %r\" %s" -;access.format = "%R - %u %t \"%m %r%Q%q\" %s %f %{mili}d %{kilo}M %C%%" - -; The log file for slow requests -; Default Value: not set -; Note: slowlog is mandatory if request_slowlog_timeout is set -slowlog = /var/log/nginx/__NAMETOCHANGE__.slow.log - -; The timeout for serving a single request after which a PHP backtrace will be -; dumped to the 'slowlog' file. A value of '0s' means 'off'. -; Available units: s(econds)(default), m(inutes), h(ours), or d(ays) -; Default Value: 0 -request_slowlog_timeout = 5s - -; The timeout for serving a single request after which the worker process will -; be killed. This option should be used when the 'max_execution_time' ini option -; does not stop script execution for some reason. A value of '0' means 'off'. -; Available units: s(econds)(default), m(inutes), h(ours), or d(ays) -; Default Value: 0 -request_terminate_timeout = 1d - -; Set open file descriptor rlimit. -; Default Value: system defined value -;rlimit_files = 1024 - -; Set max core size rlimit. -; Possible Values: 'unlimited' or an integer greater or equal to 0 -; Default Value: system defined value -;rlimit_core = 0 - -; Chroot to this directory at the start. This value must be defined as an -; absolute path. When this value is not set, chroot is not used. -; Note: you can prefix with '$prefix' to chroot to the pool prefix or one -; of its subdirectories. If the pool prefix is not set, the global prefix -; will be used instead. -; Note: chrooting is a great security feature and should be used whenever -; possible. However, all PHP paths will be relative to the chroot -; (error_log, sessions.save_path, ...). -; Default Value: not set -;chroot = - -; Chdir to this directory at the start. -; Note: relative path can be used. -; Default Value: current directory or / when chroot -chdir = /var/www/__NAMETOCHANGE__ - -; Redirect worker stdout and stderr into main error log. If not set, stdout and -; stderr will be redirected to /dev/null according to FastCGI specs. -; Note: on highloaded environement, this can cause some delay in the page -; process time (several ms). -; Default Value: no -catch_workers_output = yes - -; Limits the extensions of the main script FPM will allow to parse. This can -; prevent configuration mistakes on the web server side. You should only limit -; FPM to .php extensions to prevent malicious users to use other extensions to -; exectute php code. -; Note: set an empty value to allow all extensions. -; Default Value: .php -;security.limit_extensions = .php .php3 .php4 .php5 - -; Pass environment variables like LD_LIBRARY_PATH. All $VARIABLEs are taken from -; the current environment. -; Default Value: clean env -;env[HOSTNAME] = $HOSTNAME -;env[PATH] = /usr/local/bin:/usr/bin:/bin -;env[TMP] = /tmp -;env[TMPDIR] = /tmp -;env[TEMP] = /tmp - -; Additional php.ini defines, specific to this pool of workers. These settings -; overwrite the values previously defined in the php.ini. The directives are the -; same as the PHP SAPI: -; php_value/php_flag - you can set classic ini defines which can -; be overwritten from PHP call 'ini_set'. -; php_admin_value/php_admin_flag - these directives won't be overwritten by -; PHP call 'ini_set' -; For php_*flag, valid values are on, off, 1, 0, true, false, yes or no. - -; Defining 'extension' will load the corresponding shared extension from -; extension_dir. Defining 'disable_functions' or 'disable_classes' will not -; overwrite previously defined php.ini values, but will append the new value -; instead. - -; Note: path INI options can be relative and will be expanded with the prefix -; (pool, global or /usr) - -; Default Value: nothing is defined by default except the values in php.ini and -; specified at startup with the -d argument -;php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f www@my.domain.com -;php_flag[display_errors] = off -;php_admin_value[error_log] = /var/log/fpm-php.www.log -;php_admin_flag[log_errors] = on -;php_admin_value[memory_limit] = 32M diff --git a/scripts/install b/scripts/install index d29754c..64230b5 100644 --- a/scripts/install +++ b/scripts/install @@ -248,7 +248,8 @@ ynh_script_progression --message="Configuring NGINX web server..." --weight=2 # Create a dedicated php-fpm config ynh_script_progression --message="Configuring application..." -ynh_add_fpm_config + +ynh_add_fpm_config --usage=low --footprint=low # Create .well-known redirection for access by federation if yunohost --output-as plain domain list | grep -q "^$server_name$" diff --git a/scripts/restore b/scripts/restore index c2626ce..8c9ddc7 100644 --- a/scripts/restore +++ b/scripts/restore @@ -106,8 +106,8 @@ install_sources #================================================= # RESTORE FAIL2BAN CONFIGURATION #================================================= - ynh_script_progression --message="Reload Fail2Ban..." --weight=6 + ynh_systemd_action --action=restart --service_name=fail2ban #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index e48f9d8..2135886 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -329,7 +329,8 @@ ynh_script_progression --message="Upgrading NGINX web server configuration..." - # Create a dedicated php-fpm config ynh_script_progression --message="Configuring application..." -ynh_add_fpm_config + +ynh_add_fpm_config --usage=low --footprint=low # Create .well-known redirection for access by federation if yunohost --output-as plain domain list | grep -q "^$server_name$" From b1c2f2e7910457e4e2085b8ab4949584dd1e5786 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 26 Aug 2023 17:33:46 +0200 Subject: [PATCH 32/36] fix --- check_process | 2 +- manifest.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/check_process b/check_process index ba82e45..9c28469 100644 --- a/check_process +++ b/check_process @@ -15,7 +15,7 @@ upgrade=1 from_commit=0a485e0d6bcd14392b9203b3b27e7e1a7ba21d19 upgrade=1 from_commit=6af39e6e086e70e2063eb8f63c48a1e4a597300d backup_restore=1 - multi_instance=1 + multi_instance=0 incorrect_path=0 port_already_use=1 (8448) change_url=0 diff --git a/manifest.json b/manifest.json index 848ace3..2867f2c 100644 --- a/manifest.json +++ b/manifest.json @@ -19,9 +19,9 @@ "code": "https://github.com/matrix-org/synapse" }, "requirements": { - "yunohost": ">= 11.0.11" + "yunohost": ">= 11.2" }, - "multi_instance": true, + "multi_instance": false, "services": [ "nginx" ], From 22cb3c0fce1995f13ba455f505026911a42228e4 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 26 Aug 2023 17:35:23 +0200 Subject: [PATCH 33/36] fix --- check_process | 2 +- manifest.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/check_process b/check_process index ba82e45..9c28469 100644 --- a/check_process +++ b/check_process @@ -15,7 +15,7 @@ upgrade=1 from_commit=0a485e0d6bcd14392b9203b3b27e7e1a7ba21d19 upgrade=1 from_commit=6af39e6e086e70e2063eb8f63c48a1e4a597300d backup_restore=1 - multi_instance=1 + multi_instance=0 incorrect_path=0 port_already_use=1 (8448) change_url=0 diff --git a/manifest.json b/manifest.json index 848ace3..b82c846 100644 --- a/manifest.json +++ b/manifest.json @@ -21,7 +21,7 @@ "requirements": { "yunohost": ">= 11.0.11" }, - "multi_instance": true, + "multi_instance": false, "services": [ "nginx" ], From 0fc887f03a8c03818156b4c1b4de7564cdf4ebbe Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 26 Aug 2023 18:32:55 +0200 Subject: [PATCH 34/36] multi install --- check_process | 2 +- manifest.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/check_process b/check_process index 9c28469..ba82e45 100644 --- a/check_process +++ b/check_process @@ -15,7 +15,7 @@ upgrade=1 from_commit=0a485e0d6bcd14392b9203b3b27e7e1a7ba21d19 upgrade=1 from_commit=6af39e6e086e70e2063eb8f63c48a1e4a597300d backup_restore=1 - multi_instance=0 + multi_instance=1 incorrect_path=0 port_already_use=1 (8448) change_url=0 diff --git a/manifest.json b/manifest.json index b82c846..848ace3 100644 --- a/manifest.json +++ b/manifest.json @@ -21,7 +21,7 @@ "requirements": { "yunohost": ">= 11.0.11" }, - "multi_instance": false, + "multi_instance": true, "services": [ "nginx" ], From 27401bb2d3d1b2bcb88467852e1c9d6573e1ddf6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 27 Aug 2023 22:56:33 +0200 Subject: [PATCH 35/36] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 2867f2c..77f58a2 100644 --- a/manifest.json +++ b/manifest.json @@ -21,7 +21,7 @@ "requirements": { "yunohost": ">= 11.2" }, - "multi_instance": false, + "multi_instance": true, "services": [ "nginx" ], From af8007277f4e94902053245c6adf415bd8ecfb89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 27 Aug 2023 23:07:26 +0200 Subject: [PATCH 36/36] Update check_process --- check_process | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/check_process b/check_process index ba82e45..9c28469 100644 --- a/check_process +++ b/check_process @@ -15,7 +15,7 @@ upgrade=1 from_commit=0a485e0d6bcd14392b9203b3b27e7e1a7ba21d19 upgrade=1 from_commit=6af39e6e086e70e2063eb8f63c48a1e4a597300d backup_restore=1 - multi_instance=1 + multi_instance=0 incorrect_path=0 port_already_use=1 (8448) change_url=0