Ver código fonte

change jitsi repo

Bob Mottram 8 anos atrás
pai
commit
e39f0c04f4
1 arquivos alterados com 18 adições e 4 exclusões
  1. 18
    4
      src/freedombone-app-jitsi

+ 18
- 4
src/freedombone-app-jitsi Ver arquivo

308
     fi
308
     fi
309
 
309
 
310
     # add jitsi repo
310
     # add jitsi repo
311
+    jitsi_deb_repo=binary # can also be 'unstable'
311
     apt-get -yq install wget debconf-utils
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
     apt-get update
315
     apt-get update
315
 
316
 
316
     # create onion domains
317
     # create onion domains
357
         echo '  # Root' >> $jitsi_nginx_site
358
         echo '  # Root' >> $jitsi_nginx_site
358
         echo "  root /usr/share/jitsi-meet;" >> $jitsi_nginx_site
359
         echo "  root /usr/share/jitsi-meet;" >> $jitsi_nginx_site
359
         echo '' >> $jitsi_nginx_site
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
         echo '' >> $jitsi_nginx_site
366
         echo '' >> $jitsi_nginx_site
362
         echo '  location ~ ^/([a-zA-Z0-9=\?]+)$ {' >> $jitsi_nginx_site
367
         echo '  location ~ ^/([a-zA-Z0-9=\?]+)$ {' >> $jitsi_nginx_site
363
         echo '      rewrite ^/(.*)$ / break;' >> $jitsi_nginx_site
368
         echo '      rewrite ^/(.*)$ / break;' >> $jitsi_nginx_site
395
     echo '  # Root' >> $jitsi_nginx_site
400
     echo '  # Root' >> $jitsi_nginx_site
396
     echo "  root /usr/share/jitsi-meet;" >> $jitsi_nginx_site
401
     echo "  root /usr/share/jitsi-meet;" >> $jitsi_nginx_site
397
     echo '' >> $jitsi_nginx_site
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
     echo '' >> $jitsi_nginx_site
408
     echo '' >> $jitsi_nginx_site
400
     echo '  location ~ ^/([a-zA-Z0-9=\?]+)$ {' >> $jitsi_nginx_site
409
     echo '  location ~ ^/([a-zA-Z0-9=\?]+)$ {' >> $jitsi_nginx_site
401
     echo '      rewrite ^/(.*)$ / break;' >> $jitsi_nginx_site
410
     echo '      rewrite ^/(.*)$ / break;' >> $jitsi_nginx_site
433
     cp /etc/ssl/private/${JITSI_DOMAIN_NAME}.key /etc/prosody/certs
442
     cp /etc/ssl/private/${JITSI_DOMAIN_NAME}.key /etc/prosody/certs
434
     chown prosody:prosody /etc/prosody/certs/${JITSI_DOMAIN_NAME}.*
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
     function_check nginx_ensite
450
     function_check nginx_ensite
437
     nginx_ensite ${JITSI_DOMAIN_NAME}
451
     nginx_ensite ${JITSI_DOMAIN_NAME}
438
 
452