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

Merge branch 'testing' into matrix_v2

This commit is contained in:
Josué Tille 2024-04-19 12:03:28 +02:00
commit 4caf5101b3
No known key found for this signature in database
GPG key ID: 5F259226AD51F2F5
3 changed files with 7 additions and 6 deletions

View file

@ -110,6 +110,11 @@ ensure_vars_set() {
ynh_app_setting_set --app="$app" --key=e2e_enabled_by_default --value="$e2e_enabled_by_default" ynh_app_setting_set --app="$app" --key=e2e_enabled_by_default --value="$e2e_enabled_by_default"
fi fi
if [ -z "${turnserver_pwd:-}" ]; then
turnserver_pwd=$(ynh_string_random --length=30)
ynh_app_setting_set --app="$app" --key=turnserver_pwd --value="$turnserver_pwd"
fi
if [ -z "${web_client_location:-}" ] if [ -z "${web_client_location:-}" ]
then then
web_client_location="https://matrix.to/" web_client_location="https://matrix.to/"

View file

@ -159,10 +159,6 @@ configure_nginx
#================================================= #=================================================
ynh_script_progression --message="Configuring Synapse..." --weight=2 ynh_script_progression --message="Configuring Synapse..." --weight=2
# Find password for turnserver and database
turnserver_pwd=$(ynh_string_random --length=30)
ynh_app_setting_set --app=$app --key=turnserver_pwd --value=$turnserver_pwd
ynh_add_jinja_config --template="homeserver.yaml" --destination="/etc/matrix-$app/homeserver.yaml" ynh_add_jinja_config --template="homeserver.yaml" --destination="/etc/matrix-$app/homeserver.yaml"
ynh_add_config --template="log.yaml" --destination="/etc/matrix-$app/log.yaml" ynh_add_config --template="log.yaml" --destination="/etc/matrix-$app/log.yaml"
ynh_add_config --template=sliding_proxy.conf --destination=/etc/matrix-$app/sliding_proxy.conf ynh_add_config --template=sliding_proxy.conf --destination=/etc/matrix-$app/sliding_proxy.conf

View file

@ -18,8 +18,8 @@ for f in $(ls /etc/matrix-$app/app-service/); do
done done
# Set permissions # Set permissions
chown matrix-$app $service_config_file chown $app $service_config_file
chown matrix-$app /etc/matrix-$app/app-service/* chown $app /etc/matrix-$app/app-service/*
chmod 600 $service_config_file chmod 600 $service_config_file
chmod 600 /etc/matrix-$app/app-service/* chmod 600 /etc/matrix-$app/app-service/*