From c6cc67b68dd75b853aa759dabb472159201b3fb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= <s@saghul.net>
Date: Wed, 14 Mar 2018 11:37:09 +0100
Subject: [PATCH] Use an unaltered config.js file

Make all the necessary changes outside, setting the bosh URL
in this case.
---
 web/rootfs/defaults/config.js        |  2 +-
 web/rootfs/etc/cont-init.d/10-config | 27 +++++++++++++++------------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/web/rootfs/defaults/config.js b/web/rootfs/defaults/config.js
index 0e84042..f2e2084 100644
--- a/web/rootfs/defaults/config.js
+++ b/web/rootfs/defaults/config.js
@@ -38,7 +38,7 @@ var config = {
     },
 
     // BOSH URL. FIXME: use XEP-0156 to discover it.
-    bosh: '/http-bind',
+    bosh: '//jitsi-meet.example.com/http-bind',
 
     // The name of client node advertised in XEP-0115 'c' stanza
     clientNode: 'http://jitsi.org/jitsimeet',
diff --git a/web/rootfs/etc/cont-init.d/10-config b/web/rootfs/etc/cont-init.d/10-config
index cb88cc8..06b102e 100644
--- a/web/rootfs/etc/cont-init.d/10-config
+++ b/web/rootfs/etc/cont-init.d/10-config
@@ -2,25 +2,28 @@
 
 # make our folders
 mkdir -p \
-	/config/{nginx/site-confs,keys} \
-	/run \
-	/var/lib/nginx/tmp/client_body \
-	/var/tmp/nginx
+    /config/{nginx/site-confs,keys} \
+    /run \
+    /var/lib/nginx/tmp/client_body \
+    /var/tmp/nginx
 
 # copy config files
 if [[ ! -f /config/nginx/nginx.conf ]]; then
-	cp /defaults/nginx.conf /config/nginx/nginx.conf
+    cp /defaults/nginx.conf /config/nginx/nginx.conf
 fi
 
 if [[ ! -f /config/nginx/site-confs/default ]]; then
-	cp /defaults/default /config/nginx/site-confs/default
-	sed -i \
-	    -e "s,\${XMPP_DOMAIN},$XMPP_DOMAIN,g" \
-	    -e "s,\${XMPP_BOSH_URL_BASE},$XMPP_BOSH_URL_BASE,g" \
-	    /config/nginx/site-confs/default
+    cp /defaults/default /config/nginx/site-confs/default
+    sed -i \
+        -e "s,\${XMPP_DOMAIN},$XMPP_DOMAIN,g" \
+        -e "s,\${XMPP_BOSH_URL_BASE},$XMPP_BOSH_URL_BASE,g" \
+        /config/nginx/site-confs/default
 fi
 
 if [[ ! -f /config/config.js ]]; then
-	cp /defaults/config.js /config/config.js
-	sed -i "s/jitsi-meet.example.com/$XMPP_DOMAIN/g" /config/config.js
+    cp /defaults/config.js /config/config.js
+    sed -i \
+        -e "s#jitsi-meet.example.com#$XMPP_DOMAIN#g" \
+        -e "s#bosh:.*#bosh: '/http-bind',#" \
+        /config/config.js
 fi