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 #378 from YunoHost-Apps/testing

Testing
This commit is contained in:
Josue-T 2023-05-25 22:14:23 +02:00 committed by GitHub
commit 4737fc84a3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 48 additions and 36 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.81.0~ynh1 **Shipped version:** 1.84.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.81.0~ynh1 **Version incluse :** 1.84.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.81.0/matrix-synapse_1.81.0-bookworm-bin1_armv7l.tar.gz 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=429e1d7570322b44da083f003adfda0e2ebfd1773d9991dd5b9ad6df5ff56804 SOURCE_SUM=ca1c7a0f83e2394a9a1313b0c23cd33fb831630435c8a5f480a5241db1c30153
# (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.81.0/matrix-synapse_1.81.0-bullseye-bin1_armv7l.tar.gz 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=7469e9e303fa72f3c6bd2700a77fb5bfda8f8e2bbafdb6d4b4074d1fe6be4043 SOURCE_SUM=51e6ea132f7b957340488c5a7e76f33f8f958f3592b49616601f7d7488b3bf7e
# (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

@ -17,3 +17,13 @@ location __PATH__/ {
fastcgi_param SCRIPT_FILENAME cas_server.php; 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;
}

View file

@ -1,13 +1,13 @@
attrs==22.2.0 attrs==23.1.0
Automat==22.10.0 Automat==22.10.0
bcrypt==4.0.1 bcrypt==4.0.1
bleach==6.0.0 bleach==6.0.0
canonicaljson==2.0.0 canonicaljson==2.0.0
certifi==2022.12.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.1 cryptography==40.0.2
hyperlink==21.0.0 hyperlink==21.0.0
idna==3.4 idna==3.4
ijson==3.2.0.post0 ijson==3.2.0.post0
@ -19,36 +19,36 @@ ldap3==2.9.1
lxml==4.9.2 lxml==4.9.2
MarkupSafe==2.1.2 MarkupSafe==2.1.2
matrix-common==1.3.0 matrix-common==1.3.0
matrix-synapse==1.81.0 matrix-synapse==1.84.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.0 packaging==23.1
phonenumbers==8.13.9 phonenumbers==8.13.11
Pillow==9.5.0 Pillow==9.5.0
prometheus-client==0.16.0 prometheus-client==0.16.0
psycopg2==2.9.6 psycopg2==2.9.6
pyasn1==0.4.8 pyasn1==0.5.0
pyasn1-modules==0.2.8 pyasn1-modules==0.3.0
pycparser==2.21 pycparser==2.21
pydantic==1.10.7 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.1.1
pyrsistent==0.19.3 pyrsistent==0.19.3
PyYAML==6.0 PyYAML==6.0
requests==2.28.2 requests==2.31.0
semantic-version==2.10.0 semantic-version==2.10.0
service-identity==21.1.0 service-identity==21.1.0
setuptools-rust==1.5.2 setuptools-rust==1.6.0
signedjson==1.1.4 signedjson==1.1.4
six==1.16.0 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.5.0 typing_extensions==4.6.0
unpaddedbase64==2.1.0 unpaddedbase64==2.1.0
urllib3==1.26.15 urllib3==2.0.2
webencodings==0.5.1 webencodings==0.5.1
zope.interface==6.0 zope.interface==6.0

View file

@ -1,13 +1,13 @@
attrs==22.2.0 attrs==23.1.0
Automat==22.10.0 Automat==22.10.0
bcrypt==4.0.1 bcrypt==4.0.1
bleach==6.0.0 bleach==6.0.0
canonicaljson==2.0.0 canonicaljson==2.0.0
certifi==2022.12.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.1 cryptography==40.0.2
hyperlink==21.0.0 hyperlink==21.0.0
idna==3.4 idna==3.4
ijson==3.2.0.post0 ijson==3.2.0.post0
@ -19,37 +19,37 @@ ldap3==2.9.1
lxml==4.9.2 lxml==4.9.2
MarkupSafe==2.1.2 MarkupSafe==2.1.2
matrix-common==1.3.0 matrix-common==1.3.0
matrix-synapse==1.81.0 matrix-synapse==1.84.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.0 packaging==23.1
phonenumbers==8.13.9 phonenumbers==8.13.11
Pillow==9.5.0 Pillow==9.5.0
pkg_resources==0.0.0 pkg_resources==0.0.0
prometheus-client==0.16.0 prometheus-client==0.16.0
psycopg2==2.9.6 psycopg2==2.9.6
pyasn1==0.4.8 pyasn1==0.5.0
pyasn1-modules==0.2.8 pyasn1-modules==0.3.0
pycparser==2.21 pycparser==2.21
pydantic==1.10.7 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.1.1
pyrsistent==0.19.3 pyrsistent==0.19.3
PyYAML==6.0 PyYAML==6.0
requests==2.28.2 requests==2.31.0
semantic-version==2.10.0 semantic-version==2.10.0
service-identity==21.1.0 service-identity==21.1.0
setuptools-rust==1.5.2 setuptools-rust==1.6.0
signedjson==1.1.4 signedjson==1.1.4
six==1.16.0 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.5.0 typing_extensions==4.6.0
unpaddedbase64==2.1.0 unpaddedbase64==2.1.0
urllib3==1.26.15 urllib3==2.0.2
webencodings==0.5.1 webencodings==0.5.1
zope.interface==6.0 zope.interface==6.0

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.81.0~ynh1", "version": "1.84.0~ynh1",
"url": "http://matrix.org", "url": "http://matrix.org",
"license": "Apache-2.0", "license": "Apache-2.0",
"maintainer": { "maintainer": {

View file

@ -184,7 +184,7 @@ mkdir -p $data_path
mkdir -p /var/log/matrix-$app mkdir -p /var/log/matrix-$app
mkdir -p /etc/matrix-$app/conf.d mkdir -p /etc/matrix-$app/conf.d
mkdir -p /etc/matrix-$app/app-service 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 synapse in virtualenv
install_sources install_sources

View file

@ -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) # 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 || 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 # ADVERTISE SERVICE IN ADMIN PANEL

View file

@ -6,7 +6,9 @@ service_config_file=/etc/matrix-$app/conf.d/app_service.yaml
# Backup the previous config file # Backup the previous config file
cp $service_config_file /tmp/app_service_backup.yaml 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 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
done done