Preparation for 3.2

FreeBSD/theonionbox.sh

@@ -0,0 +1,52 @@
+#!/bin/sh
+#
+# PROVIDE: theonionbox
+# REQUIRE: DAEMON FILESYSTEMS
+# BEFORE: LOGIN
+
+# Add the following line to /etc/rc.conf to enable TheOnionBox.
+# theonionbox_enable (bool):	Set it to "YES" to enable TheOnionBox. Default: NO
+
+# To achieve this, run the following line from the shell:
+# echo “theonionbox_enable=YES” >>/etc/rc.conf
+
+. /etc/rc.subr
+
+name="theonionbox"
+rcvar=theonionbox_enable
+
+load_rc_config ${name}
+
+: ${theonionbox_enable="NO"}
+: ${theonionbox_pidfile="/var/run/${name}.pid"}
+
+#
+# Set the following lines according to your installation:
+#
+
+# theonionbox_dir (str):        Points to your theonionbox directory
+#			                    Default: /your/path/to/theonionbox ... which you obviously have to alter!
+: ${theonionbox_dir="/your/path/to/theonionbox"}
+
+# theonionbox_conf (str):       Points to your onionbox.cfg file.
+#                               Default: $(theonionbox_dir)/config/theonionbox.cfg
+: ${theonionbox_conf="${theonionbox_dir}/config/theonionbox.cfg"}
+
+# theonionbox_user (str):	    TheOnionBox daemon user.
+#                               Default: _tor
+#                               Please ensure that this user has write privileges to '{theonionbox_dir}/log'
+: ${theonionbox_user="_tor"}
+
+required_files=${theonionbox_conf}
+required_dirs=${theonionbox_dir}
+pidfile=${theonionbox_pidfile}
+
+# Please ensure that there is this symlink to the python version you intend to use!
+command_interpreter="/usr/local/bin/python"
+
+# That's out script
+command="${theonionbox_dir}/theonionbox.py --mode=service --config='${theonionbox_conf}'"
+start_cmd="/usr/sbin/daemon -u ${theonionbox_user} -p ${pidfile} ${command}"
+
+# Let's go!
+run_rc_command "$1"

theonionbox/config/theonionbox.cfg

@@ -63,22 +63,45 @@ ssl = no
 # ntp_server = pool.ntp.org
 # ntp_server = fritz.box
 
+[TorProxy]
+# Address:Port of the Tor proxy to operate with
+# tor_proxy = 127.0.0.1:9050
+
+# Not yet implemented:
+
+[TorRelays]
+# Define the number of relays to monitor
+# Defaults to 1 if not defined!
+# tor_count = 2
+
 
 [TorRelay]
-# Address of the Tor Relay
+# How shall we establish the connection to the relay?
+# => via ControlSocket:
+# tor_control = socket
+# => via ControlSocket:
+# tor_control = port
+# Note: This defaults to tor_control = port if not defined!
+tor_control = port
+
+# Address of this Tor instance
 # Do NOT use 'localhost' but 127.0.0.1 to connect locally
 tor_host = 127.0.0.1
 
-# Control Port of the Tor Relay
-tor_control_port = 9090
+# ControlPort of this Tor instance
+tor_control_port = 9051
+
+# ControlSocket of this Tor instance
+tor_control_socket = /var/run/tor/control
+
 
-# Timeout when connecting to Tor's Control Port.
+# Timeout when connecting to Tor.
 # Usually the connection should be established very quick;
 # you may increase this if connecting to very remote systems.
 # tor_control_timeout = 60
 
 # The Number of Seconds we keep the connection to
-# the Relay open after the last user disconnected
+# Tor open after the last user disconnected.
 # Hint: The minimum reasonable TTL is > 30(s)
 # eg. 1 day
 # tor_ttl = 86400

theonionbox/css/box.css

@@ -90,6 +90,13 @@ body {
     min-width: 200px;
 }
 
+.box_datum_bold {
+	font-family: "LatoLatinWebBlack";
+    font-size: 19px;
+    text-align: right;
+    min-width: 200px;
+}
+
 .box_value {
 	font-family: "LatoLatinWeb";
     font-size: 19px;
@@ -128,7 +135,7 @@ body {
 
 
 .box_name {
-   // Animation
+   % #// Animation
    -webkit-transition: all 0.4s ease;
    transition: all 0.4s ease;
    opacity: 1