From 0f0a9420a05c363746e881d835f13fec373fb002 Mon Sep 17 00:00:00 2001 From: Paul Tiedtke Date: Fri, 18 Jan 2019 22:22:52 +0100 Subject: [PATCH] jigasi: make it completely optional --- jicofo/rootfs/defaults/sip-communicator.properties | 3 +++ prosody/rootfs/etc/cont-init.d/10-config | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/jicofo/rootfs/defaults/sip-communicator.properties b/jicofo/rootfs/defaults/sip-communicator.properties index 01a9b37..7f821cf 100644 --- a/jicofo/rootfs/defaults/sip-communicator.properties +++ b/jicofo/rootfs/defaults/sip-communicator.properties @@ -1,6 +1,9 @@ org.jitsi.jicofo.ALWAYS_TRUST_MODE_ENABLED=true org.jitsi.jicofo.BRIDGE_MUC={{ .Env.JVB_BREWERY_MUC }}@{{ .Env.XMPP_INTERNAL_MUC_DOMAIN }} + +{{ if .Env.JIGASI_BREWERY_MUC }} org.jitsi.jicofo.jigasi.BREWERY={{ .Env.JIGASI_BREWERY_MUC}}@{{ .Env.XMPP_INTERNAL_MUC_DOMAIN }} +{{ end }} {{ if .Env.ENABLE_AUTH }} org.jitsi.jicofo.auth.URL=XMPP:{{ .Env.XMPP_DOMAIN }} diff --git a/prosody/rootfs/etc/cont-init.d/10-config b/prosody/rootfs/etc/cont-init.d/10-config index a724f53..f5ac27f 100644 --- a/prosody/rootfs/etc/cont-init.d/10-config +++ b/prosody/rootfs/etc/cont-init.d/10-config @@ -13,7 +13,10 @@ if [[ ! -f $PROSODY_CFG ]]; then prosodyctl --config $PROSODY_CFG register $JICOFO_AUTH_USER $XMPP_AUTH_DOMAIN $JICOFO_AUTH_PASSWORD prosodyctl --config $PROSODY_CFG register $JVB_AUTH_USER $XMPP_AUTH_DOMAIN $JVB_AUTH_PASSWORD - prosodyctl --config $PROSODY_CFG register $JIGASI_XMPP_USER $XMPP_AUTH_DOMAIN $JIGASI_XMPP_PASSWORD + + if [[ ! -z $JIGASI_XMPP_USER ]] && [[ ! -z $JIGASI_XMPP_PASSWORD ]]; then + prosodyctl --config $PROSODY_CFG register $JIGASI_XMPP_USER $XMPP_AUTH_DOMAIN $JIGASI_XMPP_PASSWORD + fi fi mkdir -p /config/certs