Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Testing #509

Merged
merged 10 commits into from
Jan 20, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,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.121.1~ynh1
**Shipped version:** 1.122.0~ynh1
## Documentation and resources

- Official app website: <https://matrix.org/>
Expand Down
2 changes: 1 addition & 1 deletion README_es.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Instant messaging server matrix network.
Yunohost chatroom with matrix : [https://matrix.to/#/#yunohost:matrix.org](https://matrix.to/#/#yunohost:matrix.org)


**Versión actual:** 1.121.1~ynh1
**Versión actual:** 1.122.0~ynh1
## Documentaciones y recursos

- Sitio web oficial: <https://matrix.org/>
Expand Down
2 changes: 1 addition & 1 deletion README_eu.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Instant messaging server matrix network.
Yunohost chatroom with matrix : [https://matrix.to/#/#yunohost:matrix.org](https://matrix.to/#/#yunohost:matrix.org)


**Paketatutako bertsioa:** 1.121.1~ynh1
**Paketatutako bertsioa:** 1.122.0~ynh1
## Dokumentazioa eta baliabideak

- Aplikazioaren webgune ofiziala: <https://matrix.org/>
Expand Down
2 changes: 1 addition & 1 deletion README_fr.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,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.121.1~ynh1
**Version incluse :** 1.122.0~ynh1
## Documentations et ressources

- Site officiel de l’app : <https://matrix.org/>
Expand Down
2 changes: 1 addition & 1 deletion README_gl.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Instant messaging server matrix network.
Yunohost chatroom with matrix : [https://matrix.to/#/#yunohost:matrix.org](https://matrix.to/#/#yunohost:matrix.org)


**Versión proporcionada:** 1.121.1~ynh1
**Versión proporcionada:** 1.122.0~ynh1
## Documentación e recursos

- Web oficial da app: <https://matrix.org/>
Expand Down
2 changes: 1 addition & 1 deletion README_id.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Instant messaging server matrix network.
Yunohost chatroom with matrix : [https://matrix.to/#/#yunohost:matrix.org](https://matrix.to/#/#yunohost:matrix.org)


**Versi terkirim:** 1.121.1~ynh1
**Versi terkirim:** 1.122.0~ynh1
## Dokumentasi dan sumber daya

- Website aplikasi resmi: <https://matrix.org/>
Expand Down
2 changes: 1 addition & 1 deletion README_nl.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Instant messaging server matrix network.
Yunohost chatroom with matrix : [https://matrix.to/#/#yunohost:matrix.org](https://matrix.to/#/#yunohost:matrix.org)


**Geleverde versie:** 1.121.1~ynh1
**Geleverde versie:** 1.122.0~ynh1
## Documentatie en bronnen

- Officiele website van de app: <https://matrix.org/>
Expand Down
2 changes: 1 addition & 1 deletion README_pl.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Instant messaging server matrix network.
Yunohost chatroom with matrix : [https://matrix.to/#/#yunohost:matrix.org](https://matrix.to/#/#yunohost:matrix.org)


**Dostarczona wersja:** 1.121.1~ynh1
**Dostarczona wersja:** 1.122.0~ynh1
## Dokumentacja i zasoby

- Oficjalna strona aplikacji: <https://matrix.org/>
Expand Down
2 changes: 1 addition & 1 deletion README_ru.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Instant messaging server matrix network.
Yunohost chatroom with matrix : [https://matrix.to/#/#yunohost:matrix.org](https://matrix.to/#/#yunohost:matrix.org)


**Поставляемая версия:** 1.121.1~ynh1
**Поставляемая версия:** 1.122.0~ynh1
## Документация и ресурсы

- Официальный веб-сайт приложения: <https://matrix.org/>
Expand Down
2 changes: 1 addition & 1 deletion README_zh_Hans.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Instant messaging server matrix network.
Yunohost chatroom with matrix : [https://matrix.to/#/#yunohost:matrix.org](https://matrix.to/#/#yunohost:matrix.org)


**分发版本:** 1.121.1~ynh1
**分发版本:** 1.122.0~ynh1
## 文档与资源

- 官方应用网站: <https://matrix.org/>
Expand Down
2 changes: 1 addition & 1 deletion conf/f2b_filter.conf
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ before = common.conf
__synapse_start_line = .? \- synapse\..+ \-

# Regex definition.
failregex = ^%(__synapse_start_line)s INFO \- POST\-(\d+)\- <HOST> \- \d+ \- Received request\: POST /_matrix/client/r0/login\??<SKIPLINES>%(__synapse_start_line)s INFO \- POST\-\1\- Got login request with identifier: \{('type': 'm.id.user'(, )?|'user'\: '(.+?)'(, )?){2}\}, medium\: None, address: None, user\: '\7'<SKIPLINES>%(__synapse_start_line)s WARNING \- \- (Attempted to login as @\7\:.+ but they do not exist|Failed password login for user @\7\:.+)$
failregex = ^%(__synapse_start_line)s INFO \- POST\-(\d+) \- <HOST> \- \d+ \- Received request\: POST /_matrix/client/r0/login\??<SKIPLINES>%(__synapse_start_line)s INFO \- POST\-\1\- Got login request with identifier: \{('type': 'm.id.user'(, )?|'user'\: '(.+?)'(, )?){2}\}, medium\: None, address: None, user\: '\7'<SKIPLINES>%(__synapse_start_line)s WARNING \- \- (Attempted to login as @\7\:.+ but they do not exist|Failed password login for user @\7\:.+)$
ignoreregex =

[Init]
Expand Down
73 changes: 52 additions & 21 deletions conf/log.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,33 +3,64 @@
version: 1

formatters:
precise:
format: '%(asctime)s - %(name)s - %(lineno)d - %(levelname)s - %(request)s- %(message)s'

filters:
context:
(): synapse.util.logcontext.LoggingContextFilter
request: ""
precise:
format: '%(asctime)s - %(name)s - %(lineno)d - %(levelname)s - %(request)s - %(message)s'

handlers:
file:
class: logging.handlers.RotatingFileHandler
formatter: precise
filename: /var/log/matrix-__APP__/homeserver.log
filters: [context]
level: INFO
console:
class: logging.StreamHandler
formatter: precise
level: WARN
file:
class: logging.handlers.TimedRotatingFileHandler
formatter: precise
filename: /var/log/matrix-__APP__/homeserver.log
when: midnight
backupCount: 3 # Does not include the current log file.
encoding: utf8

loggers:
synapse:
level: INFO
# Default to buffering writes to log file for efficiency.
# WARNING/ERROR logs will still be flushed immediately, but there will be a
# delay (of up to `period` seconds, or until the buffer is full with
# `capacity` messages) before INFO/DEBUG logs get written.
buffer:
class: synapse.logging.handlers.PeriodicallyFlushingMemoryHandler
target: file

# The capacity is the maximum number of log lines that are buffered
# before being written to disk. Increasing this will lead to better
# performance, at the expensive of it taking longer for log lines to
# be written to disk.
# This parameter is required.
capacity: 10

# Logs with a level at or above the flush level will cause the buffer to
# be flushed immediately.
# Default value: 40 (ERROR)
# Other values: 50 (CRITICAL), 30 (WARNING), 20 (INFO), 10 (DEBUG)
flushLevel: 30 # Flush immediately for WARNING logs and higher

# The period of time, in seconds, between forced flushes.
# Messages will not be delayed for longer than this time.
# Default value: 5 seconds
period: 5

# A handler that writes logs to stderr. Unused by default, but can be used
# instead of "buffer" and "file" in the logger handlers.
console:
class: logging.StreamHandler
formatter: precise

loggers:
synapse.storage.SQL:
# beware: increasing this to DEBUG will make synapse log sensitive
# information such as access tokens.
level: INFO

root:
level: INFO
handlers: [file, console]

# Write logs to the `buffer` handler, which will buffer them together in memory,
# then write them to a file.
#
# Replace "buffer" with "console" to log to stderr instead.
#
handlers: [buffer]

disable_existing_loggers: false
24 changes: 12 additions & 12 deletions conf/requirement_bookworm.txt
Original file line number Diff line number Diff line change
@@ -1,45 +1,45 @@
annotated-types==0.7.0
attrs==24.2.0
attrs==24.3.0
Automat==24.8.1
bcrypt==4.2.1
bleach==6.2.0
canonicaljson==2.0.0
certifi==2024.8.30
certifi==2024.12.14
cffi==1.17.1
charset-normalizer==3.4.0
charset-normalizer==3.4.1
constantly==23.10.4
cryptography==44.0.0
hyperlink==21.0.0
idna==3.10
ijson==3.3.0
immutabledict==4.2.1
incremental==24.7.2
Jinja2==3.1.4
Jinja2==3.1.5
jsonschema==4.23.0
jsonschema-specifications==2024.10.1
ldap3==2.9.1
lxml==5.3.0
MarkupSafe==3.0.2
matrix-common==1.3.0
matrix-synapse==1.121.1
matrix-synapse==1.122.0
matrix-synapse-ldap3==0.3.0
msgpack==1.1.0
ndg-httpsclient==0.5.1
netaddr==1.3.0
packaging==24.2
phonenumbers==8.13.51
pillow==11.0.0
phonenumbers==8.13.52
pillow==11.1.0
prometheus_client==0.21.1
psycopg2==2.9.10
pyasn1==0.6.1
pyasn1_modules==0.4.1
pycparser==2.22
pydantic==2.10.3
pydantic_core==2.27.1
pydantic==2.10.5
pydantic_core==2.27.2
pymacaroons==0.13.0
PyNaCl==1.5.0
pyOpenSSL==24.3.0
python-multipart==0.0.19
pyOpenSSL==25.0.0
python-multipart==0.0.20
PyYAML==6.0.2
referencing==0.35.1
requests==2.32.3
Expand All @@ -54,6 +54,6 @@ treq==24.9.1
Twisted==24.11.0
typing_extensions==4.12.2
unpaddedbase64==2.1.0
urllib3==2.2.3
urllib3==2.3.0
webencodings==0.5.1
zope.interface==7.2
24 changes: 12 additions & 12 deletions conf/requirement_bullseye.txt
Original file line number Diff line number Diff line change
@@ -1,45 +1,45 @@
annotated-types==0.7.0
attrs==24.2.0
attrs==24.3.0
Automat==24.8.1
bcrypt==4.2.1
bleach==6.2.0
canonicaljson==2.0.0
certifi==2024.8.30
certifi==2024.12.14
cffi==1.17.1
charset-normalizer==3.4.0
charset-normalizer==3.4.1
constantly==23.10.4
cryptography==44.0.0
hyperlink==21.0.0
idna==3.10
ijson==3.3.0
immutabledict==4.2.1
incremental==24.7.2
Jinja2==3.1.4
Jinja2==3.1.5
jsonschema==4.23.0
jsonschema-specifications==2024.10.1
ldap3==2.9.1
lxml==5.3.0
MarkupSafe==3.0.2
matrix-common==1.3.0
matrix-synapse==1.121.1
matrix-synapse==1.122.0
matrix-synapse-ldap3==0.3.0
msgpack==1.1.0
ndg-httpsclient==0.5.1
netaddr==1.3.0
packaging==24.2
phonenumbers==8.13.51
pillow==11.0.0
phonenumbers==8.13.52
pillow==11.1.0
prometheus_client==0.21.1
psycopg2==2.9.10
pyasn1==0.6.1
pyasn1_modules==0.4.1
pycparser==2.22
pydantic==2.10.3
pydantic_core==2.27.1
pydantic==2.10.5
pydantic_core==2.27.2
pymacaroons==0.13.0
PyNaCl==1.5.0
pyOpenSSL==24.3.0
python-multipart==0.0.19
pyOpenSSL==25.0.0
python-multipart==0.0.20
PyYAML==6.0.2
referencing==0.35.1
requests==2.32.3
Expand All @@ -55,6 +55,6 @@ treq==24.9.1
Twisted==24.11.0
typing_extensions==4.12.2
unpaddedbase64==2.1.0
urllib3==2.2.3
urllib3==2.3.0
webencodings==0.5.1
zope.interface==7.2
2 changes: 1 addition & 1 deletion doc/POST_INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ For more details, see : https://github.com/element-hq/synapse#setting-up-federat

You also need to open the TCP port __PORT_SYNAPSE_TLS__ on your ISP box if it's not automatically done.

Your synapse server also implements a turnserver (for VoIP), to have this fully functional please read the 'Turnserver' section in the README available here: https://github.com/YunoHost-Apps/synapse_ynh .
Your synapse server also implements a turnserver (for VoIP), to have this fully functional please read [the 'Turnserver' section in here](https://github.com/YunoHost-Apps/synapse_ynh/blob/master/doc/ADMIN.md#turnserver).

If you're facing an issue or want to improve this app, please open a new issue in this project: https://github.com/YunoHost-Apps/synapse_ynh

Expand Down
10 changes: 5 additions & 5 deletions manifest.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ name = "Synapse"
description.en = "Instant messaging server which uses Matrix"
description.fr = "Serveur de messagerie instantané basé sur Matrix"

version = "1.121.1~ynh1"
version = "1.122.0~ynh1"

maintainers = ["Josué Tille"]

Expand Down Expand Up @@ -64,13 +64,13 @@ ram.runtime = "1G"
[resources]
[resources.sources.synapse_prebuilt_armv7_bookworm]
prefetch = false
armhf.url = "https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.121.1/matrix-synapse_1.121.1-bookworm-bin1_armv7l.tar.gz"
armhf.sha256 = "a2461cc23c864517a3e47c4f7edb5789513fc17da869047ddc3c96ae7cbcb6d8"
armhf.url = "https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.122.0/matrix-synapse_1.122.0-bookworm-bin1_armv7l.tar.gz"
armhf.sha256 = "43ce291853fc8197935ee01203a7bb8d3e7f6609ee54bf2d4b32f87e013cccb9"

[resources.sources.synapse_prebuilt_armv7_bullseye]
prefetch = false
armhf.url = "https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.121.1/matrix-synapse_1.121.1-bullseye-bin1_armv7l.tar.gz"
armhf.sha256 = "173b27ba8e7f942c461878b27d95b47959193967cb7a8b2180400a38507cdc83"
armhf.url = "https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.122.0/matrix-synapse_1.122.0-bullseye-bin1_armv7l.tar.gz"
armhf.sha256 = "bcf82e7c4b274cfc6b5372a04d511901ef67c6891df12b527ec4a8597ae7ba3a"

[resources.system_user]
allow_email = true
Expand Down
2 changes: 1 addition & 1 deletion scripts/install
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ ynh_systemctl --service="$app".service --action=restart --wait_until="Synapse no
#=================================================
ynh_script_progression "Configuring Fail2Ban..."

ynh_config_add_fail2ban
ynh_config_add_fail2ban --logpath=/var/log/matrix-"$app"/homeserver.log

#=================================================
# END OF SCRIPT
Expand Down
2 changes: 1 addition & 1 deletion scripts/upgrade
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ ynh_config_add_systemd --service="$app"-coturn --template=synapse-coturn.service
#=================================================
ynh_script_progression "Reconfiguring Fail2Ban..."

ynh_config_add_fail2ban
ynh_config_add_fail2ban --logpath=/var/log/matrix-"$app"/homeserver.log

#=================================================
# SETUP PERMISSIONS
Expand Down