From 66dac91335a4f1c649024e116a942fdb14ad1f32 Mon Sep 17 00:00:00 2001
From: lza_menace <lza_menace@protonmail.com>
Date: Tue, 4 May 2021 21:50:08 -0700
Subject: [PATCH] graf sub path, tor all nodes, auto add monero.fail

---
 cloud-init.sh       | 47 +++++++++++++++++++++++++++++++++++++++++++--
 docker-compose.yaml |  1 +
 env-example         |  1 +
 3 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/cloud-init.sh b/cloud-init.sh
index 2626b30..80108a7 100644
--- a/cloud-init.sh
+++ b/cloud-init.sh
@@ -13,6 +13,36 @@ apt-get upgrade -y
 apt-get install software-properties-common sudo git make -y
 apt-get install certbot nginx python3 python3-virtualenv -y
 apt-get install docker.io docker-compose -y
+apt-get install tor -y
+
+# Setup Tor
+mkdir -p /run/tor
+chown -R debian-tor:debian-tor /run/tor
+chmod 700 -R /run/tor
+mkdir -p /var/www/tor
+cat << EOF > /etc/tor/torrc
+BridgeRelay 1
+ControlSocket /run/tor/control
+ControlSocketsGroupWritable 1
+CookieAuthentication 1
+CookieAuthFileGroupReadable 1
+CookieAuthFile /run/tor/control.authcookie
+DataDirectory /var/lib/tor
+ExitPolicy reject6 *:*, reject *:*
+ExitRelay 0
+IPv6Exit 0
+Log notice stdout
+ORPort 9001
+PublishServerDescriptor 0
+SOCKSPort 9051
+HiddenServiceDir /var/lib/tor/monero
+HiddenServicePort 18081
+EOF
+systemctl enable tor
+systemctl restart tor
+cp /var/lib/tor/monero/hostname /var/www/tor/index.html
+chown -R nobody:nogroup /var/www/tor
+chmod 644 /var/www/tor/index.html
 
 # Setup certs and Nginx
 mkdir -p /etc/nginx/conf.d
@@ -58,7 +88,7 @@ server {
     sendfile on;
     send_timeout 600s;
 
-    location / {
+    location /grafana {
         proxy_pass http://127.0.0.1:3000;
         proxy_set_header Host \$host;
         proxy_set_header X-Real-IP \$remote_addr;
@@ -68,6 +98,10 @@ server {
         proxy_redirect off;
     }
 
+    location /tor {
+        alias /var/www/tor;
+    }
+
     include conf.d/ssl.conf;
     ssl_certificate /etc/letsencrypt/live/${DOMAIN}/fullchain.pem;
     ssl_certificate_key /etc/letsencrypt/live/${DOMAIN}/privkey.pem;
@@ -89,7 +123,8 @@ rm -rf /opt/monero/*
 git clone https://github.com/lalanza808/docker-monero-node /opt/monero
 cat << EOF > /opt/monero/.env
 DATA_DIR=/opt/monero/data
-GRAFANA_URL=https://${DOMAIN}
+GRAFANA_URL=https://${DOMAIN}/grafana
+GF_SERVER_SERVE_FROM_SUB_PATH=true
 P2P_PORT=18080
 RESTRICTED_PORT=18081
 ZMQ_PORT=18082
@@ -104,3 +139,11 @@ chown -R monero:monero /opt/monero
 
 # Run Monero node as monero user
 sudo -u monero bash -c "cd /opt/monero && make up"
+
+# Post nodes to monero.fail
+ONION_ADDR=$(cat /var/lib/tor/monero/hostname)
+ONION_URL="http://${ONION_ADDR}:18081"
+CLEAR_URL="http://$(hostname).${DOMAIN}:18081"
+
+curl -q -X POST https://monero.fail/add -d node_url="${ONION_URL}"
+curl -q -X POST https://monero.fail/add -d node_url="${CLEAR_URL}"
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 342bcac..31c5128 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -28,6 +28,7 @@ services:
     environment:
       HOSTNAME: grafana
       GF_SERVER_ROOT_URL: "${GRAFANA_URL}"
+      GF_SERVER_SERVE_FROM_SUB_PATH: "${GF_SERVER_SERVE_FROM_SUB_PATH:-false}"
       GF_ANALYTICS_REPORTING_ENABLED: "false"
       GF_ANALYTICS_CHECK_FOR_UPDATES: "false"
       GF_USERS_ALLOW_SIGN_UP: "false"
diff --git a/env-example b/env-example
index 264bc75..bb5f955 100644
--- a/env-example
+++ b/env-example
@@ -10,3 +10,4 @@ GF_AUTH_DISABLE_LOGIN_FORM=false
 GF_SECURITY_ADMIN_PASSWORD=admin
 GF_SECURITY_ADMIN_USER=admin
 GF_INSTALL_PLUGINS=
+GF_SERVER_SERVE_FROM_SUB_PATH=false