free
/
freedomboneeee
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't delete conf

This commit is contained in:
Bob Mottram 2016-11-09 22:34:47 +00:00
parent bf5878e4e1
commit 743222666f
1 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/freedombone-app-jitsi
View File

@ -117,12 +117,7 @@ function reconfigure_jitsi {
} }
function upgrade_jitsi { function upgrade_jitsi {
if [ -f /etc/init.d/jicofo ]; then echo -n ''
systemctl stop jicofo
sed -i 's|exec $DAEMON|exec /usr/bin/torify $DAEMON|g' /etc/init.d/jicofo
systemctl daemon-reload
systemctl start jicofo
fi
} }
function backup_local_jitsi { function backup_local_jitsi {
@ -222,11 +217,6 @@ function install_jitsi {
exit 78372 exit 78372
fi fi
if [ -f /etc/nginx/sites-available/${JITSI_DOMAIN_NAME}.conf ]; then
rm /etc/nginx/sites-available/${JITSI_DOMAIN_NAME}.conf
systemctl restart nginx
fi
# add jitsi repo # add jitsi repo
jitsi_deb_repo=binary jitsi_deb_repo=binary
apt-get -yq install wget debconf-utils default-jre apt-get -yq install wget debconf-utils default-jre
@ -368,12 +358,6 @@ function install_jitsi {
cp /etc/ssl/private/${JITSI_DOMAIN_NAME}.key /etc/prosody/certs cp /etc/ssl/private/${JITSI_DOMAIN_NAME}.key /etc/prosody/certs
chown prosody:prosody /etc/prosody/certs/${JITSI_DOMAIN_NAME}.* chown prosody:prosody /etc/prosody/certs/${JITSI_DOMAIN_NAME}.*
# remove extraneous nginx config generated by the deb package
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 function_check nginx_ensite
nginx_ensite ${JITSI_DOMAIN_NAME}.conf nginx_ensite ${JITSI_DOMAIN_NAME}.conf