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

Fix config panel with tags

Browse source
This commit is contained in:
Josué Tille 2024-02-29 20:14:25 +01:00
parent 42b6143104
commit 9cdcf07c2b
No known key found for this signature in database
GPG key ID: 5F259226AD51F2F5
2 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
config_panel.toml
View file

@ -33,13 +33,13 @@ services = ["__APP__"]
[main.welcome.allowed_local_3pids_email] [main.welcome.allowed_local_3pids_email]
ask = "Register only with given email formats" ask = "Register only with given email formats"
type = "tags" type = "tags"
help = '( e.g. ^[^@]+@matrix\\\\.org$ ) Note that \\\ will write \\ as suggested in homeserver.yaml' help = '( e.g. ^[^@]+@matrix\\.org$ )'
visible = 'enable_registration && (registrations_require_3pid == "email" || registrations_require_3pid == "email&msisdn")' visible = 'enable_registration && (registrations_require_3pid == "email" || registrations_require_3pid == "email&msisdn")'
[main.welcome.allowed_local_3pids_msisdn] [main.welcome.allowed_local_3pids_msisdn]
ask = "Register only with given phone number formats" ask = "Register only with given phone number formats"
type = "tags" type = "tags"
help = '( e.g. \\\\+33 ) Note that \\\ will write \\ as suggested in homeserver.yaml' help = '( e.g. \\+33 )'
visible = 'enable_registration && (registrations_require_3pid == "email&msisdn" || registrations_require_3pid == "msisdn")' visible = 'enable_registration && (registrations_require_3pid == "email&msisdn" || registrations_require_3pid == "msisdn")'
[main.welcome.disable_msisdn_registration] [main.welcome.disable_msisdn_registration]

13
scripts/_common.sh
View file

@ -62,7 +62,10 @@ configure_synapse() {
local macaroon_secret_key_param='macaroon_secret_key: "'$macaroon_secret_key'"' local macaroon_secret_key_param='macaroon_secret_key: "'$macaroon_secret_key'"'
local auto_join_rooms_sed_param="" local auto_join_rooms_sed_param=""
if [ -n "$auto_join_rooms" ]; then if [ -n "$auto_join_rooms" ]; then
auto_join_rooms_sed_param='auto_join_rooms:\n - "'$auto_join_rooms'"' auto_join_rooms_sed_param+='auto_join_rooms:'
while read -d, room; do
auto_join_rooms_sed_param+='\n - "'$room'"'
done <<< "${auto_join_rooms},"
fi fi
local registration_require_3pid_sed_param="" local registration_require_3pid_sed_param=""
case ${registrations_require_3pid} in case ${registrations_require_3pid} in
@ -82,10 +85,14 @@ configure_synapse() {
allowd_local_3pids_sed_param="allowed_local_3pids:" allowd_local_3pids_sed_param="allowed_local_3pids:"
if [ -n "$allowed_local_3pids_email" ]; then if [ -n "$allowed_local_3pids_email" ]; then
allowd_local_3pids_sed_param+="\n - medium: email\n pattern: '$allowed_local_3pids_email'" while read -d, pattern ; do
allowd_local_3pids_sed_param+="\n - medium: email\n pattern: '$pattern'"
done <<< "${allowed_local_3pids_email},"
fi fi
if [ -n "$allowed_local_3pids_msisdn" ]; then if [ -n "$allowed_local_3pids_msisdn" ]; then
allowd_local_3pids_sed_param+="\n - medium: msisdn\n pattern: '$allowed_local_3pids_msisdn'" while read -d, pattern ; do
allowd_local_3pids_sed_param+="\n - medium: msisdn\n pattern: '$pattern'"
done <<< "${allowed_local_3pids_msisdn},"
fi fi
fi fi