etherpad: add ability to use a external server

pull/665/head
Mathieu Brunot 4 years ago committed by GitHub
parent a7563d4f82
commit edecacd0c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      docker-compose.yml
  2. 4
      env.example
  3. 1
      examples/traefik-v2/docker-compose.yml
  4. 1
      examples/traefik/docker-compose.yml
  5. 8
      web/rootfs/etc/cont-init.d/10-config

@ -30,6 +30,7 @@ services:
- XMPP_MUC_DOMAIN - XMPP_MUC_DOMAIN
- XMPP_RECORDER_DOMAIN - XMPP_RECORDER_DOMAIN
- ETHERPAD_URL_BASE - ETHERPAD_URL_BASE
- ETHERPAD_PUBLIC_URL
- TZ - TZ
- JIBRI_BREWERY_MUC - JIBRI_BREWERY_MUC
- JIBRI_PENDING_TIMEOUT - JIBRI_PENDING_TIMEOUT

@ -68,9 +68,11 @@ TZ=UTC
# Etherpad integration (for document sharing) # Etherpad integration (for document sharing)
# #
# Set etherpad-lite URL (uncomment to enable) # Set etherpad-lite URL in docker local network (uncomment to enable)
#ETHERPAD_URL_BASE=http://etherpad.meet.jitsi:9001 #ETHERPAD_URL_BASE=http://etherpad.meet.jitsi:9001
# Set etherpad-lite public URL (uncomment to enable)
#ETHERPAD_PUBLIC_URL=https://etherpad.my.domain
# #
# Basic Jigasi configuration options (needed for SIP gateway support) # Basic Jigasi configuration options (needed for SIP gateway support)

@ -26,6 +26,7 @@ services:
- XMPP_MUC_DOMAIN - XMPP_MUC_DOMAIN
- XMPP_RECORDER_DOMAIN - XMPP_RECORDER_DOMAIN
- ETHERPAD_URL_BASE - ETHERPAD_URL_BASE
- ETHERPAD_PUBLIC_URL
- TZ - TZ
- JIBRI_BREWERY_MUC - JIBRI_BREWERY_MUC
- JIBRI_PENDING_TIMEOUT - JIBRI_PENDING_TIMEOUT

@ -27,6 +27,7 @@ services:
- XMPP_MUC_DOMAIN - XMPP_MUC_DOMAIN
- XMPP_RECORDER_DOMAIN - XMPP_RECORDER_DOMAIN
- ETHERPAD_URL_BASE - ETHERPAD_URL_BASE
- ETHERPAD_PUBLIC_URL
- TZ - TZ
- JIBRI_BREWERY_MUC - JIBRI_BREWERY_MUC
- JIBRI_PENDING_TIMEOUT - JIBRI_PENDING_TIMEOUT

@ -97,11 +97,17 @@ if [[ ! -f /config/config.js ]]; then
/config/config.js /config/config.js
fi fi
if [[ ! -z "${ETHERPAD_URL_BASE}" && -z "$(grep -om1 'etherpad_base:' /config/config.js)" ]]; then if [[ -z "$(grep -om1 'etherpad_base:' /config/config.js)" ]]; then
if [[ ! -z "${ETHERPAD_PUBLIC_URL}" ]]; then
sed -i \
-e "/enableWelcomePage/a\ etherpad_base: '${ETHERPAD_PUBLIC_URL}/p/'," \
/config/config.js
elif [[ ! -z "${ETHERPAD_URL_BASE}" ]]; then
sed -i \ sed -i \
-e "/enableWelcomePage/a\ etherpad_base: '${PUBLIC_URL}/etherpad/p/'," \ -e "/enableWelcomePage/a\ etherpad_base: '${PUBLIC_URL}/etherpad/p/'," \
/config/config.js /config/config.js
fi fi
fi
if [[ $ENABLE_TRANSCRIPTIONS -eq 1 || "$ENABLE_TRANSCRIPTIONS" == "true" ]]; then if [[ $ENABLE_TRANSCRIPTIONS -eq 1 || "$ENABLE_TRANSCRIPTIONS" == "true" ]]; then
sed -i \ sed -i \

Loading…
Cancel
Save