From 7be8a6fb21bdbf41e980d56e0bbeb622f9e41e3b Mon Sep 17 00:00:00 2001 From: vdo Date: Thu, 26 May 2022 15:19:44 +0100 Subject: [PATCH] Add tor service start --- installer.sh | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/installer.sh b/installer.sh index 7ff90d1..91271d2 100755 --- a/installer.sh +++ b/installer.sh @@ -152,8 +152,9 @@ install_docker() { ( # Docker Installer as provided in curl -fsSL https://get.docker.com -o - | bash >>"${XMRSH_LOG_FILE}" 2>&1 check_return $? - # Fedora needs to start the daemon - if grep -q "fedora" /etc/os-release; then + # Fedora and Arch need to enable & start the daemon + if grep -q "fedora" /etc/os-release || grep -q "arch" /etc/os-release; then + systemctl enable docker systemctl start docker >>"${XMRSH_LOG_FILE}" 2>&1 fi echo -e "${Ok}" @@ -193,6 +194,17 @@ start_xmrsh() { echo -e "${Ok}" } +start_xmrsh_tor() { + pushd "${XMRSH_DIR}" >>"${XMRSH_LOG_FILE}" 2>&1 + "${OkBullet}Starting tor hidden service... ${Off}" + docker-compose -f docker-compose.yml -f docker-compose.tor.yml up -d >>"${XMRSH_LOG_FILE}" 2>&1 + check_return $? + sleep 3 + ONION=$(docker logs tor 2>&1 | grep Entrypoint | cut -d " " -f 1) + echo -e "${Ok}" + "${OkBullet}Tor hidden service ready at: ${ONION} ${Off}" +} + check_return() { if [ $1 -ne 0 ]; then echo -e "${Fail}" @@ -201,6 +213,11 @@ check_return() { fi } +completed() { + # FIXME: Show domain / public IP + "${OkBullet}Deployment complete!!${Off}" +} + header detect_root check_deps @@ -218,5 +235,7 @@ fi install_xmrsh start_xmrsh +start_xmrsh_tor +completed exit 0