Merge remote-tracking branch 'ummeegge/useragent' into next

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

diff --git a/lfs/tor b/lfs/tor
index 559ca5b027a8469b952bec2fe26d1b68fa0e45ad..8bce4be8f1541692cf9d44646e4641406de48b2b 100644 (file)
--- a/lfs/tor
+++ b/lfs/tor
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2013   IPFire Team   <info@ipfire.org>                   #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -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,}
+       # 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
 
-       mkdir -pv /var/lib/tor /var/log/tor
-       chown nobody:nobody /var/lib/tor
+       # Adjust ownerships.
+       chown -R nobody:nobody /var/lib/tor /var/ipfire/tor
 
        # Logrotate
        mkdir -pv /etc/logrotate.d