tor: Only start tor when it has been enabled.

[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 6ae03130ef1559c6f222780b4fcb4a449a1d7750..4fef577ac7fb2aee0118f0dad1b4643898c65061 100644 (file)
--- a/src/initscripts/init.d/tor
+++ b/src/initscripts/init.d/tor
@@ -9,8 +9,33 @@
 . /etc/sysconfig/rc
 . ${rc_functions}
 
+function tor_is_enabled() {
+       [ "${TOR_ENABLED}" = "on" ] || [ "${TOR_RELAY_ENABLED}" = "on" ]
+}
+
+function setup_firewall() {
+       eval $(/usr/local/bin/readhash /var/ipfire/tor/settings)
+
+       # 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
+}
+
+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 +45,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
                ;;
@@ -35,12 +66,21 @@ case "${1}" in
                ${0} start
                ;;
 
+       reload-or-restart)
+               # Reload the process if it is already running. Otherwise, restart.
+               if pidofproc -s /usr/bin/tor; then
+                       $0 reload
+               else
+                       $0 restart
+               fi
+               ;;
+
        status)
                statusproc /usr/bin/tor
                ;;
 
        *)
-               echo "Usage: ${0} {start|stop|reload|restart|status}"
+               echo "Usage: ${0} {start|stop|reload|restart|reload-or-restart|status}"
                exit 1
                ;;
 esac