From 16646473cb89e23316778c0333aeeb2bbabf0e42 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@robotics.uk.to>
Date: Thu, 10 Nov 2016 15:51:02 +0000
Subject: [PATCH] Certificate paths
---
src/freedombone-app-jitsi | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/freedombone-app-jitsi b/src/freedombone-app-jitsi
index 05e635b7d..c290ad171 100755
--- a/src/freedombone-app-jitsi
+++ b/src/freedombone-app-jitsi
@@ -362,22 +362,24 @@ function install_jitsi {
mv /etc/ssl/certs/${JITSI_DOMAIN_NAME}.crt /etc/ssl/certs/${JITSI_DOMAIN_NAME}.pem
fi
+ # ensure that certs are available to prosody with correct permissions
+ cp /etc/ssl/certs/${JITSI_DOMAIN_NAME}.* /etc/prosody/certs
+ cp /etc/ssl/private/${JITSI_DOMAIN_NAME}.key /etc/prosody/certs
+ chown prosody:prosody /etc/prosody/certs/${JITSI_DOMAIN_NAME}.*
+
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
- sed -i "s|key =.*|key = \"/etc/ssl/private/${JITSI_DOMAIN_NAME}.key\"|g" /etc/prosody/conf.avail/${JITSI_DOMAIN_NAME}.cfg.lua
- sed -i "s|certificate =.*|certificate = \"/etc/ssl/certs/${JITSI_DOMAIN_NAME}.pem\"|g" /etc/prosody/conf.avail/${JITSI_DOMAIN_NAME}.cfg.lua
fi
+
+ sed -i "s|key =.*|key = \"/etc/prosody/certs/${JITSI_DOMAIN_NAME}.key\"|g" /etc/prosody/conf.avail/${JITSI_DOMAIN_NAME}.cfg.lua
+ sed -i "s|certificate =.*|certificate = \"/etc/prosody/certs/${JITSI_DOMAIN_NAME}.pem\"|g" /etc/prosody/conf.avail/${JITSI_DOMAIN_NAME}.cfg.lua
+
sed -i "s|.conf.crt|.crt|g" /etc/nginx/sites-available/${JITSI_DOMAIN_NAME}.conf
sed -i "s|.conf.pem|.pem|g" /etc/nginx/sites-available/${JITSI_DOMAIN_NAME}.conf
sed -i "s|.conf.key|.key|g" /etc/nginx/sites-available/${JITSI_DOMAIN_NAME}.conf
sed -i "s|.conf.dhparam|.dhparam|g" /etc/nginx/sites-available/${JITSI_DOMAIN_NAME}.conf
- # ensure that certs are available to prosody with correct permissions
- cp /etc/ssl/certs/${JITSI_DOMAIN_NAME}.* /etc/prosody/certs
- cp /etc/ssl/private/${JITSI_DOMAIN_NAME}.key /etc/prosody/certs
- chown prosody:prosody /etc/prosody/certs/${JITSI_DOMAIN_NAME}.*
-
function_check nginx_ensite
nginx_ensite ${JITSI_DOMAIN_NAME}.conf
--
GitLab