From a4c0d1619d02cfc4150863acb5f02803c88ff4c1 Mon Sep 17 00:00:00 2001
From: Nick Daly <Nick.M.Daly@gmail.com>
Date: Sun, 8 Apr 2012 21:01:18 -0500
Subject: [PATCH] Updated documentation; require start.sh.

---
 ugly_hacks/santiago/README.rst         |  9 +++++++--
 ugly_hacks/santiago/simple_santiago.py | 10 +++-------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/ugly_hacks/santiago/README.rst b/ugly_hacks/santiago/README.rst
index cc6470c3c..b8554db20 100644
--- a/ugly_hacks/santiago/README.rst
+++ b/ugly_hacks/santiago/README.rst
@@ -487,12 +487,12 @@ First, you'll need to create a certificate to serve Santiago over HTTPS::
     # chgrp 1000 santiago.crt
     # chmod g+r santiago.crt
 
-Next, you'll need to open up "start.py" and update the system path to locate the
+Next, you'll need to open up ``start.sh`` and update the system path to locate the
 "gnupg_" and "cfg" modules.
 
 .. _gnupg: https://code.google.com/p/python-gnupg/
 
-Finally, start the Santiago process in a console with ``start.py``.  Test it out
+Finally, start the Santiago process in a console with ``start.sh``.  Test it out
 by navigating to:
 
     https://localhost:8080/query?host=b&service=santiago
@@ -518,6 +518,11 @@ Tasks
 
 - |TODO| Move SimpleSantiago onto Santiago, merge documentation.
 
+- |TODO| Properly integrate the WOT into Santiago so that trust can be used,
+  even if services aren't available.  This will allow us to use a box-specific
+  key for Santiago serving, as long as the box's owner signs and publishes that
+  box's key.  Then, we can very effectively use the public WOT.
+
 .. |TODO| unicode:: U+2610
 .. |DONE| unicode:: U+2611
 
diff --git a/ugly_hacks/santiago/simple_santiago.py b/ugly_hacks/santiago/simple_santiago.py
index b65eeadce..0b7f5478f 100644
--- a/ugly_hacks/santiago/simple_santiago.py
+++ b/ugly_hacks/santiago/simple_santiago.py
@@ -34,20 +34,16 @@ We also don't:
 :TODO: Create startup script that adds all necessary things to the PYTHONPATH.
 :FIXME: allow multiple listeners and senders per protocol (with different
     proxies)
+:TODO: move to santiago.py, merge the documentation.
 
 """
+
+import cfg
 from collections import defaultdict as DefaultDict
 import gnupg
 import logging
 import sys
 
-try:
-    import cfg
-except ImportError:
-    # try a little harder to import cfg.  Bomb out if we still fail.
-    sys.path.append("../..")
-    import cfg
-
 
 def load_data(server, item):
     """Return evaluated file contents.