fix(jibri,jicofo,jigasi,prosody,web): respect previous XMPP_RECORDER_…

…DOMAIN value if set (#1966)

docker-compose.yml

@@ -174,6 +174,7 @@ services:
             - XMPP_MUC_DOMAIN
             - XMPP_HIDDEN_DOMAIN
             - XMPP_PORT
+            - XMPP_RECORDER_DOMAIN
             - WHITEBOARD_COLLAB_SERVER_PUBLIC_URL
             - WHITEBOARD_COLLAB_SERVER_URL_BASE
         networks:
@@ -319,6 +320,7 @@ services:
             - XMPP_INTERNAL_MUC_MODULES
             - XMPP_HIDDEN_DOMAIN
             - XMPP_PORT
+            - XMPP_RECORDER_DOMAIN
             - XMPP_SERVER_S2S_PORT
             - XMPP_SPEAKERSTATS_MODULES
         networks:
@@ -406,6 +408,7 @@ services:
             - XMPP_HIDDEN_DOMAIN
             - XMPP_SERVER
             - XMPP_PORT
+            - XMPP_RECORDER_DOMAIN
             - MAX_SSRCS_PER_USER
             - MAX_SSRC_GROUPS_PER_USER
         depends_on:

jibri.yml

@@ -58,6 +58,7 @@ services:
             - XMPP_HIDDEN_DOMAIN
             - XMPP_SERVER
             - XMPP_PORT
+            - XMPP_RECORDER_DOMAIN
             - XMPP_TRUST_ALL_CERTS
         depends_on:
             - jicofo

jibri/rootfs/etc/cont-init.d/10-config

@@ -73,6 +73,9 @@ else
     echo "No AUTOSCALER_URL defined, leaving autoscaler sidecar disabled"
 fi
 
+# maintain backward compatibility with older variable
+[ -z "${XMPP_HIDDEN_DOMAIN}" ] && export XMPP_HIDDEN_DOMAIN="$XMPP_RECORDER_DOMAIN"
+
 # always recreate configs
 tpl /defaults/jibri.conf > /etc/jitsi/jibri/jibri.conf
 tpl /defaults/xmpp.conf > /etc/jitsi/jibri/xmpp.conf

jicofo/rootfs/etc/cont-init.d/10-config

@@ -13,6 +13,9 @@ if [[ "$JICOFO_AUTH_PASSWORD" == "$OLD_JICOFO_AUTH_PASSWORD" ]]; then
     exit 1
 fi
 
+# maintain backward compatibility with older variable
+[ -z "${XMPP_HIDDEN_DOMAIN}" ] && export XMPP_HIDDEN_DOMAIN="$XMPP_RECORDER_DOMAIN"
+
 tpl /defaults/logging.properties > /config/logging.properties
 tpl /defaults/jicofo.conf > /config/jicofo.conf
 

jigasi/rootfs/etc/cont-init.d/10-config

@@ -53,6 +53,9 @@ else
     echo "No AUTOSCALER_URL defined, leaving autoscaler sidecar disabled"
 fi
 
+# maintain backward compatibility with older variable
+[ -z "${XMPP_HIDDEN_DOMAIN}" ] && export XMPP_HIDDEN_DOMAIN="$XMPP_RECORDER_DOMAIN"
+
 tpl /defaults/logging.properties > /config/logging.properties
 tpl /defaults/sip-communicator.properties > /config/sip-communicator.properties
 tpl /defaults/xmpp-sip-communicator.properties >> /config/sip-communicator.properties

prosody/rootfs/etc/cont-init.d/10-config

@@ -77,6 +77,8 @@ fi
 [ -z "${JVB_AUTH_USER}" ] && export JVB_AUTH_USER=jvb
 [ -z "${XMPP_DOMAIN}" ] && export XMPP_DOMAIN=meet.jitsi
 [ -z "${XMPP_AUTH_DOMAIN}" ] && export XMPP_AUTH_DOMAIN=auth.meet.jitsi
+# maintain backward compatibility with older variable
+[ -z "${XMPP_HIDDEN_DOMAIN}" ] && export XMPP_HIDDEN_DOMAIN="$XMPP_RECORDER_DOMAIN"
 [ -z "${XMPP_HIDDEN_DOMAIN}" ] && export XMPP_HIDDEN_DOMAIN=hidden.meet.jitsi
 
 prosodyctl --config $PROSODY_CFG register focus $XMPP_AUTH_DOMAIN $JICOFO_AUTH_PASSWORD

transcriber.yml

@@ -26,6 +26,7 @@ services:
             - XMPP_SERVER
             - XMPP_PORT
             - XMPP_HIDDEN_DOMAIN
+            - XMPP_RECORDER_DOMAIN
             - XMPP_DOMAIN
             - PUBLIC_URL
             - JIGASI_CONFIGURATION

web/rootfs/etc/cont-init.d/10-config

@@ -107,6 +107,9 @@ if [ -z "$COLIBRI_WEBSOCKET_REGEX" ]; then
     fi
 fi
 
+# maintain backward compatibility with older variable
+[ -z "${XMPP_HIDDEN_DOMAIN}" ] && export XMPP_HIDDEN_DOMAIN="$XMPP_RECORDER_DOMAIN"
+
 # copy config files
 tpl /defaults/nginx.conf > /config/nginx/nginx.conf