From b51ae97f5efcbecac8fce16df25cd3c1ceec2a97 Mon Sep 17 00:00:00 2001
From: Nick Daly <Nick.M.Daly@gmail.com>
Date: Sun, 17 Jun 2012 16:39:33 -0500
Subject: [PATCH] Moved TODOs from mailing list to source files.

---
 README                                        | 30 +++++++++++++++++++
 ugly_hacks/santiago/TODO                      | 13 ++++++--
 .../santiago/protocols/https/controller.py    |  9 ++++++
 3 files changed, 49 insertions(+), 3 deletions(-)

diff --git a/README b/README
index 6d56c72fd..c7123316e 100644
--- a/README
+++ b/README
@@ -50,4 +50,34 @@ interface will overwrite those changes at first opportunity.  This
 interface is not a tool for super admins facing complex scenarios.  It
 is for home users to do a wide variety of basic tasks.
 
+## TODOs
 
+This stuff needs to get done.
+
+### Privoxy
+
+* TODO Privoxy should use the released HTTPS Everywhere regexp ruleset
+* TODO Add enabling and disabling Privoxy to the Plinth UI
+
+### DHCP / IP Config
+
+* TODO Turn DHCP on/off through Plinth
+* TODO Select DHCP or Static IP in Plinth
+* TODO Integrate basic OpenVPN settings into Plinth
+* TODO Integrate Dnsmasq into Plinth
+* TODO Point "fbx" and "freedombox" URLs to the Plinth UI
+
+### Setup/First-Run Process
+
+* TODO Build the first run config/setup
+* TODO The setup process generates keys for user
+* TODO Advanced users can replace those keys with existing keys later.
+* TODO Setup generates keys for the box itself
+* TODO This allows discovery, collaborative reliability monitoring, etc.
+* TODO Turn DHCP on by default (on first boot)
+* TODO Enable Wireless Access Point (WAP) by default
+
+### DreamPlug Specific?
+
+* TODO Enable both eth0 and eth1 by default
+* TODO Decide which eth is LAN and which is WAN
diff --git a/ugly_hacks/santiago/TODO b/ugly_hacks/santiago/TODO
index 5f341d7cb..abcc0e022 100644
--- a/ugly_hacks/santiago/TODO
+++ b/ugly_hacks/santiago/TODO
@@ -1,8 +1,15 @@
-* Service time expiry
+* TODO Integrate FreedomBuddy into Plinth
+* TODO Integrate OpenVPN/Santiago: OpenVPN via Santiago.
+   See redirect-gateway for redirecting all traffic.
+   http://openvpn.net/index.php/open-source/documentation/examples.html
+* TODO Integrate SSH/Santiago: SSH via Santiago:
+   https://help.ubuntu.com/community/SSH_VPN
+
+* TODO Service time expiry
 
 - Replies include "this service expires on".
 
-* Add real Unit Testing.
+* TODO Add real Unit Testing.
 
    - Spec out the system through test harnesses.
 
@@ -10,7 +17,7 @@
 
    - Differentiate backends and the independent system.
 
-* Message Queuing
+* TODO Message Queuing
 
 - Process a maximum of X MB over Y requests per unit time Z per
    friend.
diff --git a/ugly_hacks/santiago/protocols/https/controller.py b/ugly_hacks/santiago/protocols/https/controller.py
index a7c1e1b5f..7d7301adc 100644
--- a/ugly_hacks/santiago/protocols/https/controller.py
+++ b/ugly_hacks/santiago/protocols/https/controller.py
@@ -18,6 +18,15 @@ import sys
 import logging
 
 def allow_ips(ips = None):
+    """Refuse connections from non-whitelisted IPs.
+
+    Defaults to the localhost.
+
+    Hook documentation is available in:
+    
+    http://docs.cherrypy.org/dev/progguide/extending/customtools.html
+    
+    """
     if ips == None:
         ips = [ "127.0.0.1" ]