From a343dd0631897a99294d2b5ea01246cd3adf037f Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Wed, 9 Nov 2016 19:34:31 +0000 Subject: [PATCH] Remove xmpp config --- src/freedombone-app-jitsi | 57 --------------------------------------- 1 file changed, 57 deletions(-) diff --git a/src/freedombone-app-jitsi b/src/freedombone-app-jitsi index d1389174..ef99b39a 100755 --- a/src/freedombone-app-jitsi +++ b/src/freedombone-app-jitsi @@ -234,61 +234,6 @@ function remove_jitsi { remove_ddns_domain $JITSI_DOMAIN_NAME } -function install_jitsi_xmpp { - if [ ! -d /etc/prosody/conf.avail ]; then - echo $'Missing directory /etc/prosody/conf.avail' - exit 62382 - fi - - cp /var/www/${JITSI_DOMAIN_NAME}/htdocs/prosody-plugins/*.lua /usr/lib/prosody/modules - cp -r /var/www/${JITSI_DOMAIN_NAME}/htdocs/prosody-plugins/token /usr/lib/prosody/modules/ - - update_default_domain - - prosody_config=/etc/prosody/conf.avail/${JITSI_DOMAIN_NAME}.cfg.lua - echo "VirtualHost \"${JITSI_DOMAIN_NAME}\"" > $prosody_config - echo ' authentication = "anonymous"' >> $prosody_config - echo ' ssl = {' >> $prosody_config - echo " key = \"/etc/prosody/certs/${JITSI_DOMAIN_NAME}.key\";" >> $prosody_config - echo " certificate = \"/etc/prosody/certs/${JITSI_DOMAIN_NAME}.pem\";" >> $prosody_config - echo " dhparam = \"/etc/prosody/certs/${JITSI_DOMAIN_NAME}.dhparam\";" >> $prosody_config - echo ' options = {"no_sslv2", "no_sslv3" };' >> $prosody_config - echo ' }' >> $prosody_config - echo '' >> $prosody_config - echo ' modules_enabled = {' >> $prosody_config - echo ' "bosh";' >> $prosody_config - echo ' "pubsub";' >> $prosody_config - echo ' "tls";' >> $prosody_config - echo ' "onions";' >> $prosody_config - echo ' }' >> $prosody_config - echo '' >> $prosody_config - echo "VirtualHost \"${JITSI_ONION_HOSTNAME}\"" > $prosody_config - echo ' authentication = "anonymous"' >> $prosody_config - echo ' modules_enabled = {' >> $prosody_config - echo ' "bosh";' >> $prosody_config - echo ' "pubsub";' >> $prosody_config - echo ' "onions";' >> $prosody_config - echo ' }' >> $prosody_config - echo '' >> $prosody_config - echo "VirtualHost \"${JITSI_AUTH_ONION_HOSTNAME}\"" >> $prosody_config - echo ' authentication = "internal_plain"' >> $prosody_config - echo ' modules_enabled = {' >> $prosody_config - echo ' "onions";' >> $prosody_config - echo ' }' >> $prosody_config - echo '' >> $prosody_config - echo "admins = { \"focus@${JITSI_AUTH_ONION_HOSTNAME}\" }" >> $prosody_config - echo '' >> $prosody_config - echo "Component \"${JITSI_CONFERENCE_ONION_HOSTNAME}\" \"muc\"" >> $prosody_config - echo "Component \"${JITSI_VIDEOBRIDGE_ONION_HOSTNAME}\"" >> $prosody_config - echo " component_secret = \"${JITSI_VIDEOBRIDGE_SECRET}\"" >> $prosody_config - echo "Component \"${JITSI_FOCUS_ONION_HOSTNAME}\"" >> $prosody_config - echo " component_secret = \"${JITSI_FOCUS_SECRET}\"" >> $prosody_config - - ln -s /etc/prosody/conf.avail/${JITSI_DOMAIN_NAME}.cfg.lua /etc/prosody/conf.d/${JITSI_DOMAIN_NAME}.cfg.lua - - prosodyctl register focus ${JITSI_AUTH_ONION_HOSTNAME} "${JITSI_CONFERENCE_SECRET}" -} - function install_jitsi { if [[ "$(can_install_videobridge)" == "0" ]]; then echo $'jitsi meet/videobridge can only be installed on i386 or amd64 architectures' @@ -434,8 +379,6 @@ function install_jitsi { mv /etc/ssl/certs/${JITSI_DOMAIN_NAME}.crt /etc/ssl/certs/${JITSI_DOMAIN_NAME}.pem fi - # install_jitsi_xmpp - if [ -f /etc/ssl/certs/${JITSI_DOMAIN_NAME}.pem ]; then sed -i "s|.crt|.pem|g" $jitsi_nginx_site sed -i "s|.crt|.pem|g" /etc/prosody/conf.d/${JITSI_DOMAIN_NAME}.cfg.lua