From 7e7e463ea073b4a41b735674453feda82c6e6d3e Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Fri, 11 Nov 2016 09:09:34 +0000 Subject: [PATCH] Check that jitsi is installed --- src/freedombone-utils-web | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/src/freedombone-utils-web b/src/freedombone-utils-web index 03d49847..b9f93b35 100755 --- a/src/freedombone-utils-web +++ b/src/freedombone-utils-web @@ -654,16 +654,18 @@ function update_default_domain { echo $'Updating default domain' if [[ $ONION_ONLY == 'no' ]]; then if [ -d /etc/prosody ]; then - read_config_param "JITSI_DOMAIN_NAME" - if [ ${#JITSI_DOMAIN_NAME} -gt 0 ]; then - if [ -f /etc/ssl/private/${JITSI_DOMAIN_NAME}.key ]; then - cp /etc/ssl/private/${JITSI_DOMAIN_NAME}.key /etc/prosody/certs/${JITSI_DOMAIN_NAME}.key - fi - if [ -f /etc/ssl/certs/${JITSI_DOMAIN_NAME}.crt ]; then - cp /etc/ssl/certs/${JITSI_DOMAIN_NAME}.crt /etc/prosody/certs/${JITSI_DOMAIN_NAME}.pem - fi - if [ -f /etc/ssl/certs/${JITSI_DOMAIN_NAME}.pem ]; then - cp /etc/ssl/certs/${JITSI_DOMAIN_NAME}.pem /etc/prosody/certs/${JITSI_DOMAIN_NAME}.pem + if [ -d /etc/jitsi ]; then + read_config_param "JITSI_DOMAIN_NAME" + if [ ${#JITSI_DOMAIN_NAME} -gt 0 ]; then + if [ -f /etc/ssl/private/${JITSI_DOMAIN_NAME}.key ]; then + cp /etc/ssl/private/${JITSI_DOMAIN_NAME}.key /etc/prosody/certs/${JITSI_DOMAIN_NAME}.key + fi + if [ -f /etc/ssl/certs/${JITSI_DOMAIN_NAME}.crt ]; then + cp /etc/ssl/certs/${JITSI_DOMAIN_NAME}.crt /etc/prosody/certs/${JITSI_DOMAIN_NAME}.pem + fi + if [ -f /etc/ssl/certs/${JITSI_DOMAIN_NAME}.pem ]; then + cp /etc/ssl/certs/${JITSI_DOMAIN_NAME}.pem /etc/prosody/certs/${JITSI_DOMAIN_NAME}.pem + fi fi fi