From a8cf12c2a63da5516e4bda5e44e7ee16360b7c6d Mon Sep 17 00:00:00 2001
From: vdo <vdo@greyfaze.net>
Date: Thu, 26 May 2022 14:56:23 +0100
Subject: [PATCH] Add tor compose, fedora service fix

---
 .env                   |  2 ++
 docker-compose.tor.yml | 26 ++++++++++++++++++++++++++
 installer.sh           |  4 ++++
 3 files changed, 32 insertions(+)
 create mode 100644 docker-compose.tor.yml

diff --git a/.env b/.env
index a8cc945..aad71e2 100644
--- a/.env
+++ b/.env
@@ -5,3 +5,5 @@ TRAEFIK_ACME_EMAIL=your-email@xmr.example
 TRAEFIK_LOGLEVEL=DEBUG
 
 MONEROD_TAG=latest
+
+THS_TAG=latest
diff --git a/docker-compose.tor.yml b/docker-compose.tor.yml
new file mode 100644
index 0000000..5ff1a71
--- /dev/null
+++ b/docker-compose.tor.yml
@@ -0,0 +1,26 @@
+version: "3.7"
+
+services:
+  tor:
+    container_name: tor
+    image: goldy/tor-hidden-service:${THS_TAG}
+    links:
+      - monerod
+    environment:
+      MONEROD_TOR_SERVICE_HOSTS: "80:monerod:18089"
+    volumes:
+      - tor-keys:/var/lib/tor/hidden_service/
+    # secrets:
+    #   - monerod
+
+volumes:
+  tor-keys:
+    {}
+    # driver: local
+
+# secrets:
+#   monerod:
+#     file: ./private_key_monerod_v3
+networks:
+  default:
+    name: ${NETWORK:-xmrsh_default}
diff --git a/installer.sh b/installer.sh
index ac339b1..7ff90d1 100755
--- a/installer.sh
+++ b/installer.sh
@@ -152,6 +152,10 @@ 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
+        systemctl start docker >>"${XMRSH_LOG_FILE}" 2>&1
+    fi
     echo -e "${Ok}"
 ); }