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 1/9] 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 2/9] 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 3/9] 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 4/9] 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 5/9] 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 6/9] 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 7/9] 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 8/9] 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 9/9] 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