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

correct __FOOBAR__ init

Browse source
This commit is contained in:
Gredin67 2023-01-10 12:37:02 +01:00 committed by GitHub
parent 04a2760423
commit 2915167b7c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
conf/homeserver.yaml
View file

@ -1272,7 +1272,7 @@ enable_registration: __ALLOWED_ACCESS__
# The user must provide all of the below types of 3PID when registering. # The user must provide all of the below types of 3PID when registering.
# #
registrations_require_3pid: registrations_require_3pid:
- email - __REGISTRATIONS_REQUIRE_3PID__
# - msisdn # - msisdn
# Explicitly disable asking for MSISDNs from the registration # Explicitly disable asking for MSISDNs from the registration
@ -1284,9 +1284,8 @@ disable_msisdn_registration: __DISABLE_MSISDN_REGISTRATION__
# 3PIDs with accounts on this server. # 3PIDs with accounts on this server.
# #
allowed_local_3pids: allowed_local_3pids:
__ALLOWED_LOCAL_3PIDS__ - medium: __REGISTRATIONS_REQUIRE_3PID__
# - medium: email pattern: __ALLOWED_LOCAL_3PIDS__
# pattern: '^[^@]+@matrix\.org$'
# - medium: email # - medium: email
# pattern: '^[^@]+@vector\.im$' # pattern: '^[^@]+@vector\.im$'
# - medium: msisdn # - medium: msisdn
@ -1396,8 +1395,7 @@ account_threepid_delegates:
# room. The join rule of the room must be set to 'public'. # room. The join rule of the room must be set to 'public'.
# #
auto_join_rooms: auto_join_rooms:
__AUTO_JOIN_ROOMS__ - "__AUTO_JOIN_ROOMS__"
# - "#example:example.com"
# Where auto_join_rooms are specified, setting this flag ensures that the # Where auto_join_rooms are specified, setting this flag ensures that the
# the rooms exist by creating them when the first user on the # the rooms exist by creating them when the first user on the

9
scripts/install
View file

@ -105,12 +105,12 @@ fi
allow_public_rooms_without_auth="false" allow_public_rooms_without_auth="false"
allow_public_rooms_over_federation="false" allow_public_rooms_over_federation="false"
disable_msisdn_registration="true" disable_msisdn_registration="true"
allowed_local_3pids="" registrations_require_3pid="email"
# - medium: email # here we need sed magic to transform $server_name
# pattern: '^[^@]+@matrix\.org$' allowed_local_3pids="'^[^@]+@""matrix""\.org$'"
allow_guest_access="false" allow_guest_access="false"
default_identity_server="https://matrix.org" default_identity_server="https://matrix.org"
auto_join_rooms=' - "#auto_join_room:'+$server_name+'"' auto_join_rooms="#auto_join_room:""$server_name"
autocreate_auto_join_rooms="false" autocreate_auto_join_rooms="false"
auto_join_rooms_for_guests="true" auto_join_rooms_for_guests="true"
password_enabled="true" password_enabled="true"
@ -122,6 +122,7 @@ ynh_app_setting_set --app=$app --key=element_ynh_url --value=$element_ynh_url
ynh_app_setting_set --app=$app --key=allow_public_rooms_without_auth --value=$allow_public_rooms_without_auth ynh_app_setting_set --app=$app --key=allow_public_rooms_without_auth --value=$allow_public_rooms_without_auth
ynh_app_setting_set --app=$app --key=allow_public_rooms_over_federation --value=$allow_public_rooms_over_federation ynh_app_setting_set --app=$app --key=allow_public_rooms_over_federation --value=$allow_public_rooms_over_federation
ynh_app_setting_set --app=$app --key=disable_msisdn_registration --value=$disable_msisdn_registration ynh_app_setting_set --app=$app --key=disable_msisdn_registration --value=$disable_msisdn_registration
ynh_app_setting_set --app=$app --key=registrations_require_3pid --value=$registrations_require_3pid
ynh_app_setting_set --app=$app --key=allowed_local_3pids --value=$allowed_local_3pids ynh_app_setting_set --app=$app --key=allowed_local_3pids --value=$allowed_local_3pids
ynh_app_setting_set --app=$app --key=allow_guest_access --value=$allow_guest_access ynh_app_setting_set --app=$app --key=allow_guest_access --value=$allow_guest_access
ynh_app_setting_set --app=$app --key=default_identity_server --value=$default_identity_server ynh_app_setting_set --app=$app --key=default_identity_server --value=$default_identity_server

10
scripts/upgrade
View file

@ -64,6 +64,7 @@ element_ynh_url=$(ynh_app_setting_get --app=$app --key=element_ynh_url)
allow_public_rooms_without_auth=$(ynh_app_setting_get --app=$app --key=allow_public_rooms_without_auth) allow_public_rooms_without_auth=$(ynh_app_setting_get --app=$app --key=allow_public_rooms_without_auth)
allow_public_rooms_over_federation=$(ynh_app_setting_get --app=$app --key=allow_public_rooms_over_federation) allow_public_rooms_over_federation=$(ynh_app_setting_get --app=$app --key=allow_public_rooms_over_federation)
disable_msisdn_registration=$(ynh_app_setting_get --app=$app --key=disable_msisdn_registration) disable_msisdn_registration=$(ynh_app_setting_get --app=$app --key=disable_msisdn_registration)
registrations_require_3pid=$(ynh_app_setting_get --app=$app --key=registrations_require_3pid)
allowed_local_3pids=$(ynh_app_setting_get --app=$app --key=allowed_local_3pids) allowed_local_3pids=$(ynh_app_setting_get --app=$app --key=allowed_local_3pids)
allow_guest_access=$(ynh_app_setting_get --app=$app --key=allow_guest_access) allow_guest_access=$(ynh_app_setting_get --app=$app --key=allow_guest_access)
default_identity_server=$(ynh_app_setting_get --app=$app --key=default_identity_server) default_identity_server=$(ynh_app_setting_get --app=$app --key=default_identity_server)
@ -216,9 +217,14 @@ then
disable_msisdn_registration="true" disable_msisdn_registration="true"
ynh_app_setting_set --app=$app --key=disable_msisdn_registration --value=$disable_msisdn_registration ynh_app_setting_set --app=$app --key=disable_msisdn_registration --value=$disable_msisdn_registration
fi fi
if [ -z "$registrations_require_3pid" ]
then
registrations_require_3pid="email"
ynh_app_setting_set --app=$app --key=registrations_require_3pid --value=$registrations_require_3pid
fi
if [ -z "$allowed_local_3pids" ] if [ -z "$allowed_local_3pids" ]
then then
allowed_local_3pids="" allowed_local_3pids="'^[^@]+@""matrix""\.org$'"
ynh_app_setting_set --app=$app --key=allowed_local_3pids --value=$allowed_local_3pids ynh_app_setting_set --app=$app --key=allowed_local_3pids --value=$allowed_local_3pids
fi fi
if [ -z "$allow_guest_access" ] if [ -z "$allow_guest_access" ]
@ -233,7 +239,7 @@ then
fi fi
if [ -z "$auto_join_rooms" ] if [ -z "$auto_join_rooms" ]
then then
auto_join_rooms=' - "#auto_join_room:'+$server_name+'"' auto_join_rooms="#auto_join_room:""$server_name"
ynh_app_setting_set --app=$app --key=auto_join_rooms --value=$auto_join_rooms ynh_app_setting_set --app=$app --key=auto_join_rooms --value=$auto_join_rooms
fi fi
if [ -z "$autocreate_auto_join_rooms" ] if [ -z "$autocreate_auto_join_rooms" ]