From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 30 Jul 2013 19:39:50 +0000 (+0200)
Subject: tor: Configuration file updates.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5c00234a67abdae9505287f6e3ef59d729e2af05;p=people%2Fms%2Fipfire-2.x.git

tor: Configuration file updates.
---

diff --git a/config/backup/includes/tor b/config/backup/includes/tor
index 02fc3edea7..bff495611b 100644
--- a/config/backup/includes/tor
+++ b/config/backup/includes/tor
@@ -1 +1,4 @@
 /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 7f4502f30f..864db663c1 100644
--- 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
+var/ipfire/tor
+var/ipfire/tor/settings
+var/ipfire/tor/torrc
 var/lib/tor
 var/log/tor
diff --git a/lfs/tor b/lfs/tor
index 559ca5b027..a61ac400f1 100644
--- 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