From 76c0375a23155785fce051897df8ebd1bb4b38db Mon Sep 17 00:00:00 2001
From: Joe Chander <joe@joe-chandler.com>
Date: Mon, 6 Jul 2020 19:35:16 -0500
Subject: [PATCH] configure 'Address' as an environment variable

---
 tor-relay/Dockerfile   | 0
 tor-relay/README.md    | 1 +
 tor-relay/run.sh       | 1 +
 tor-relay/torrc.bridge | 1 +
 tor-relay/torrc.exit   | 1 +
 tor-relay/torrc.middle | 1 +
 6 files changed, 5 insertions(+)
 mode change 100644 => 100755 tor-relay/Dockerfile
 mode change 100644 => 100755 tor-relay/README.md
 mode change 100644 => 100755 tor-relay/run.sh
 mode change 100644 => 100755 tor-relay/torrc.bridge
 mode change 100644 => 100755 tor-relay/torrc.exit
 mode change 100644 => 100755 tor-relay/torrc.middle

diff --git a/tor-relay/Dockerfile b/tor-relay/Dockerfile
old mode 100644
new mode 100755
diff --git a/tor-relay/README.md b/tor-relay/README.md
old mode 100644
new mode 100755
index 4192172..725076d
--- a/tor-relay/README.md
+++ b/tor-relay/README.md
@@ -10,3 +10,4 @@
 | **RELAY_BANDWIDTH_RATE**     | Limit how much traffic will be allowed through your relay (must be > 20KB/s) | 100 KBytes    |
 | **RELAY_BANDWIDTH_BURST**    | Allow temporary bursts up to a certain amount                                | 200 KBytes    |
 | **RELAY_PORT**               | Default port used for incoming Tor connections (ORPort)                      | 9001          |
+| **RELAY_ADDRESS**            | The public IP/FQDN of your relay                                             | none          |
diff --git a/tor-relay/run.sh b/tor-relay/run.sh
old mode 100644
new mode 100755
index 7bca985..2cc8541
--- a/tor-relay/run.sh
+++ b/tor-relay/run.sh
@@ -12,6 +12,7 @@ for relaytype in bridge middle exit; do
 	sed -i "s/RELAY_BANDWIDTH_RATE/${RELAY_BANDWIDTH_RATE}/g" "$file"
 	sed -i "s/RELAY_BANDWIDTH_BURST/${RELAY_BANDWIDTH_BURST}/g" "$file"
 	sed -i "s/RELAY_PORT/${RELAY_PORT}/g" "$file"
+	sed -i "s/RELAY_ADDRESS/${RELAY_ADDRESS}/g" "$file"
 done
 
 exec tor -f "/etc/tor/torrc.${RELAY_TYPE}"
diff --git a/tor-relay/torrc.bridge b/tor-relay/torrc.bridge
old mode 100644
new mode 100755
index 80ede79..149bacb
--- a/tor-relay/torrc.bridge
+++ b/tor-relay/torrc.bridge
@@ -91,6 +91,7 @@ ORPort RELAY_PORT
 ## The IP address or full DNS name for incoming connections to your
 ## relay. Leave commented out and Tor will guess.
 #Address noname.example.com
+Address RELAY_ADDRESS
 
 ## If you have multiple network interfaces, you can specify one for
 ## outgoing traffic to use.
diff --git a/tor-relay/torrc.exit b/tor-relay/torrc.exit
old mode 100644
new mode 100755
index 2a41d20..085cdc5
--- a/tor-relay/torrc.exit
+++ b/tor-relay/torrc.exit
@@ -91,6 +91,7 @@ ORPort RELAY_PORT
 ## The IP address or full DNS name for incoming connections to your
 ## relay. Leave commented out and Tor will guess.
 #Address noname.example.com
+Address RELAY_ADDRESS
 
 ## If you have multiple network interfaces, you can specify one for
 ## outgoing traffic to use.
diff --git a/tor-relay/torrc.middle b/tor-relay/torrc.middle
old mode 100644
new mode 100755
index 27583ae..f95b410
--- a/tor-relay/torrc.middle
+++ b/tor-relay/torrc.middle
@@ -91,6 +91,7 @@ ORPort RELAY_PORT
 ## The IP address or full DNS name for incoming connections to your
 ## relay. Leave commented out and Tor will guess.
 #Address noname.example.com
+Address RELAY_ADDRESS
 
 ## If you have multiple network interfaces, you can specify one for
 ## outgoing traffic to use.