nextcloud/all-in-one
1
1
Fork 0
mirror of https://github.com/nextcloud/all-in-one.git synced 2025-02-26 23:08:01 +08:00
Code Issues Projects Releases Packages Wiki Activity

address review and fix another detail

Browse source 
Signed-off-by: Simon L <szaimen@e.mail.de>
This commit is contained in:
Simon L 2023-11-08 15:17:03 +01:00
parent 30f5e27889
commit 5808898b38
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Containers/talk/start.sh
View file

@ -19,10 +19,15 @@ elif [ -z "$INTERNAL_SECRET" ]; then
fi fi
set -x set -x
IPv4_ADDRESS_TALK="$(hostname -i | grep -oP '[0-9]+\.[0-9]+.[0-9]+\.[0-9]+' | head -1)" IPv4_ADDRESS_TALK_RELAY="$(hostname -i | grep -oP '[0-9]+\.[0-9]\+.[0-9]+\.[0-9]+' | head -1)"
IPv4_ADDRESS_TALK="$(dig nextcloud-aio-talk IN A +short +search | grep '^[0-9.]\+$' | sort | head -n1)"
IPv6_ADDRESS_TALK="$(dig nextcloud-aio-talk AAAA +short +search | grep '^[0-9a-f:]\+$' | sort | head -n1)" IPv6_ADDRESS_TALK="$(dig nextcloud-aio-talk AAAA +short +search | grep '^[0-9a-f:]\+$' | sort | head -n1)"
set +x set +x
if [ -n "$IPv4_ADDRESS_TALK" ] && [ "$IPv4_ADDRESS_TALK_RELAY" = "$IPv4_ADDRESS_TALK" ]; then
IPv4_ADDRESS_TALK=""
fi
# Turn # Turn
cat << TURN_CONF > "/conf/eturnal.yml" cat << TURN_CONF > "/conf/eturnal.yml"
eturnal: eturnal:
@ -36,13 +41,14 @@ eturnal:
log_dir: stdout log_dir: stdout
log_level: warning log_level: warning
secret: "$TURN_SECRET" secret: "$TURN_SECRET"
relay_ipv4_addr: "$IPv4_ADDRESS_TALK" relay_ipv4_addr: "$IPv4_ADDRESS_TALK_RELAY"
relay_ipv6_addr: "$IPv6_ADDRESS_TALK" relay_ipv6_addr: "$IPv6_ADDRESS_TALK"
blacklist_peers: blacklist_peers:
- recommended - recommended
whitelist_peers: whitelist_peers:
- 127.0.0.1 - 127.0.0.1
- ::1 - ::1
- "$IPv4_ADDRESS_TALK_RELAY"
- "$IPv4_ADDRESS_TALK" - "$IPv4_ADDRESS_TALK"
- "$IPv6_ADDRESS_TALK" - "$IPv6_ADDRESS_TALK"
TURN_CONF TURN_CONF