tor: Configuration file updates.

diff --git a/config/backup/includes/tor b/config/backup/includes/tor
index 02fc3edea77f7033f3d4c146bd63c47fedce48f1..bff495611b4f52408b37f2991526fc382cfc9af8 100644 (file)
--- a/config/backup/includes/tor
+++ b/config/backup/includes/tor
@@ -1 +1,4 @@
 /etc/tor
 /etc/tor

+/var/ipfire/tor
+/var/lib/tor/fingerprint
+/var/lib/tor/keys

diff --git a/config/rootfiles/packages/tor b/config/rootfiles/packages/tor
index 7f4502f30f883ceb63454f1590b11ff20c05911a..864db663c1cc005418b2667c0005ca1f6ccdcc5a 100644 (file)
--- a/config/rootfiles/packages/tor
+++ b/config/rootfiles/packages/tor
@@ -21,5 +21,8 @@ usr/share/tor
 usr/share/tor/defaults-torrc
 usr/share/tor/geoip
 var/ipfire/backup/addons/includes/tor
 usr/share/tor/defaults-torrc
 usr/share/tor/geoip
 var/ipfire/backup/addons/includes/tor

+var/ipfire/tor
+var/ipfire/tor/settings
+var/ipfire/tor/torrc

 var/lib/tor
 var/log/tor
 var/lib/tor
 var/log/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
 
        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
 
        # Logrotate
        mkdir -pv /etc/logrotate.d