Merge pull request #23 from ralphwetzel/devel

Preparation for v3.2

FreeBSD/theonionbox.sh

@@ -1,52 +1,53 @@
-#!/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"
+#!/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"
+

licenses/scrollMonitor

@@ -0,0 +1,23 @@
+// https://github.com/stutrek/scrollMonitor
+// version 1.2.2
+
+Copyright 2013 Stu Kabakoff and contributors
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

setup.py

@@ -23,6 +23,5 @@
             'configparser',
             'stem',
             'bottle>=0.12.8',
-            'cherrypy'
         ]
 )

theonionbox/config/theonionbox.cfg

@@ -1,101 +1,125 @@
-# Configuration File for TheOnionBox
-[config]
-protocol = 1
-
-[TheOnionBox]
-# Address of your Onion Box;
-# probably should be '0.0.0.0' (preferred)
-# or 'localhost', yet might be something
-# else, eg when operating with several ip's:
-# host = localhost
-# listen on all interfaces
-host = 0.0.0.0
-
-# To define the lower threshold for the notification system.
-# Possible setting are DEBUG, INFO, NOTICE, WARNING, ERROR
-# defaults to NOTICE, case insensitive
-message_level = DEBUG
-
-# Port for the Web Server
-# 8080 should be fine in most cases!
-port = 8080
-
-# New in v2.1.2RC1:
-# Per default, the Box operates at the root level of a domain e.g. http://localhost:8080/.
-# If you intend to operate it (behind a proxy!) at a deeper level (e.g. @ http://my.server.com/theonionbox/)
-# you have to define that base path here. You are not limited to a single path element.
-# Please assure that this is an absolute filepath yet without the domain:port, beginning with a leading slash,
-# no trailing slash, no quotation marks:
-# proxy_path = /theonionbox
-
-# The duration we accept between the delivery of the login_page
-# and the request for login (in seconds)
-login_ttl = 30
-
-# Define the webserver used for serving the pages:
-# This is the standard WSGIRefServer server
-# Remark: This server cannot process IE requests!
-# Thus: Don't use it if you expect clients operating with IE!
-server = default
-# Enable this if you've CherryPy available
-# server = cherrypy
-
-# Shall we operate with SSL?
-# Note: To actually make this running, you have to create a valid ssl certificate first:
-# So run e.g.
-# openssl req -new -x509 -keyout server.pem -out server.pem -days 365 -nodes
-#
-# DON'T distribute this combined private/public key to clients!
-# (see http://www.piware.de/2011/01/creating-an-https-server-in-python/#comment-11380)
-ssl = no
-# ssl = yes
-#
-# The file that holds the Certificate!
-# ssl_certificate = server.pem
-# The file that holds the Key!
-# ssl_key = private_key.pem
-
-# When a NTP server is provided
-# we use it's time to compensate the server's clock
-# ntp_server = pool.ntp.org
-# ntp_server = fritz.box
-
-
-[TorRelay]
-# Address of the Tor Relay
-# 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
-
-# Timeout when connecting to Tor's Control Port.
-# 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
-# Hint: The minimum reasonable TTL is > 30(s)
-# eg. 1 day
-# tor_ttl = 86400
-# eg. 1 hour
-# tor_ttl = 3600
-# eg. forever
-# tor_ttl = -1
-tor_ttl = 30
-
-
-# Switches to preserve the messages of the Relay
-# Up to 400 messages (total) will be preserved
-# The severity of these messages can be defined here
-# There's one switch for ERR, WARN & NOTICE
-# There's NO switch for INFO & DEBUG (as this would flood the memory without true value)
-# Live - transmission of messages can be switched on/off in the client
-
-# tor_preserve_ERR = no
-tor_preserve_ERR = yes
-# tor_preserve_WARN = no
-tor_preserve_WARN = yes
-# tor_preserve_NOTICE = no
-tor_preserve_NOTICE = yes
+# Configuration File for TheOnionBox
+[config]
+protocol = 1
+
+[TheOnionBox]
+# Address of your Onion Box;
+# probably should be '0.0.0.0' (preferred)
+# or 'localhost', yet might be something
+# else, eg when operating with several ip's:
+# host = localhost
+# listen on all interfaces
+host = 0.0.0.0
+
+# To define the lower threshold for the notification system.
+# Possible setting are DEBUG, INFO, NOTICE, WARNING, ERROR
+# defaults to NOTICE, case insensitive
+message_level = DEBUG
+
+# Port for the Web Server
+# 8080 should be fine in most cases!
+port = 8080
+
+# Per default, the Box operates at the root level of a domain e.g. http://localhost:8080/.
+# If you intend to operate it (behind a proxy!) at a deeper level (e.g. @ http://my.server.com/theonionbox/)
+# you have to define that base path here. You are not limited to a single path element.
+# Please assure that this is an absolute filepath yet without the domain:port, beginning with a leading slash,
+# no trailing slash, no quotation marks:
+# proxy_path = /theonionbox
+
+# Deprecated since 20161008
+# login_ttl
+
+# The acceptable duration in seconds between two communication events of a client to the Box.
+# If this duration is exceeded, the Box will expire the session.
+session_ttl = 30
+# Note: This is applicable for login procedures as well as monitoring activities.
+# Note: The minimum duration accepted == 30, max == 3600. Values will be forced into that range.
+
+# Deprecated since v3.2RC3
+# Define the webserver used for serving the pages.
+# sever = default
+
+# Shall we operate with SSL?
+# Note: To actually make this running, you have to create a valid ssl certificate first:
+# So run e.g.
+# openssl req -new -x509 -keyout server.pem -out server.pem -days 365 -nodes
+#
+# DON'T distribute this combined private/public key to clients!
+# (see http://www.piware.de/2011/01/creating-an-https-server-in-python/#comment-11380)
+ssl = no
+# ssl = yes
+#
+# The file that holds the Certificate!
+# ssl_certificate = server.pem
+# The file that holds the Key!
+# ssl_key = private_key.pem
+
+# When a NTP server is provided
+# we use it's time to compensate the server's clock
+# ntp_server = pool.ntp.org
+# ntp_server = fritz.box
+
+[TorProxy]
+# Address:Port of the Tor proxy to operate with
+# v3.2: Only used to query onionoo network data
+# 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]
+# How shall we establish the connection to the relay?
+# => via ControlSocket (define additionally tor_socket):
+# tor_control = socket
+# => via ControlPort (define additionally tor_host & tor_control_port):
+# 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
+
+# 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.
+# 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
+# Tor open after the last user disconnected.
+# Hint: The minimum reasonable TTL is > 30(s)
+# eg. 1 day
+# tor_ttl = 86400
+# eg. 1 hour
+# tor_ttl = 3600
+# eg. forever
+# tor_ttl = -1
+tor_ttl = 30
+
+
+# Switches to preserve the messages of the Relay
+# Up to 400 messages (total) will be preserved
+# The severity of these messages can be defined here
+# There's one switch for ERR, WARN & NOTICE
+# There's NO switch for INFO & DEBUG (as this would flood the memory without true value)
+# Live - transmission of messages can be switched on/off in the client
+
+# tor_preserve_ERR = no
+tor_preserve_ERR = yes
+# tor_preserve_WARN = no
+tor_preserve_WARN = yes
+# tor_preserve_NOTICE = no
+tor_preserve_NOTICE = yes

theonionbox/css/box.css

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