eightball/all-in-one
1
0
Fork 0
mirror of https://github.com/nextcloud/all-in-one.git synced 2026-02-11 08:10:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merge pull request #3217 from nextcloud/enh/noid/fix-talk

Browse source 
talk - fix eternal relay-ip
This commit is contained in:
Simon L 2023-08-21 22:59:43 +02:00 • committed by GitHub
commit 9200cb38ed
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Containers/talk/Dockerfile
View file

@ -34,12 +34,9 @@ RUN set -ex; \
rename -v ".jcfg.sample" ".jcfg" /usr/local/etc/janus/*.jcfg.sample
FROM alpine:3.18.2
ENV STUN_SERVICE="stun.nextcloud.com 443"
ENV ETURNAL_ETC_DIR="/conf"
COPY --from=janus /usr/local /usr/local
COPY --from=eturnal /opt/eturnal /opt/eturnal
COPY --from=eturnal /usr/local/bin/stun /usr/local/bin/stun
COPY --from=eturnal /usr/local/bin/eturnalctl /usr/local/bin/eturnalctl
COPY --from=nats /nats-server /usr/local/bin/nats-server
COPY --from=signaling /usr/bin/nextcloud-spreed-signaling /usr/local/bin/nextcloud-spreed-signaling
@ -97,7 +94,9 @@ RUN set -ex; \
/conf \
/opt/eturnal \
/var/run/supervisord \
/var/log/supervisord;
/var/log/supervisord; \
ln -s /opt/eturnal/bin/stun /usr/local/bin/stun; \
ln -s /opt/eturnal/bin/eturnalctl /usr/local/bin/eturnalctl
USER eturnal
ENTRYPOINT ["/start.sh"]

7
Containers/talk/start.sh
View file

@ -21,9 +21,6 @@ fi
set -x
IPv4_ADDRESS_TALK="$(dig nextcloud-aio-talk IN A +short | grep '^[0-9.]\+$' | sort | head -n1)"
IPv6_ADDRESS_TALK="$(dig nextcloud-aio-talk AAAA +short | grep '^[0-9a-f:]\+$' | sort | head -n1)"
IPv4_ADDRESS_NC="$(dig "$NC_DOMAIN" IN A +short +https +tls-ca=/etc/ssl/certs/ca-certificates.crt @1.1.1.1 | grep '^[0-9.]\+$' | sort | head -n1)"
IPv6_ADDRESS_NC="$(dig "$NC_DOMAIN" IN AAAA +short +https +tls-ca=/etc/ssl/certs/ca-certificates.crt @1.1.1.1 | grep '^[0-9a-f:]\+$' | sort | head -n1)"
set +x
# Turn
@ -39,8 +36,8 @@ eturnal:
log_dir: stdout
log_level: warning
secret: "$TURN_SECRET"
relay_ipv4_addr: "$IPv4_ADDRESS_NC"
relay_ipv6_addr: "$IPv6_ADDRESS_NC"
relay_ipv4_addr: "$IPv4_ADDRESS_TALK"
relay_ipv6_addr: "$IPv4_ADDRESS_TALK"
blacklist:
- recommended
whitelist: