Merge pull request #4152 from jitsi/prosody-0.10-update
Updates config if prosody 0.10 is used.
This commit is contained in:
commit
ce7bdb35ac
|
@ -126,6 +126,7 @@ case "$1" in
|
||||||
fi
|
fi
|
||||||
|
|
||||||
PR11_INSTALL_CHECK="$(dpkg-query -f '${Status}' -W 'prosody-0.11' 2>/dev/null | awk '{print $3}' || true)"
|
PR11_INSTALL_CHECK="$(dpkg-query -f '${Status}' -W 'prosody-0.11' 2>/dev/null | awk '{print $3}' || true)"
|
||||||
|
PR10_INSTALL_CHECK="$(dpkg-query -f '${Status}' -W 'prosody-0.10' 2>/dev/null | awk '{print $3}' || true)"
|
||||||
PR_VER_INSTALLED=$(dpkg-query -f='${Version}\n' --show prosody 2>/dev/null || true)
|
PR_VER_INSTALLED=$(dpkg-query -f='${Version}\n' --show prosody 2>/dev/null || true)
|
||||||
if [ "$PR11_INSTALL_CHECK" = "installed" ] \
|
if [ "$PR11_INSTALL_CHECK" = "installed" ] \
|
||||||
|| [ "$PR11_INSTALL_CHECK" = "unpacked" ] \
|
|| [ "$PR11_INSTALL_CHECK" = "unpacked" ] \
|
||||||
|
@ -137,6 +138,19 @@ case "$1" in
|
||||||
PROSODY_CONFIG_PRESENT="false"
|
PROSODY_CONFIG_PRESENT="false"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
if [ "$PR10_INSTALL_CHECK" = "installed" ] \
|
||||||
|
|| [ "$PR10_INSTALL_CHECK" = "unpacked" ] \
|
||||||
|
|| dpkg --compare-versions "$PR_VER_INSTALLED" gt "0.10" ; then
|
||||||
|
|
||||||
|
# if the version is 0.10.X (>0.10 and <0.11)
|
||||||
|
if [ -f $PROSODY_HOST_CONFIG ] \
|
||||||
|
&& dpkg --compare-versions "$PR_VER_INSTALLED" lt "0.11" ; then
|
||||||
|
sed -i 's/storage = \"null\"/storage = \"none\"/g' $PROSODY_HOST_CONFIG
|
||||||
|
|
||||||
|
# trigger a restart
|
||||||
|
PROSODY_CONFIG_PRESENT="false"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
if [ ! -f /var/lib/prosody/$JICOFO_AUTH_DOMAIN.crt ]; then
|
if [ ! -f /var/lib/prosody/$JICOFO_AUTH_DOMAIN.crt ]; then
|
||||||
# prosodyctl takes care for the permissions
|
# prosodyctl takes care for the permissions
|
||||||
|
|
Loading…
Reference in New Issue