diff --git a/README.md b/README.md
index 5158b8e..34965e5 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.108.0~ynh1
+**Shipped version:** 1.109.0~ynh1
## Documentation and resources
- Official app website:
diff --git a/README_es.md b/README_es.md
index 28d5d1a..293b2ec 100644
--- a/README_es.md
+++ b/README_es.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)
-**Versión actual:** 1.108.0~ynh1
+**Versión actual:** 1.109.0~ynh1
## Documentaciones y recursos
- Sitio web oficial:
diff --git a/README_eu.md b/README_eu.md
index 20e7cbb..736fb1e 100644
--- a/README_eu.md
+++ b/README_eu.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)
-**Paketatutako bertsioa:** 1.108.0~ynh1
+**Paketatutako bertsioa:** 1.109.0~ynh1
## Dokumentazioa eta baliabideak
- Aplikazioaren webgune ofiziala:
diff --git a/README_fr.md b/README_fr.md
index 14e9c5b..187f675 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.108.0~ynh1
+**Version incluse :** 1.109.0~ynh1
## Documentations et ressources
- Site officiel de l’app :
diff --git a/README_gl.md b/README_gl.md
index 130a2f1..0a0b7e7 100644
--- a/README_gl.md
+++ b/README_gl.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)
-**Versión proporcionada:** 1.108.0~ynh1
+**Versión proporcionada:** 1.109.0~ynh1
## Documentación e recursos
- Web oficial da app:
diff --git a/README_zh_Hans.md b/README_zh_Hans.md
index 3cd614c..ab93d18 100644
--- a/README_zh_Hans.md
+++ b/README_zh_Hans.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)
-**分发版本:** 1.108.0~ynh1
+**分发版本:** 1.109.0~ynh1
## 文档与资源
- 官方应用网站:
diff --git a/auto_update/auto_update.sh b/auto_update/auto_update.sh
index 8b58ad6..457491e 100644
--- a/auto_update/auto_update.sh
+++ b/auto_update/auto_update.sh
@@ -163,7 +163,7 @@ then
else
result="Failed"
fi
- msg="Build: $app_name version $app_version\n"
- msg+="$(cat ${app_name}_build_temp.log)"
- echo -e "$msg" | mail.mailutils -a "Content-Type: text/plain; charset=UTF-8" -s "Autoupgrade $app_name : $result" "$notify_email"
+ msg="Build: $app_name version $app_version"
+
+ echo "$msg" | mail.mailutils --content-type="text/plain; charset=UTF-8" -A "${app_name}_build_temp.log" -s "Autoupgrade $app_name : $result" "$notify_email"
fi
diff --git a/conf/requirement_bookworm.txt b/conf/requirement_bookworm.txt
index 6fb9a1e..e11ac97 100644
--- a/conf/requirement_bookworm.txt
+++ b/conf/requirement_bookworm.txt
@@ -4,14 +4,14 @@ Automat==22.10.0
bcrypt==4.1.3
bleach==6.1.0
canonicaljson==2.0.0
-certifi==2024.2.2
+certifi==2024.6.2
cffi==1.16.0
charset-normalizer==3.3.2
constantly==23.10.4
-cryptography==42.0.7
+cryptography==42.0.8
hyperlink==21.0.0
idna==3.7
-ijson==3.2.3
+ijson==3.3.0
immutabledict==4.2.0
incremental==22.10.0
Jinja2==3.1.4
@@ -21,27 +21,27 @@ ldap3==2.9.1
lxml==5.2.2
MarkupSafe==2.1.5
matrix-common==1.3.0
-matrix-synapse==1.108.0
+matrix-synapse==1.109.0
matrix-synapse-ldap3==0.3.0
msgpack==1.0.8
ndg-httpsclient==0.5.1
netaddr==1.3.0
-packaging==24.0
-phonenumbers==8.13.37
+packaging==24.1
+phonenumbers==8.13.39
pillow==10.3.0
prometheus_client==0.20.0
psycopg2==2.9.9
pyasn1==0.6.0
pyasn1_modules==0.4.0
pycparser==2.22
-pydantic==2.7.2
-pydantic_core==2.18.3
+pydantic==2.7.4
+pydantic_core==2.18.4
pymacaroons==0.13.0
PyNaCl==1.5.0
pyOpenSSL==24.1.0
PyYAML==6.0.1
referencing==0.35.1
-requests==2.32.2
+requests==2.32.3
rpds-py==0.18.1
semantic-version==2.10.0
service-identity==24.1.0
@@ -51,8 +51,8 @@ six==1.16.0
sortedcontainers==2.4.0
treq==23.11.0
Twisted==24.3.0
-typing_extensions==4.12.0
+typing_extensions==4.12.2
unpaddedbase64==2.1.0
-urllib3==2.2.1
+urllib3==2.2.2
webencodings==0.5.1
zope.interface==6.4.post2
diff --git a/conf/requirement_bullseye.txt b/conf/requirement_bullseye.txt
index c562cdf..b55c9d1 100644
--- a/conf/requirement_bullseye.txt
+++ b/conf/requirement_bullseye.txt
@@ -4,14 +4,14 @@ Automat==22.10.0
bcrypt==4.1.3
bleach==6.1.0
canonicaljson==2.0.0
-certifi==2024.2.2
+certifi==2024.6.2
cffi==1.16.0
charset-normalizer==3.3.2
constantly==23.10.4
-cryptography==42.0.7
+cryptography==42.0.8
hyperlink==21.0.0
idna==3.7
-ijson==3.2.3
+ijson==3.3.0
immutabledict==4.2.0
incremental==22.10.0
Jinja2==3.1.4
@@ -21,27 +21,27 @@ ldap3==2.9.1
lxml==5.2.2
MarkupSafe==2.1.5
matrix-common==1.3.0
-matrix-synapse==1.108.0
+matrix-synapse==1.109.0
matrix-synapse-ldap3==0.3.0
msgpack==1.0.8
ndg-httpsclient==0.5.1
netaddr==1.3.0
-packaging==24.0
-phonenumbers==8.13.37
+packaging==24.1
+phonenumbers==8.13.39
pillow==10.3.0
prometheus_client==0.20.0
psycopg2==2.9.9
pyasn1==0.6.0
pyasn1_modules==0.4.0
pycparser==2.22
-pydantic==2.7.2
-pydantic_core==2.18.3
+pydantic==2.7.4
+pydantic_core==2.18.4
pymacaroons==0.13.0
PyNaCl==1.5.0
pyOpenSSL==24.1.0
PyYAML==6.0.1
referencing==0.35.1
-requests==2.32.2
+requests==2.32.3
rpds-py==0.18.1
semantic-version==2.10.0
service-identity==24.1.0
@@ -52,8 +52,8 @@ sortedcontainers==2.4.0
tomli==2.0.1
treq==23.11.0
Twisted==24.3.0
-typing_extensions==4.12.0
+typing_extensions==4.12.2
unpaddedbase64==2.1.0
-urllib3==2.2.1
+urllib3==2.2.2
webencodings==0.5.1
zope.interface==6.4.post2
diff --git a/conf/turnserver.conf b/conf/turnserver.conf
index 420503e..9575f9e 100644
--- a/conf/turnserver.conf
+++ b/conf/turnserver.conf
@@ -1,6 +1,6 @@
-lt-cred-mech
use-auth-secret
static-auth-secret={{ turnserver_pwd }}
+cli-password={{ turnserver_cli_pwd }}
realm={{ domain }}
tls-listening-port={{ port_turnserver_tls }}
diff --git a/config_panel.toml b/config_panel.toml
index edf821c..d1b3339 100644
--- a/config_panel.toml
+++ b/config_panel.toml
@@ -149,7 +149,7 @@ services = ["__APP__"]
[advanced]
name = "Advanced Settings"
-services = ["matrix-__APP__"]
+services = ["__APP__"]
# Disabled as it don't work any more on bookworm
#
diff --git a/manifest.toml b/manifest.toml
index 67644cf..86d8b7c 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -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.108.0~ynh1"
+version = "1.109.0~ynh1"
maintainers = ["Josué Tille"]
@@ -18,7 +18,7 @@ cpe = "cpe:2.3:a:matrix:synapse"
fund = "https://matrix.org/support/#"
[integration]
-yunohost = ">= 11.2.11"
+yunohost = ">= 11.2.13"
architectures = "all"
multi_instance = true
ldap = true
@@ -63,13 +63,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.108.0/matrix-synapse_1.108.0-bookworm-bin1_armv7l.tar.gz"
- armhf.sha256 = "ceff2b044fede6a7294c3d85619e6bbbb8d6371260c3492e9194a59f6f3a9e59"
+ armhf.url = "https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.109.0/matrix-synapse_1.109.0-bookworm-bin1_armv7l.tar.gz"
+ armhf.sha256 = "d80915247255433ddad2e8283361f9d4c13c4f10ac50bf0de4139231c4f8164b"
[resources.sources.synapse_prebuilt_armv7_bullseye]
prefetch = false
- armhf.url = "https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.108.0/matrix-synapse_1.108.0-bullseye-bin1_armv7l.tar.gz"
- armhf.sha256 = "658c4134927facc4c7d87e712388600c2759bc32f31951311bb0589d0c6da4e5"
+ armhf.url = "https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.109.0/matrix-synapse_1.109.0-bullseye-bin1_armv7l.tar.gz"
+ armhf.sha256 = "e1ff4c600fae6f9ccc7a7e758dbcefcf64e55e6f29eece75e903ea6b93f02e78"
[resources.system_user]
allow_email = true
diff --git a/scripts/_common.sh b/scripts/_common.sh
index 6c0f7db..99f95bb 100755
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -72,7 +72,7 @@ configure_coturn() {
then
turn_external_ip+="$public_ip6"
fi
- ynh_add_jinja_config --template="turnserver.conf" --destination="/etc/matrix-$app/coturn.conf"
+ ynh_add_config --jinja --template="turnserver.conf" --destination="/etc/matrix-$app/coturn.conf"
}
configure_nginx() {
@@ -109,6 +109,11 @@ ensure_vars_set() {
ynh_app_setting_set --app="$app" --key=turnserver_pwd --value="$turnserver_pwd"
fi
+ if [ -z "${turnserver_cli_pwd:-}" ]; then
+ turnserver_cli_pwd=$(ynh_string_random --length=30)
+ ynh_app_setting_set --app="$app" --key=turnserver_cli_pwd --value="$turnserver_cli_pwd"
+ fi
+
if [ -z "${web_client_location:-}" ]
then
web_client_location="https://matrix.to/"
@@ -264,5 +269,6 @@ set_permissions() {
chmod 600 /etc/matrix-"$app"/"$server_name".signing.key
chown "$app":root -R /var/log/matrix-"$app"
+ chmod u=rwX,g=rX,o= -R /var/log/matrix-"$app"
setfacl -R -m user:turnserver:rwX /var/log/matrix-"$app"
}
diff --git a/scripts/change_url b/scripts/change_url
index 440e2c9..6363135 100644
--- a/scripts/change_url
+++ b/scripts/change_url
@@ -28,7 +28,7 @@ configure_nginx
#=================================================
ynh_script_progression --message="Updating Synapse config..." --weight=2
-ynh_add_jinja_config --template="homeserver.yaml" --destination="/etc/matrix-$app/homeserver.yaml"
+ynh_add_config --jinja --template="homeserver.yaml" --destination="/etc/matrix-$app/homeserver.yaml"
ynh_add_config --template="log.yaml" --destination="/etc/matrix-$app/log.yaml"
#=================================================
diff --git a/scripts/config b/scripts/config
index 51ee2fe..d9d23ea 100644
--- a/scripts/config
+++ b/scripts/config
@@ -27,7 +27,7 @@ ynh_app_config_validate() {
ynh_app_config_apply() {
_ynh_app_config_apply
configure_nginx
- ynh_add_jinja_config --template="homeserver.yaml" --destination="/etc/matrix-$app/homeserver.yaml"
+ ynh_add_config --jinja --template="homeserver.yaml" --destination="/etc/matrix-$app/homeserver.yaml"
ynh_add_config --template="log.yaml" --destination="/etc/matrix-$app/log.yaml"
set_permissions
}
diff --git a/scripts/experimental_helper.sh b/scripts/experimental_helper.sh
index bfdd78d..e69de29 100644
--- a/scripts/experimental_helper.sh
+++ b/scripts/experimental_helper.sh
@@ -1,135 +0,0 @@
-# Create a dedicated config file from a jinja template
-#
-# usage: ynh_add_jinja_config --template="template" --destination="destination"
-# | arg: -t, --template= - Template config file to use
-# | arg: -d, --destination= - Destination of the config file
-# | arg: -i, --ignore_vars= - List separated by space of script variables to ignore and don't pass in the jinja context.
-# | This could be useful mainly for special share which can't be retried by reference name (like the array).
-#
-# examples:
-# ynh_add_jinja_config --template="app.conf" --destination="$install_dir/app.conf"
-# ynh_add_jinja_config --template="app-env" --destination="$install_dir/app-env" --ignore_vars="complex_array yolo"
-#
-# The template can be by default the name of a file in the conf directory
-#
-# The helper will verify the checksum and backup the destination file
-# if it's different before applying the new template.
-#
-# And it will calculate and store the destination file checksum
-# into the app settings when configuration is done.
-#
-##
-## About the variables passed to the template:
-##
-#
-# All variable defined in the script are available into the template (as string) except someone described below.
-# If a variable make crash the helper for some reason (by example if the variable is of type array)
-# or you just want to don't pass a specific variable for some other reason you can add it in the '--ignore_vars=' parameter as described above.
-# Here are the list of ignored variable and so there won't never be available in the template:
-# - All system environment variable like (TERM, USER, PATH, LANG, etc).
-# If you need someone you just need to declare an other variable with the same value.
-# Note that all Yunohost variable whose name begins by 'YNH_' are available and can be used in the template.
-# - This following list:
-# legacy_args args_array template destination ignore_vars template_path python_env_var ignore_var_regex
-# progress_scale progress_string0 progress_string1 progress_string2
-# old changed binds types file_hash formats
-#
-##
-## Usage in templates:
-##
-#
-# For a full documentation of the template you can refer to: https://jinja.palletsprojects.com/en/3.1.x/templates/
-# In Yunohost context there are no really some specificity except that all variable passed are of type string.
-# So here are some example of recommended usage:
-#
-# If you need a conditional block
-#
-# {% if should_my_block_be_shown == 'true' %}
-# ...
-# {% endif %}
-#
-# or
-#
-# {% if should_my_block_be_shown == '1' %}
-# ...
-# {% endif %}
-#
-# If you need to iterate with loop:
-#
-# {% for yolo in var_with_multiline_value.splitlines() %}
-# ...
-# {% endfor %}
-#
-# or
-#
-# {% for jail in my_var_with_coma.split(',') %}
-# ...
-# {% endfor %}
-#
-ynh_add_jinja_config() {
- # Declare an array to define the options of this helper.
- local legacy_args=tdi
- local -A args_array=([t]=template= [d]=destination= [i]=ignore_vars= )
- local template
- local destination
- local ignore_vars
- # Manage arguments with getopts
- ynh_handle_getopts_args "$@"
- local template_path
-
- #
- ## List of all vars ignored and not passed to the template
- # WARNING Update the list on the helper documentation at the top of the helper, if you change this list
- #
-
- # local vars used in the helper
- ignore_vars+=" legacy_args args_array template destination ignore_vars template_path python_env_var ignore_var_regex"
- # yunohost helpers
- ignore_vars+=" progress_scale progress_string0 progress_string1 progress_string2"
- # Arrays used in config panel
- ignore_vars+=" old changed binds types file_hash formats"
-
- if [ -f "$YNH_APP_BASEDIR/conf/$template" ]; then
- template_path="$YNH_APP_BASEDIR/conf/$template"
- elif [ -f "$template" ]; then
- template_path=$template
- else
- ynh_die --message="The provided template $template doesn't exist"
- fi
-
- ynh_backup_if_checksum_is_different --file="$destination"
-
- # Make sure to set the permissions before we copy the file
- # This is to cover a case where an attacker could have
- # created a file beforehand to have control over it
- # (cp won't overwrite ownership / modes by default...)
- touch "$destination"
- chown root:root "$destination"
- chmod 640 "$destination"
-
- local python_env_var=''
- local ignore_var_regex
- ignore_var_regex="$(echo "$ignore_vars" | sed -E 's@^\s*(.*\w)\s*$@\1@g' | sed -E 's@(\s+)@|@g')"
- while read -r one_var; do
- # Blacklist of var to not pass to template
- if { [[ "$one_var" =~ ^[A-Z0-9_]+$ ]] && [[ "$one_var" != YNH_* ]]; } \
- || [[ "$one_var" =~ ^($ignore_var_regex)$ ]]; then
- continue
- fi
- # Well python is very bad for the last character on raw string
- # https://stackoverflow.com/questions/647769/why-cant-pythons-raw-string-literals-end-with-a-single-backslash
- # So the solution here is to add one last char '-' so we know what it is
- # and we are sure that it not \ or ' or something else which will be problematic with python
- # And then we remove it while we are processing
- python_env_var+="$one_var=r'''${!one_var}-'''[:-1],"
- done <<< "$(compgen -v)"
-
- _ynh_apply_default_permissions "$destination"
- (
- python3 -c 'import os, sys, jinja2; sys.stdout.write(
- jinja2.Template(source=sys.stdin.read(),
- undefined=jinja2.StrictUndefined,
- ).render('"$python_env_var"'));' <"$template_path" >"$destination"
- )
- ynh_store_file_checksum --file="$destination"
-}
diff --git a/scripts/install b/scripts/install
index 7d14fe4..ed99130 100644
--- a/scripts/install
+++ b/scripts/install
@@ -156,7 +156,7 @@ configure_nginx
#=================================================
ynh_script_progression --message="Configuring Synapse..." --weight=2
-ynh_add_jinja_config --template="homeserver.yaml" --destination="/etc/matrix-$app/homeserver.yaml"
+ynh_add_config --jinja --template="homeserver.yaml" --destination="/etc/matrix-$app/homeserver.yaml"
ynh_add_config --template="log.yaml" --destination="/etc/matrix-$app/log.yaml"
#=================================================
diff --git a/scripts/remove b/scripts/remove
index f9f8cfc..e22e9a5 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -17,30 +17,25 @@ source /usr/share/yunohost/helpers
#=================================================
# Remove a service from the admin panel, added by `yunohost service add`
-yunohost service remove $app
-yunohost service remove $app-coturn
+yunohost service remove "$app"
+yunohost service remove "$app"-coturn
#=================================================
# STOP AND REMOVE SERVICE
#=================================================
ynh_script_progression --message="Stopping and removing the systemd service" --weight=2
-ynh_remove_systemd_config --service=$app
-ynh_remove_systemd_config --service=$app-coturn
+ynh_remove_systemd_config --service="$app"
+ynh_remove_systemd_config --service="$app"-coturn
#=================================================
# REMOVE APP MAIN DIR
#=================================================
ynh_script_progression --message="Removing app main directory" --weight=2
-ynh_secure_remove --file=$code_dir
-ynh_secure_remove --file=/etc/matrix-$app
-ynh_secure_remove --file=/etc/nginx/conf.d/${server_name}.d/${app}_server_name.conf
-
-if [ "$YNH_APP_PURGE" -eq 1 ]; then
- ynh_script_progression --message="Removing logs..."
- ynh_secure_remove --file=/var/log/matrix-"$app"
-fi
+ynh_secure_remove --file="$code_dir"
+ynh_secure_remove --file=/etc/matrix-"$app"
+ynh_secure_remove --file="/etc/nginx/conf.d/${server_name}.d/${app}_server_name.conf"
#=================================================
# REMOVE NGINX CONFIGURATION
diff --git a/scripts/upgrade b/scripts/upgrade
index 073eb57..c9257bd 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -279,7 +279,7 @@ fi
# UPDATE SYNAPSE CONFIG
#=================================================
ynh_script_progression --message="Updating synapse config..." --weight=2
-ynh_add_jinja_config --template="homeserver.yaml" --destination="/etc/matrix-$app/homeserver.yaml"
+ynh_add_config --jinja --template="homeserver.yaml" --destination="/etc/matrix-$app/homeserver.yaml"
ynh_add_config --template="log.yaml" --destination="/etc/matrix-$app/log.yaml"
#=================================================
diff --git a/sources/Coturn_config_rotate.sh b/sources/Coturn_config_rotate.sh
index 53743ae..4e64236 100644
--- a/sources/Coturn_config_rotate.sh
+++ b/sources/Coturn_config_rotate.sh
@@ -16,6 +16,7 @@ source ../scripts/_common.sh
domain=$(ynh_app_setting_get --app=$app --key=domain)
port_cli=$(ynh_app_setting_get --app=$app --key=port_cli)
turnserver_pwd=$(ynh_app_setting_get --app=$app --key=turnserver_pwd)
+turnserver_cli_pwd=$(ynh_app_setting_get --app=$app --key=turnserver_cli_pwd)
port_turnserver_tls=$(ynh_app_setting_get --app=$app --key=port_turnserver_tls)
port_turnserver_alt_tls=$(ynh_app_setting_get --app=$app --key=port_turnserver_alt_tls)
enable_dtls_for_audio_video_turn_call=$(ynh_app_setting_get --app=$app --key=enable_dtls_for_audio_video_turn_call)