From 9d98b3a29e63f3f24daa19094ff275f4e6334e7d Mon Sep 17 00:00:00 2001 From: Damian Minkov Date: Fri, 29 Aug 2014 12:53:24 +0300 Subject: [PATCH] Does not override prosody config on update. --- debian/jitsi-meet-prosody.postinst | 18 +++++++++++++----- debian/jitsi-meet.postinst | 6 +++--- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/debian/jitsi-meet-prosody.postinst b/debian/jitsi-meet-prosody.postinst index 78efc9770..d212637ea 100644 --- a/debian/jitsi-meet-prosody.postinst +++ b/debian/jitsi-meet-prosody.postinst @@ -23,12 +23,20 @@ case "$1" in . /etc/default/jitsi-videobridge - if [ -f /etc/prosody/prosody.cfg.lua ]; then - mv /etc/prosody/prosody.cfg.lua /etc/prosody/prosody.cfg.lua.orig + PROSODY_CONFIG_PRESENT="true" + if [ ! -f /etc/prosody/prosody.cfg.lua ]; then + PROSODY_CONFIG_PRESENT="false" + gunzip -c /usr/share/doc/jitsi-meet-prosody/prosody.cfg.lua-jvb.example.gz > /etc/prosody/prosody.cfg.lua fi - gunzip -c /usr/share/doc/jitsi-meet-prosody/prosody.cfg.lua-jvb.example.gz > /etc/prosody/prosody.cfg.lua - sed -i "s/jitmeet.example.com/$JVB_HOSTNAME/g" /etc/prosody/prosody.cfg.lua - sed -i "s/jitmeetSecret/$JVB_SECRET/g" /etc/prosody/prosody.cfg.lua + + if [ ! grep "VirtualHost \"$JVB_HOSTNAME\"" /etc/prosody/prosody.cfg.lua > /dev/null ]; then + if [ "PROSODY_CONFIG_PRESENT" = "true" ]; then + mv /etc/prosody/prosody.cfg.lua /etc/prosody/prosody.cfg.lua.orig + fi + sed -i "s/jitmeet.example.com/$JVB_HOSTNAME/g" /etc/prosody/prosody.cfg.lua + sed -i "s/jitmeetSecret/$JVB_SECRET/g" /etc/prosody/prosody.cfg.lua + fi + if [ ! -f /var/lib/prosody/$JVB_HOSTNAME.crt ]; then HOST="$( (hostname -s; echo localhost) | head -n 1)" DOMAIN="$( (hostname -d; echo localdomain) | head -n 1)" diff --git a/debian/jitsi-meet.postinst b/debian/jitsi-meet.postinst index 0befa07e1..015541dca 100644 --- a/debian/jitsi-meet.postinst +++ b/debian/jitsi-meet.postinst @@ -39,9 +39,9 @@ case "$1" in chown -R www-data:www-data /usr/share/jitsi-meet/ sed -i "s/jitsi-meet.example.com/$JVB_HOSTNAME/g" /usr/share/jitsi-meet/config.js # enable turn - if grep "// useStunTurn: true," /usr/share/jitsi-meet/config.js > /dev/null; then - sed -i "s/\/\/\ \ useStunTurn:\ true,/\ \ \ \ useStunTurn:\ true,/" /usr/share/jitsi-meet/config.js - fi + #if grep "// useStunTurn: true," /usr/share/jitsi-meet/config.js > /dev/null; then + # sed -i "s/\/\/\ \ useStunTurn:\ true,/\ \ \ \ useStunTurn:\ true,/" /usr/share/jitsi-meet/config.js + #fi invoke-rc.d nginx restart ;;