浏览代码

change jitsi repo

Bob Mottram 8 年前
父节点
当前提交
e39f0c04f4
共有 1 个文件被更改,包括 18 次插入4 次删除
  1. 18
    4
      src/freedombone-app-jitsi

+ 18
- 4
src/freedombone-app-jitsi 查看文件

@@ -308,9 +308,10 @@ function install_jitsi {
308 308
     fi
309 309
 
310 310
     # add jitsi repo
311
+    jitsi_deb_repo=binary # can also be 'unstable'
311 312
     apt-get -yq install wget debconf-utils
312
-    echo 'deb http://download.jitsi.org/nightly/deb unstable/' >> /etc/apt/sources.list
313
-    wget -qO - https://download.jitsi.org/nightly/deb/unstable/archive.key | apt-key add -
313
+    echo "deb http://download.jitsi.org/nightly/deb ${jitsi_deb_repo}/" >> /etc/apt/sources.list
314
+    wget -qO - https://download.jitsi.org/nightly/deb/${jitsi_deb_repo}/archive.key | apt-key add -
314 315
     apt-get update
315 316
 
316 317
     # create onion domains
@@ -357,7 +358,11 @@ function install_jitsi {
357 358
         echo '  # Root' >> $jitsi_nginx_site
358 359
         echo "  root /usr/share/jitsi-meet;" >> $jitsi_nginx_site
359 360
         echo '' >> $jitsi_nginx_site
360
-        echo '  index index.html;' >> $jitsi_nginx_site
361
+        echo '  index index.html index.htm;' >> $jitsi_nginx_site
362
+        echo '' >> $jitsi_nginx_site
363
+        echo '  location /config.js {' >> $jitsi_nginx_site
364
+        echo "      alias /etc/jitsi/meet/${JITSI_DOMAIN_NAME}-config.js;" >> $jitsi_nginx_site
365
+        echo '  }' >> $jitsi_nginx_site
361 366
         echo '' >> $jitsi_nginx_site
362 367
         echo '  location ~ ^/([a-zA-Z0-9=\?]+)$ {' >> $jitsi_nginx_site
363 368
         echo '      rewrite ^/(.*)$ / break;' >> $jitsi_nginx_site
@@ -395,7 +400,11 @@ function install_jitsi {
395 400
     echo '  # Root' >> $jitsi_nginx_site
396 401
     echo "  root /usr/share/jitsi-meet;" >> $jitsi_nginx_site
397 402
     echo '' >> $jitsi_nginx_site
398
-    echo '  index index.html;' >> $jitsi_nginx_site
403
+    echo '  index index.html index.htm;' >> $jitsi_nginx_site
404
+    echo '' >> $jitsi_nginx_site
405
+    echo '  location /config.js {' >> $jitsi_nginx_site
406
+    echo "      alias /etc/jitsi/meet/${JITSI_DOMAIN_NAME}-config.js;" >> $jitsi_nginx_site
407
+    echo '  }' >> $jitsi_nginx_site
399 408
     echo '' >> $jitsi_nginx_site
400 409
     echo '  location ~ ^/([a-zA-Z0-9=\?]+)$ {' >> $jitsi_nginx_site
401 410
     echo '      rewrite ^/(.*)$ / break;' >> $jitsi_nginx_site
@@ -433,6 +442,11 @@ function install_jitsi {
433 442
     cp /etc/ssl/private/${JITSI_DOMAIN_NAME}.key /etc/prosody/certs
434 443
     chown prosody:prosody /etc/prosody/certs/${JITSI_DOMAIN_NAME}.*
435 444
 
445
+    if [ -f /etc/nginx/sites-available/${JITSI_DOMAIN_NAME}.conf ]; then
446
+        nginx_dissite ${JITSI_DOMAIN_NAME}.conf
447
+        rm /etc/nginx/sites-available/${JITSI_DOMAIN_NAME}.conf
448
+    fi
449
+
436 450
     function_check nginx_ensite
437 451
     nginx_ensite ${JITSI_DOMAIN_NAME}
438 452