remove RELAY_DATADIR env

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 && \

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_ACCOUNTING_START**   | threshold rest (AccountingStart)                                             | day 00:00     |
-| **RELAY_DATADIR**            | The directory for keeping all the keys/etc (DataDirectory)                   | /var/lib/tor  |

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}"

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.

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.

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.