From 00abd031f24b465a0921a56b44ea1d8a1e21e3de Mon Sep 17 00:00:00 2001
From: jarlave <jarlave@users.noreply.github.com>
Date: Sun, 31 Mar 2019 15:40:22 +0200
Subject: [PATCH] remove RELAY_DATADIR env

---
 Dockerfile   | 1 -
 README.md    | 3 +--
 run.sh       | 1 -
 torrc.bridge | 2 +-
 torrc.exit   | 2 +-
 torrc.middle | 2 +-
 6 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index e84dcbf..7be7782 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,7 +10,6 @@ ENV RELAY_DIRPORT 9030
 ENV RELAY_CTRLPORT 9051
 ENV RELAY_ACCOUNTING_MAX 1 GBytes
 ENV RELAY_ACCOUNTING_START day 00:00
-ENV RELAY_DATADIR=/var/lib/tor
 
 # add group/user tor with ID
 RUN addgroup -g 1000 -S tor && \
diff --git a/README.md b/README.md
index dc7f10e..5a79af7 100644
--- a/README.md
+++ b/README.md
@@ -13,5 +13,4 @@
 | **RELAY_DIRPORT**            | Default port used for directory (DirPort)                                    | 9030          |
 | **RELAY_CTRLPORT**           | Default port used for control interface (ControlPort)                        | 9051          |
 | **RELAY_ACCOUNTING_MAX**     | Default threshold for sent and recieve (AccountingMax)                       | 1 GBytes      |
-| **RELAY_ACCOUNTING_START**   | threshold rest (AccountingStart)                                             | day 00:00     |
-| **RELAY_DATADIR**            | The directory for keeping all the keys/etc (DataDirectory)                   | /var/lib/tor  |
\ No newline at end of file
+| **RELAY_ACCOUNTING_START**   | threshold rest (AccountingStart)                                             | day 00:00     |
\ No newline at end of file
diff --git a/run.sh b/run.sh
index b0d3afb..e2315c8 100644
--- a/run.sh
+++ b/run.sh
@@ -16,7 +16,6 @@ for relaytype in bridge middle exit; do
 	sed -i "s/RELAY_CTRLPORT/${RELAY_CTRLPORT}/g" "$file"
 	sed -i "s/RELAY_ACCOUNTING_MAX/${RELAY_ACCOUNTING_MAX}/g" "$file"
 	sed -i "s/RELAY_ACCOUNTING_START/${RELAY_ACCOUNTING_START}/g" "$file"
-	sed -i "s/RELAY_DATADIR/${RELAY_DATADIR}/g" "$file"
 done
 
 exec tor -f "/etc/tor/torrc.${RELAY_TYPE}"
\ No newline at end of file
diff --git a/torrc.bridge b/torrc.bridge
index 81f99b7..8233bac 100644
--- a/torrc.bridge
+++ b/torrc.bridge
@@ -49,7 +49,7 @@
 
 ## The directory for keeping all the keys/etc. By default, we store
 ## things in $HOME/.tor on Unix, and in Application Data\tor on Windows.
-DataDirectory RELAY_DATADIR
+DataDirectory /var/lib/tor
 
 ## The port on which Tor will listen for local connections from Tor
 ## controller applications, as documented in control-spec.txt.
diff --git a/torrc.exit b/torrc.exit
index d047318..44ef59f 100644
--- a/torrc.exit
+++ b/torrc.exit
@@ -49,7 +49,7 @@
 
 ## The directory for keeping all the keys/etc. By default, we store
 ## things in $HOME/.tor on Unix, and in Application Data\tor on Windows.
-DataDirectory RELAY_DATADIR
+DataDirectory /var/lib/tor
 
 ## The port on which Tor will listen for local connections from Tor
 ## controller applications, as documented in control-spec.txt.
diff --git a/torrc.middle b/torrc.middle
index 928ae3e..3bed4f9 100644
--- a/torrc.middle
+++ b/torrc.middle
@@ -49,7 +49,7 @@
 
 ## The directory for keeping all the keys/etc. By default, we store
 ## things in $HOME/.tor on Unix, and in Application Data\tor on Windows.
-DataDirectory RELAY_DATADIR
+DataDirectory /var/lib/tor
 
 ## The port on which Tor will listen for local connections from Tor
 ## controller applications, as documented in control-spec.txt.