From 6c5930027106bb0c5967ce5971d2ccca3114c55a Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Mon, 4 Jul 2016 08:31:29 +0100 Subject: [PATCH] Onion support in for app removals --- src/freedombone-app-blog | 2 ++ src/freedombone-app-gnusocial | 2 ++ src/freedombone-app-gogs | 1 + src/freedombone-app-hubzilla | 2 ++ src/freedombone-app-irc | 1 + src/freedombone-app-mumble | 2 ++ src/freedombone-app-rss | 2 ++ src/freedombone-utils-onion | 9 +++++++++ 8 files changed, 21 insertions(+) diff --git a/src/freedombone-app-blog b/src/freedombone-app-blog index d7b4c14a..ef4dc2e5 100755 --- a/src/freedombone-app-blog +++ b/src/freedombone-app-blog @@ -53,6 +53,8 @@ function remove_blog { sed -i "/$FULLBLOG_CODE/d" /usr/bin/dynamicdns fi fi + function_check remove_onion_service + remove_onion_service blog ${FULLBLOG_ONION_PORT} sed -i '/install_blog/d' $COMPLETION_FILE sed -i '/Blog .*/d' $COMPLETION_FILE } diff --git a/src/freedombone-app-gnusocial b/src/freedombone-app-gnusocial index d93fecb9..29df9039 100755 --- a/src/freedombone-app-gnusocial +++ b/src/freedombone-app-gnusocial @@ -60,6 +60,8 @@ function remove_gnu_social { fi function_check drop_database drop_database gnusocial + function_check remove_onion_service + remove_onion_service microblog ${MICROBLOG_ONION_PORT} sed -i '/install_gnu_social/d' $COMPLETION_FILE sed -i '/GNU Social /d' $COMPLETION_FILE } diff --git a/src/freedombone-app-gogs b/src/freedombone-app-gogs index 5426ef10..dd2331f6 100755 --- a/src/freedombone-app-gogs +++ b/src/freedombone-app-gogs @@ -55,6 +55,7 @@ function remove_gogs { drop_database gogs rm /etc/systemd/system/gogs.service rm -rf $GOPATH/src/github.com/gogits + remove_onion_service gogs ${GIT_ONION_PORT} 9418 sed -i '/install_gogs/d' $COMPLETION_FILE sed -i '/Gogs /d' $COMPLETION_FILE } diff --git a/src/freedombone-app-hubzilla b/src/freedombone-app-hubzilla index d6c33143..032f794d 100755 --- a/src/freedombone-app-hubzilla +++ b/src/freedombone-app-hubzilla @@ -51,6 +51,8 @@ function remove_hubzilla { fi function_check drop_database drop_database hubzilla + function_check remove_onion_service + remove_onion_service hubzilla ${HUBZILLA_ONION_PORT} sed -i '/install_hubzilla/d' $COMPLETION_FILE sed -i '/Hubzilla /d' $COMPLETION_FILE } diff --git a/src/freedombone-app-irc b/src/freedombone-app-irc index 19a6da3a..03d17ec2 100755 --- a/src/freedombone-app-irc +++ b/src/freedombone-app-irc @@ -47,6 +47,7 @@ function remove_irc_server { iptables -D INPUT -p tcp --dport 1024:65535 --sport $IRC_PORT -j ACCEPT function_check save_firewall_settings save_firewall_settings + remove_onion_service irc ${IRC_ONION_PORT} sed -i '/install_irc_server/d' $COMPLETION_FILE sed -i '/IRC /d' $COMPLETION_FILE sed -i '/configure_firewall_for_irc/d' $COMPLETION_FILE diff --git a/src/freedombone-app-mumble b/src/freedombone-app-mumble index 196f152b..907cb0ae 100755 --- a/src/freedombone-app-mumble +++ b/src/freedombone-app-mumble @@ -51,6 +51,8 @@ function remove_mumble { if [ -f /etc/mumble-server.ini ]; then rm /etc/mumble-server.ini fi + function_check remove_onion_service + remove_onion_service voip ${VOIP_PORT} sed -i '/install_mumble/d' $COMPLETION_FILE sed -i '/install_voip/d' $COMPLETION_FILE sed -i '/configure_firewall_for_voip/d' $COMPLETION_FILE diff --git a/src/freedombone-app-rss b/src/freedombone-app-rss index 5195a22d..6a56ca2b 100755 --- a/src/freedombone-app-rss +++ b/src/freedombone-app-rss @@ -45,6 +45,8 @@ function remove_rss_reader { 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} if [ -f /etc/nginx/sites-available/$RSS_READER_DOMAIN_NAME ]; then rm /etc/nginx/sites-available/$RSS_READER_DOMAIN_NAME fi diff --git a/src/freedombone-utils-onion b/src/freedombone-utils-onion index 5c576d83..510bba47 100755 --- a/src/freedombone-utils-onion +++ b/src/freedombone-utils-onion @@ -59,6 +59,15 @@ function remove_onion_service { onion_service_port_to=$2 sed -i "/hidden_service_${onion_service_name}/d" /etc/tor/torrc sed -i "/127.0.0.1:${onion_service_port_to}/d" /etc/tor/torrc + if [ $3 ]; then + sed -i "/127.0.0.1:${3}/d" /etc/tor/torrc + if [ $4 ]; then + sed -i "/127.0.0.1:${4}/d" /etc/tor/torrc + if [ $5 ]; then + sed -i "/127.0.0.1:${5}/d" /etc/tor/torrc + fi + fi + fi systemctl restart tor }