From 1dd5228ef6717e636f80c8cf7963fec69e8855e0 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Tue, 4 Apr 2017 15:54:20 +0100
Subject: [PATCH] Remove hourly script before stopping daemons
---
src/freedombone-app-gnusocial | 6 +++---
src/freedombone-app-postactiv | 7 ++++---
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/freedombone-app-gnusocial b/src/freedombone-app-gnusocial
index a5fc78165..7e2283e57 100755
--- a/src/freedombone-app-gnusocial
+++ b/src/freedombone-app-gnusocial
@@ -430,6 +430,9 @@ function remove_gnusocial {
echo "Removing $GNUSOCIAL_DOMAIN_NAME"
nginx_dissite $GNUSOCIAL_DOMAIN_NAME
remove_certs $GNUSOCIAL_DOMAIN_NAME
+ if [ -f /etc/cron.hourly/gnusocial-daemons ]; then
+ rm /etc/cron.hourly/gnusocial-daemons
+ fi
if [ -f /var/www/$GNUSOCIAL_DOMAIN_NAME/htdocs/scripts/stopdaemons.sh ]; then
cd /var/www/$GNUSOCIAL_DOMAIN_NAME/htdocs/scripts
./scripts/stopdaemons.sh
@@ -450,9 +453,6 @@ function remove_gnusocial {
remove_app gnusocial
remove_completion_param install_gnusocial
sed -i '/gnusocial/d' $COMPLETION_FILE
- if [ -f /etc/cron.hourly/gnusocial-daemons ]; then
- rm /etc/cron.hourly/gnusocial-daemons
- fi
remove_backup_database_local gnusocial
function_check remove_ddns_domain
diff --git a/src/freedombone-app-postactiv b/src/freedombone-app-postactiv
index 16a136b86..4af7e1f81 100755
--- a/src/freedombone-app-postactiv
+++ b/src/freedombone-app-postactiv
@@ -408,10 +408,14 @@ function remove_postactiv {
echo "Removing $POSTACTIV_DOMAIN_NAME"
nginx_dissite $POSTACTIV_DOMAIN_NAME
remove_certs $POSTACTIV_DOMAIN_NAME
+ if [ -f /etc/cron.hourly/postactiv-daemons ]; then
+ rm /etc/cron.hourly/postactiv-daemons
+ fi
if [ -f /var/www/$POSTACTIV_DOMAIN_NAME/htdocs/scripts/stopdaemons.sh ]; then
cd /var/www/$POSTACTIV_DOMAIN_NAME/htdocs/scripts
./scripts/stopdaemons.sh
fi
+
if [ -d /var/www/$POSTACTIV_DOMAIN_NAME ]; then
rm -rf /var/www/$POSTACTIV_DOMAIN_NAME
fi
@@ -428,9 +432,6 @@ function remove_postactiv {
remove_app postactiv
remove_completion_param install_postactiv
sed -i '/postactiv/d' $COMPLETION_FILE
- if [ -f /etc/cron.hourly/postactiv-daemons ]; then
- rm /etc/cron.hourly/postactiv-daemons
- fi
remove_backup_database_local postactiv
function_check remove_ddns_domain
--
GitLab