From 5025c5c22704c810bfd31ca2be9b943921f6f3b4 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@robotics.uk.to>
Date: Sun, 9 Oct 2016 20:57:06 +0100
Subject: [PATCH] Ensure that a domain is provided before removing
---
src/freedombone-app-blog | 3 +++
src/freedombone-app-gnusocial | 3 +++
src/freedombone-app-gogs | 3 +++
src/freedombone-app-hubzilla | 3 +++
src/freedombone-app-rss | 4 ++++
src/freedombone-app-wiki | 4 ++--
6 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/src/freedombone-app-blog b/src/freedombone-app-blog
index 36da064f6..ff7734c19 100755
--- a/src/freedombone-app-blog
+++ b/src/freedombone-app-blog
@@ -332,6 +332,9 @@ function remove_blog {
if [[ $(app_is_installed blog) == "0" ]]; then
return
fi
+ if [ ${#FULLBLOG_DOMAIN_NAME} -eq 0 ]; then
+ return
+ fi
if grep -q "FULLBLOG_DOMAIN_NAME" $CONFIGURATION_FILE; then
FULLBLOG_DOMAIN_NAME=$(grep "FULLBLOG_DOMAIN_NAME" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
diff --git a/src/freedombone-app-gnusocial b/src/freedombone-app-gnusocial
index b351facd2..c38e7e213 100755
--- a/src/freedombone-app-gnusocial
+++ b/src/freedombone-app-gnusocial
@@ -350,6 +350,9 @@ function remove_gnusocial {
if [[ $(app_is_installed gnusocial) == "0" ]]; then
return
fi
+ if [ ${#MICROBLOG_DOMAIN_NAME} -eq 0 ]; then
+ return
+ fi
if grep -q "MICROBLOG_DOMAIN_NAME" $CONFIGURATION_FILE; then
MICROBLOG_DOMAIN_NAME=$(grep "MICROBLOG_DOMAIN_NAME" $CONFIGURATION_FILE | head -n 1 | awk -F '=' '{print $2}')
fi
diff --git a/src/freedombone-app-gogs b/src/freedombone-app-gogs
index a1c5c26b6..134a1dcfd 100755
--- a/src/freedombone-app-gogs
+++ b/src/freedombone-app-gogs
@@ -380,6 +380,9 @@ function remove_gogs {
return
fi
+ if [ ${#GIT_DOMAIN_NAME} -eq 0 ]; then
+ return
+ fi
systemctl stop gogs
systemctl disable gogs
nginx_dissite ${GIT_DOMAIN_NAME}
diff --git a/src/freedombone-app-hubzilla b/src/freedombone-app-hubzilla
index 5a18d1d44..545f9ac3c 100755
--- a/src/freedombone-app-hubzilla
+++ b/src/freedombone-app-hubzilla
@@ -319,6 +319,9 @@ function remove_hubzilla {
if [[ $(app_is_installed hubzilla) == "0" ]]; then
return
fi
+ if [ ${#HUBZILLA_DOMAIN_NAME} -eq 0 ]; then
+ return
+ fi
echo $'Removing Hubzilla'
nginx_dissite $HUBZILLA_DOMAIN_NAME
if [ -d /var/www/$HUBZILLA_DOMAIN_NAME ]; then
diff --git a/src/freedombone-app-rss b/src/freedombone-app-rss
index 34488bbba..2f013aece 100755
--- a/src/freedombone-app-rss
+++ b/src/freedombone-app-rss
@@ -246,6 +246,10 @@ function remove_rss {
if [[ $(app_is_installed rss) == "0" ]]; then
return
fi
+ if [ ${#RSS_READER_DOMAIN_NAME} -eq 0 ]; then
+ return
+ fi
+
nginx_dissite $RSS_READER_DOMAIN_NAME
function_check remove_onion_service
remove_onion_service ttrss ${RSS_READER_ONION_PORT} ${RSS_MOBILE_READER_ONION_PORT}
diff --git a/src/freedombone-app-wiki b/src/freedombone-app-wiki
index ec066687c..a258dc3ed 100755
--- a/src/freedombone-app-wiki
+++ b/src/freedombone-app-wiki
@@ -212,8 +212,8 @@ function remove_wiki {
if [[ $(app_is_installed wiki) == "0" ]]; then
return
fi
- if grep -q "WIKI_DOMAIN_NAME" $CONFIGURATION_FILE; then
- WIKI_DOMAIN_NAME=$(grep "WIKI_DOMAIN_NAME" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
+ if [ ${#WIKI_DOMAIN_NAME} -eq 0 ]; then
+ return
fi
function_check remove_onion_service
remove_onion_service wiki ${WIKI_ONION_PORT}
--
GitLab