1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/synapse_ynh.git synced 2024-09-03 20:26:38 +02:00

Merge pull request #387 from YunoHost-Apps/testing

Testing
This commit is contained in:
Josue-T 2023-06-08 00:10:34 +02:00 committed by GitHub
commit 8dda696892
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 29 additions and 20 deletions

View file

@ -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) 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.85.0~ynh1
## Disclaimers / important information ## Disclaimers / important information
## Configuration ## Configuration

View file

@ -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) 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.85.0~ynh1
## Avertissements / informations importantes ## Avertissements / informations importantes
## Configuration ## Configuration

View file

@ -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_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=fd516b379687540aa74c828a8d93cb05e59a04c03508258cfb6b331cfb80ea18 SOURCE_SUM=c9a08180ccdb4da8fc5afd1074996de7b7a8c5dc49c90f6cd28429f05b8cb5ea
# (Optional) Program to check the integrity (sha256sum, md5sum...) # (Optional) Program to check the integrity (sha256sum, md5sum...)
# default: sha256 # default: sha256
SOURCE_SUM_PRG=sha256sum SOURCE_SUM_PRG=sha256sum

View file

@ -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_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=70ea244b3527ccaaba5384106078c60ef1482b104924311af02406bd52eebf3c SOURCE_SUM=4fa1ce56fdf72e4baf47d2d39400bbe78723f42f34b39a662409f73c589346c0
# (Optional) Program to check the integrity (sha256sum, md5sum...) # (Optional) Program to check the integrity (sha256sum, md5sum...)
# default: sha256 # default: sha256
SOURCE_SUM_PRG=sha256sum SOURCE_SUM_PRG=sha256sum

View file

@ -7,7 +7,7 @@ certifi==2023.5.7
cffi==1.15.1 cffi==1.15.1
charset-normalizer==3.1.0 charset-normalizer==3.1.0
constantly==15.1.0 constantly==15.1.0
cryptography==40.0.2 cryptography==41.0.1
hyperlink==21.0.0 hyperlink==21.0.0
idna==3.4 idna==3.4
ijson==3.2.0.post0 ijson==3.2.0.post0
@ -17,15 +17,15 @@ Jinja2==3.1.2
jsonschema==4.17.3 jsonschema==4.17.3
ldap3==2.9.1 ldap3==2.9.1
lxml==4.9.2 lxml==4.9.2
MarkupSafe==2.1.2 MarkupSafe==2.1.3
matrix-common==1.3.0 matrix-common==1.3.0
matrix-synapse==1.84.1 matrix-synapse==1.85.0
matrix-synapse-ldap3==0.2.2 matrix-synapse-ldap3==0.2.2
msgpack==1.0.5 msgpack==1.0.5
ndg-httpsclient==0.5.1 ndg-httpsclient==0.5.1
netaddr==0.8.0 netaddr==0.8.0
packaging==23.1 packaging==23.1
phonenumbers==8.13.11 phonenumbers==8.13.13
Pillow==9.5.0 Pillow==9.5.0
prometheus-client==0.17.0 prometheus-client==0.17.0
psycopg2==2.9.6 psycopg2==2.9.6
@ -35,7 +35,7 @@ pycparser==2.21
pydantic==1.10.8 pydantic==1.10.8
pymacaroons==0.13.0 pymacaroons==0.13.0
PyNaCl==1.5.0 PyNaCl==1.5.0
pyOpenSSL==23.1.1 pyOpenSSL==23.2.0
pyrsistent==0.19.3 pyrsistent==0.19.3
PyYAML==6.0 PyYAML==6.0
requests==2.31.0 requests==2.31.0
@ -47,7 +47,7 @@ six==1.16.0
sortedcontainers==2.4.0 sortedcontainers==2.4.0
treq==22.2.0 treq==22.2.0
Twisted==22.10.0 Twisted==22.10.0
typing_extensions==4.6.2 typing_extensions==4.6.3
unpaddedbase64==2.1.0 unpaddedbase64==2.1.0
urllib3==2.0.2 urllib3==2.0.2
webencodings==0.5.1 webencodings==0.5.1

View file

@ -7,7 +7,7 @@ certifi==2023.5.7
cffi==1.15.1 cffi==1.15.1
charset-normalizer==3.1.0 charset-normalizer==3.1.0
constantly==15.1.0 constantly==15.1.0
cryptography==40.0.2 cryptography==41.0.1
hyperlink==21.0.0 hyperlink==21.0.0
idna==3.4 idna==3.4
ijson==3.2.0.post0 ijson==3.2.0.post0
@ -17,15 +17,15 @@ Jinja2==3.1.2
jsonschema==4.17.3 jsonschema==4.17.3
ldap3==2.9.1 ldap3==2.9.1
lxml==4.9.2 lxml==4.9.2
MarkupSafe==2.1.2 MarkupSafe==2.1.3
matrix-common==1.3.0 matrix-common==1.3.0
matrix-synapse==1.84.1 matrix-synapse==1.85.0
matrix-synapse-ldap3==0.2.2 matrix-synapse-ldap3==0.2.2
msgpack==1.0.5 msgpack==1.0.5
ndg-httpsclient==0.5.1 ndg-httpsclient==0.5.1
netaddr==0.8.0 netaddr==0.8.0
packaging==23.1 packaging==23.1
phonenumbers==8.13.11 phonenumbers==8.13.13
Pillow==9.5.0 Pillow==9.5.0
pkg_resources==0.0.0 pkg_resources==0.0.0
prometheus-client==0.17.0 prometheus-client==0.17.0
@ -36,7 +36,7 @@ pycparser==2.21
pydantic==1.10.8 pydantic==1.10.8
pymacaroons==0.13.0 pymacaroons==0.13.0
PyNaCl==1.5.0 PyNaCl==1.5.0
pyOpenSSL==23.1.1 pyOpenSSL==23.2.0
pyrsistent==0.19.3 pyrsistent==0.19.3
PyYAML==6.0 PyYAML==6.0
requests==2.31.0 requests==2.31.0
@ -48,7 +48,7 @@ six==1.16.0
sortedcontainers==2.4.0 sortedcontainers==2.4.0
treq==22.2.0 treq==22.2.0
Twisted==22.10.0 Twisted==22.10.0
typing_extensions==4.6.2 typing_extensions==4.6.3
unpaddedbase64==2.1.0 unpaddedbase64==2.1.0
urllib3==2.0.2 urllib3==2.0.2
webencodings==0.5.1 webencodings==0.5.1

View file

@ -6,7 +6,7 @@
"en": "Instant messaging server which uses Matrix", "en": "Instant messaging server which uses Matrix",
"fr": "Serveur de messagerie instantané basé sur Matrix" "fr": "Serveur de messagerie instantané basé sur Matrix"
}, },
"version": "1.84.1~ynh1", "version": "1.85.0~ynh1",
"url": "http://matrix.org", "url": "http://matrix.org",
"license": "Apache-2.0", "license": "Apache-2.0",
"maintainer": { "maintainer": {

View file

@ -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) # Ensure app-service folder has exists and the config file exit (Migration)
mkdir -p /etc/matrix-$app/app-service 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 # ADVERTISE SERVICE IN ADMIN PANEL

View file

@ -8,6 +8,8 @@ cp $service_config_file /tmp/app_service_backup.yaml
if [ -n "$(ls /etc/matrix-$app/app-service/)" ]; then if [ -n "$(ls /etc/matrix-$app/app-service/)" ]; then
echo "app_service_config_files:" > $service_config_file echo "app_service_config_files:" > $service_config_file
else
echo "" > $service_config_file
fi fi
for f in $(ls /etc/matrix-$app/app-service/); do for f in $(ls /etc/matrix-$app/app-service/); do
echo " - /etc/matrix-$app/app-service/$f" >> $service_config_file echo " - /etc/matrix-$app/app-service/$f" >> $service_config_file