From 7aedc27b12d156ccece1571e87863bf1b36ead32 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Wed, 20 Dec 2017 13:44:27 +0000 Subject: [PATCH] Add prosody daemon restart on upgrades --- src/freedombone-app-xmpp | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/src/freedombone-app-xmpp b/src/freedombone-app-xmpp index d52f9f7b..045819b2 100755 --- a/src/freedombone-app-xmpp +++ b/src/freedombone-app-xmpp @@ -375,6 +375,17 @@ function update_prosody_modules { fi } +function prosody_daemon_restart_script { + # On rare occasions the daemon appears to get stuck + # i.e. still active, but not accepting connections + # This ensures that it will unstick itself at least once per day + if [ ! -f /etc/cron.daily/prosody ]; then + echo '#!/bin/bash' > /etc/cron.daily/prosody + echo 'systemctl restart prosody' >> /etc/cron.daily/prosody + chmod +x /etc/cron.daily/prosody + fi +} + function upgrade_xmpp { if [ -d /etc/letsencrypt ]; then prosody_groups=$(groups prosody) @@ -382,6 +393,7 @@ function upgrade_xmpp { usermod -a -G ssl-cert prosody fi fi + prosody_daemon_restart_script function_check update_prosody_modules update_prosody_modules xmpp_onion_addresses /etc/prosody/prosody.cfg.lua @@ -1060,12 +1072,7 @@ function install_xmpp { exit 347682 fi - # On rare occasions the daemon appears to get stuck - # i.e. still active, but not accepting connections - # This ensures that it will unstick itself at least once per day - echo '#!/bin/bash' > /etc/cron.daily/prosody - echo 'systemctl restart prosody' >> /etc/cron.daily/prosody - chmod +x /etc/cron.daily/prosody + prosody_daemon_restart_script ${PROJECT_NAME}-pass -u $MY_USERNAME -a xmpp -p "$XMPP_PASSWORD"