Merge remote-tracking branch 'earl/tor' into next

[people/teissler/ipfire-2.x.git] / src / initscripts / init.d / tor

diff --git a/src/initscripts/init.d/tor b/src/initscripts/init.d/tor
index 82dab68bd9276487ca084f863973a1be12de8a86..9c1dfc769285f282a926eca8ef230456e6652fff 100644 (file)
--- a/src/initscripts/init.d/tor
+++ b/src/initscripts/init.d/tor
@@ -9,8 +9,37 @@
 . /etc/sysconfig/rc
 . ${rc_functions}
 
+eval $(/usr/local/bin/readhash /var/ipfire/tor/settings)
+
+function tor_is_enabled() {
+       [ "${TOR_ENABLED}" = "on" ] || [ "${TOR_RELAY_ENABLED}" = "on" ]
+}
+
+function setup_firewall() {
+       # Flush all rules.
+       flush_firewall
+
+       if [ "${TOR_RELAY_ENABLED}" = "on" -a -n "${TOR_RELAY_PORT}" ]; then
+               iptables -A TOR_INPUT -p tcp --dport "${TOR_RELAY_PORT}" -j ACCEPT
+       fi
+
+       if [ "${TOR_RELAY_ENABLED}" = "on" -a -n "${TOR_RELAY_DIRPORT}" ] && [ "${TOR_RELAY_DIRPORT}" -ne 0 ]; then
+               iptables -A TOR_INPUT -p tcp --dport "${TOR_RELAY_DIRPORT}" -j ACCEPT
+       fi
+}
+
+function flush_firewall() {
+       # Flush all rules.
+       iptables -F TOR_INPUT
+}
+
 case "${1}" in
        start)
+               tor_is_enabled || exit 0
+
+               # Setup firewall.
+               setup_firewall
+
                boot_mesg "Starting tor..."
                loadproc /usr/bin/tor \
                        --runasdaemon 1 \
@@ -20,11 +49,17 @@ case "${1}" in
                ;;
 
        stop)
+               # Flush firewall.
+               flush_firewall
+
                boot_mesg "Stopping tor..."
                killproc /usr/bin/tor
                ;;
 
        reload)
+               # Setup firewall.
+               setup_firewall
+
                boot_mesg "Reloading tor..."
                reloadproc /usr/bin/tor
                ;;