__matrix_synapse: add --turn-username and --turn-password flags

This commit is contained in:
fnux 2021-12-01 15:55:34 +01:00
parent 08e81d1e97
commit d872f1d4f0
No known key found for this signature in database
GPG key ID: 4502C902C00A1E12
4 changed files with 35 additions and 3 deletions

View file

@ -1175,14 +1175,26 @@ fi
cat << EOF cat << EOF
# The shared secret used to compute passwords for the TURN server # The shared secret used to compute passwords for the TURN server
# #
turn_shared_secret: "$TURN_SHARED_SECRET" EOF
if [ -n "$TURN_SHARED_SECRET" ]; then
echo "turn_shared_secret: \"$TURN_SHARED_SECRET\""
fi
cat << EOF
# The Username and password if the TURN server needs them and # The Username and password if the TURN server needs them and
# does not use a token # does not use a token
# #
#turn_username: "TURNSERVER_USERNAME" EOF
#turn_password: "TURNSERVER_PASSWORD"
if [ -n "$TURN_USERNAME" ] || [ "$TURN_PASSWORD" ]; then
cat <<- EOF
turn_username: "$TURN_USERNAME"
turn_password: "$TURN_PASSWORD"
EOF
fi
cat << EOF
# How long generated TURN credentials last # How long generated TURN credentials last
# #
turn_user_lifetime: ${TURN_USER_LIFETIME:?} turn_user_lifetime: ${TURN_USER_LIFETIME:?}

View file

@ -133,6 +133,14 @@ turn-uri
turn-shared-secret turn-shared-secret
Shared secret used to access the TURN REST API. Shared secret used to access the TURN REST API.
turn-username
Username used to authenticate against the TURN server if needed / a shared
secret token is not used.
turn-password
Password used to authenticate against the TURN server if needed / a shared
secret token is not used.
turn-user-lifetime turn-user-lifetime
Lifetime of TURN credentials. Defaults to 1h. Lifetime of TURN credentials. Defaults to 1h.

View file

@ -246,6 +246,16 @@ if [ -f "$__object/parameter/turn-uri" ]; then
export TURN_URIS export TURN_URIS
fi fi
if [ -f "$__object/parameter/turn-username" ]; then
TURN_USERNAME=$(cat "$__object/parameter/turn-username")
export TURN_USERNAME
fi
if [ -f "$__object/parameter/turn-password" ]; then
TURN_PASSWORD=$(cat "$__object/parameter/turn-password")
export TURN_PASSWORD
fi
# Worker-mode configuration. # Worker-mode configuration.
export MAIN_LISTENER_PORT=8008 export MAIN_LISTENER_PORT=8008
export ENABLE_MEDIA_REPO='true' export ENABLE_MEDIA_REPO='true'

View file

@ -13,6 +13,8 @@ ldap-bind-password
ldap-filter ldap-filter
turn-shared-secret turn-shared-secret
turn-user-lifetime turn-user-lifetime
turn-username
turn-password
max-upload-size max-upload-size
smtp-host smtp-host
smtp-port smtp-port