tor: Configuration file updates.

[people/teissler/ipfire-2.x.git] / lfs / tor

diff --git a/lfs/tor b/lfs/tor
index 559ca5b027a8469b952bec2fe26d1b68fa0e45ad..a61ac400f1ee53c573ff7533100eadc757bc4597 100644 (file)
--- a/lfs/tor
+++ b/lfs/tor
@@ -88,11 +88,14 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
 
-       # Install configuration file.
-       mv /etc/tor/torrc{.sample,}
-
-       mkdir -pv /var/lib/tor /var/log/tor
-       chown nobody:nobody /var/lib/tor
+       # Install configuration files.
+       mkdir -pv /var/ipfire/tor /var/lib/tor /var/log/tor
+       touch /var/ipfire/tor/settings
+       mv /etc/tor/torrc.sample /var/ipfire/tor/torrc
+       ln -svf /var/ipfire/tor/torrc /etc/tor/torrc
+
+       # Adjust ownerships.
+       chown nobody:nobody /var/lib/tor /var/ipfire/tor
 
        # Logrotate
        mkdir -pv /etc/logrotate.d