瀏覽代碼

Use an unaltered config.js file

Make all the necessary changes outside, setting the bosh URL
in this case.
Saúl Ibarra Corretgé 7 年之前
父節點
當前提交
c6cc67b68d
共有 2 個文件被更改,包括 16 次插入13 次删除
  1. 1 1
      web/rootfs/defaults/config.js
  2. 15 12
      web/rootfs/etc/cont-init.d/10-config

+ 1 - 1
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',

+ 15 - 12
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