From e39f0c04f4dc9ff680ec2b54efdbd6ae4beee2ca Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Wed, 9 Nov 2016 19:14:45 +0000 Subject: [PATCH] change jitsi repo --- src/freedombone-app-jitsi | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/src/freedombone-app-jitsi b/src/freedombone-app-jitsi index c9c75cdd..667a7457 100755 --- a/src/freedombone-app-jitsi +++ b/src/freedombone-app-jitsi @@ -308,9 +308,10 @@ function install_jitsi { fi # add jitsi repo + jitsi_deb_repo=binary # can also be 'unstable' apt-get -yq install wget debconf-utils - echo 'deb http://download.jitsi.org/nightly/deb unstable/' >> /etc/apt/sources.list - wget -qO - https://download.jitsi.org/nightly/deb/unstable/archive.key | apt-key add - + echo "deb http://download.jitsi.org/nightly/deb ${jitsi_deb_repo}/" >> /etc/apt/sources.list + wget -qO - https://download.jitsi.org/nightly/deb/${jitsi_deb_repo}/archive.key | apt-key add - apt-get update # create onion domains @@ -357,7 +358,11 @@ function install_jitsi { echo ' # Root' >> $jitsi_nginx_site echo " root /usr/share/jitsi-meet;" >> $jitsi_nginx_site echo '' >> $jitsi_nginx_site - echo ' index index.html;' >> $jitsi_nginx_site + echo ' index index.html index.htm;' >> $jitsi_nginx_site + echo '' >> $jitsi_nginx_site + echo ' location /config.js {' >> $jitsi_nginx_site + echo " alias /etc/jitsi/meet/${JITSI_DOMAIN_NAME}-config.js;" >> $jitsi_nginx_site + echo ' }' >> $jitsi_nginx_site echo '' >> $jitsi_nginx_site echo ' location ~ ^/([a-zA-Z0-9=\?]+)$ {' >> $jitsi_nginx_site echo ' rewrite ^/(.*)$ / break;' >> $jitsi_nginx_site @@ -395,7 +400,11 @@ function install_jitsi { echo ' # Root' >> $jitsi_nginx_site echo " root /usr/share/jitsi-meet;" >> $jitsi_nginx_site echo '' >> $jitsi_nginx_site - echo ' index index.html;' >> $jitsi_nginx_site + echo ' index index.html index.htm;' >> $jitsi_nginx_site + echo '' >> $jitsi_nginx_site + echo ' location /config.js {' >> $jitsi_nginx_site + echo " alias /etc/jitsi/meet/${JITSI_DOMAIN_NAME}-config.js;" >> $jitsi_nginx_site + echo ' }' >> $jitsi_nginx_site echo '' >> $jitsi_nginx_site echo ' location ~ ^/([a-zA-Z0-9=\?]+)$ {' >> $jitsi_nginx_site echo ' rewrite ^/(.*)$ / break;' >> $jitsi_nginx_site @@ -433,6 +442,11 @@ function install_jitsi { cp /etc/ssl/private/${JITSI_DOMAIN_NAME}.key /etc/prosody/certs chown prosody:prosody /etc/prosody/certs/${JITSI_DOMAIN_NAME}.* + if [ -f /etc/nginx/sites-available/${JITSI_DOMAIN_NAME}.conf ]; then + nginx_dissite ${JITSI_DOMAIN_NAME}.conf + rm /etc/nginx/sites-available/${JITSI_DOMAIN_NAME}.conf + fi + function_check nginx_ensite nginx_ensite ${JITSI_DOMAIN_NAME}