From 1d7981b2b6d7cca7e108ffe628922b3436d96aeb Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@robotics.uk.to>
Date: Thu, 27 Oct 2016 19:56:57 +0100
Subject: [PATCH] Stopping gnusocial daemons

---
 src/freedombone-app-gnusocial | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/freedombone-app-gnusocial b/src/freedombone-app-gnusocial
index a0872565..4da53831 100755
--- a/src/freedombone-app-gnusocial
+++ b/src/freedombone-app-gnusocial
@@ -443,7 +443,7 @@ function restore_remote_gnusocial {
 
         # stop the daemons
         cd /var/www/${GNUSOCIAL_DOMAIN_NAME}/htdocs
-        scripts/stopdaemons.sh
+        ./scripts/stopdaemons.sh
 
         function_check gnusocial_create_database
         gnusocial_create_database
@@ -456,7 +456,7 @@ function restore_remote_gnusocial {
 
         # start the daemons
         cd /var/www/${GNUSOCIAL_DOMAIN_NAME}/htdocs
-        scripts/startdaemons.sh
+        ./scripts/startdaemons.sh
         echo $"Restore of gnusocial complete"
     fi
 }
@@ -470,6 +470,10 @@ function remove_gnusocial {
     echo "Removing $GNUSOCIAL_DOMAIN_NAME"
     nginx_dissite $GNUSOCIAL_DOMAIN_NAME
     remove_certs $GNUSOCIAL_DOMAIN_NAME
+    if [ -f /var/www/$GNUSOCIAL_DOMAIN_NAME/htdocs/scripts/stopdaemons.sh ]; then
+        cd /var/www/$GNUSOCIAL_DOMAIN_NAME/htdocs/scripts
+        ./scripts/stopdaemons.sh
+    fi
     if [ -d /var/www/$GNUSOCIAL_DOMAIN_NAME ]; then
         rm -rf /var/www/$GNUSOCIAL_DOMAIN_NAME
     fi
@@ -486,7 +490,9 @@ function remove_gnusocial {
     remove_app gnusocial
     remove_completion_param install_gnusocial
     sed -i '/gnusocial /d' $COMPLETION_FILE
-    pkill queuedaemon
+    if [ -f /etc/cron.hourly/gnusocial-daemons ]; then
+        rm /etc/cron.hourly/gnusocial-daemons
+    fi
 }
 
 function install_gnusocial_main {