From 905d431e14192e107388ea5961b22b35201442dc Mon Sep 17 00:00:00 2001 From: Felix Geyer Date: Sun, 6 Dec 2020 22:15:44 +0100 Subject: [PATCH] jicofo,jigasi: always rebuild configs on start --- jicofo/rootfs/etc/cont-init.d/10-config | 4 +--- jigasi/rootfs/etc/cont-init.d/10-config | 6 ++---- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/jicofo/rootfs/etc/cont-init.d/10-config b/jicofo/rootfs/etc/cont-init.d/10-config index eac6164..7ae82f2 100644 --- a/jicofo/rootfs/etc/cont-init.d/10-config +++ b/jicofo/rootfs/etc/cont-init.d/10-config @@ -17,9 +17,7 @@ if [[ "$JICOFO_AUTH_PASSWORD" == "$OLD_JICOFO_AUTH_PASSWORD" ]]; then exit 1 fi -if [[ ! -f /config/sip-communicator.properties ]]; then - tpl /defaults/sip-communicator.properties > /config/sip-communicator.properties -fi +tpl /defaults/sip-communicator.properties > /config/sip-communicator.properties if [[ ! -f /config/logging.properties ]]; then cp /defaults/logging.properties /config diff --git a/jigasi/rootfs/etc/cont-init.d/10-config b/jigasi/rootfs/etc/cont-init.d/10-config index c99f712..16d15b1 100644 --- a/jigasi/rootfs/etc/cont-init.d/10-config +++ b/jigasi/rootfs/etc/cont-init.d/10-config @@ -11,9 +11,7 @@ if [[ "$JIGASI_XMPP_PASSWORD" == "$OLD_JIGASI_XMPP_PASSWORD" ]]; then exit 1 fi -if [[ ! -f /config/sip-communicator.properties ]]; then - tpl /defaults/sip-communicator.properties > /config/sip-communicator.properties -fi +tpl /defaults/sip-communicator.properties > /config/sip-communicator.properties if [[ ! -f /config/logging.properties ]]; then cp /defaults/logging.properties /config @@ -23,7 +21,7 @@ mkdir -pm777 /tmp/transcripts chown jigasi:jitsi /tmp/transcripts # Create Google Cloud Credentials -if [[ $ENABLE_TRANSCRIPTIONS -eq 1 || $ENABLE_TRANSCRIPTIONS == "true" ]] && [[ ! -f /config/key.json ]]; then +if [[ $ENABLE_TRANSCRIPTIONS -eq 1 || $ENABLE_TRANSCRIPTIONS == "true" ]]; then if [[ -z $GC_PROJECT_ID || -z $GC_PRIVATE_KEY_ID || -z $GC_PRIVATE_KEY || -z $GC_CLIENT_EMAIL || -z $GC_CLIENT_ID || -z $GC_CLIENT_CERT_URL ]]; then echo 'Transcriptions: One or more environment variables are undefined' exit 1