From 295649ff27854d6899dd72f4dd587dbee45d74ff Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Tue, 30 Jul 2013 21:39:50 +0200 Subject: [PATCH 1/1] tor: Configuration file updates. --- config/backup/includes/tor | 3 +++ config/rootfiles/packages/tor | 3 +++ lfs/tor | 13 ++++++++----- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/config/backup/includes/tor b/config/backup/includes/tor index 02fc3edea..bff495611 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 7f4502f30..864db663c 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 559ca5b02..a61ac400f 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 -- 2.39.2