From ad05156395cee2d03d37601ea9cd3409ec728868 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@robotics.uk.to>
Date: Tue, 18 Oct 2016 10:43:08 +0100
Subject: [PATCH] Tidying
---
src/freedombone-app-dokuwiki | 5 +++--
src/freedombone-app-gogs | 11 ++++-------
src/freedombone-app-htmly | 6 +++---
src/freedombone-app-irc | 2 +-
src/freedombone-utils-onion | 1 +
5 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/src/freedombone-app-dokuwiki b/src/freedombone-app-dokuwiki
index 3b8c698b9..2e604adb6 100755
--- a/src/freedombone-app-dokuwiki
+++ b/src/freedombone-app-dokuwiki
@@ -185,7 +185,8 @@ function remove_dokuwiki {
if [ -d /usr/share/dokuwiki ]; then
rm -rf /usr/share/dokuwiki
fi
- remove_completion_param install_dokuwiki
+ remove_completion_param "install_dokuwiki"
+ remove_completion_param "dokuwiki domain"
}
function get_dokuwiki_admin_password {
@@ -278,6 +279,7 @@ function install_dokuwiki {
fi
DOKUWIKI_ONION_HOSTNAME=$(add_onion_service dokuwiki 80 ${DOKUWIKI_ONION_PORT})
+ set_completion_param "dokuwiki domain" "${DOKUWIKI_DOMAIN_NAME}"
if [[ $ONION_ONLY == "no" ]]; then
echo 'server {' > /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME
@@ -564,7 +566,6 @@ function install_dokuwiki {
chmod 600 /home/$MY_USERNAME/README
fi
- set_completion_param "dokuwiki domain" "$DOKUWIKI_DOMAIN_NAME"
APP_INSTALLED=1
}
diff --git a/src/freedombone-app-gogs b/src/freedombone-app-gogs
index 87a11042e..4f0ecd27a 100755
--- a/src/freedombone-app-gogs
+++ b/src/freedombone-app-gogs
@@ -345,7 +345,7 @@ function remove_gogs {
rm /etc/systemd/system/gogs.service
rm -rf /home/${GOGS_USERNAME}/*
remove_onion_service gogs ${GIT_ONION_PORT} 9418
- remove_completion_param install_gogs
+ remove_completion_param "install_gogs"
sed -i '/gogs /d' $COMPLETION_FILE
}
@@ -566,7 +566,7 @@ function install_gogs {
echo $'Added onion site for Gogs'
fi
- systemctl restart tor
+ systemctl reload tor
function_check wait_for_onion_service
wait_for_onion_service 'gogs'
@@ -583,11 +583,8 @@ function install_gogs {
chmod 600 /home/${MY_USERNAME}/README
fi
- if ! grep -q "gogs onion domain" ${COMPLETION_FILE}; then
- echo "gogs onion domain:${GIT_ONION_HOSTNAME}" >> ${COMPLETION_FILE}
- else
- sed -i "s|gogs onion domain.*|gogs onion domain:${GIT_ONION_HOSTNAME}|g" ${COMPLETION_FILE}
- fi
+ set_completion_param "gogs domain" "$GIT_DOMAIN_NAME"
+ set_completion_param "gogs onion domain" "$GIT_ONION_HOSTNAME"
function_check add_ddns_domain
add_ddns_domain ${GIT_DOMAIN_NAME}
diff --git a/src/freedombone-app-htmly b/src/freedombone-app-htmly
index 64d583962..a7d059e54 100755
--- a/src/freedombone-app-htmly
+++ b/src/freedombone-app-htmly
@@ -329,9 +329,9 @@ function remove_htmly {
remove_config_param HTMLY_CODE
function_check remove_onion_service
remove_onion_service htmly ${HTMLY_ONION_PORT}
- remove_completion_param install_htmly
- sed -i '/Htmly .*/d' $COMPLETION_FILE
- sed -i '/htmly .*/d' $COMPLETION_FILE
+ remove_completion_param "install_htmly"
+ sed -i '/Htmly /d' $COMPLETION_FILE
+ sed -i '/htmly /d' $COMPLETION_FILE
}
function get_htmly_admin_password {
diff --git a/src/freedombone-app-irc b/src/freedombone-app-irc
index 3f000ca22..3a210f8ea 100755
--- a/src/freedombone-app-irc
+++ b/src/freedombone-app-irc
@@ -404,7 +404,7 @@ function install_irc_client {
echo " port = \"${IRC_PORT}\";" >> /home/${MY_USERNAME}/.irssi/config
echo ' use_ssl = "yes";' >> /home/${MY_USERNAME}/.irssi/config
else
- IRC_ONION_HOSTNAME=$(cat ${COMPLETION_FILE} | grep "irc onion domain" | awk -F ':' '{print $2}')
+ IRC_ONION_HOSTNAME=$(cat ${COMPLETION_FILE} | grep "irc onion domain" | head -n 1 | awk -F ':' '{print $2}')
echo " port = \"${IRC_ONION_PORT}\";" >> /home/${MY_USERNAME}/.irssi/config
echo ' use_ssl = "no";' >> /home/${MY_USERNAME}/.irssi/config
fi
diff --git a/src/freedombone-utils-onion b/src/freedombone-utils-onion
index 84b79a759..9b02909a1 100755
--- a/src/freedombone-utils-onion
+++ b/src/freedombone-utils-onion
@@ -86,6 +86,7 @@ function remove_onion_service {
shred -zu /var/lib/tor/hidden_service_${onion_service_name}/*
rm -rf /var/lib/tor/hidden_service_${onion_service_name}
fi
+ remove_completion_param "${onion_service_name} onion domain"
onion_update
}
--
GitLab