Release 0.1.1

Bugfixes, new versioning system, fix up for pypi

pappyproxy/config.py

@@ -4,8 +4,9 @@ import os
 import shutil
 
 PAPPY_DIR = os.path.dirname(os.path.realpath(__file__))
+DATA_DIR = os.path.join(os.path.expanduser('~'), '.pappy')
 
-CERT_DIR = PAPPY_DIR
+CERT_DIR = os.path.join(DATA_DIR, 'certs')
 DATAFILE = 'data.db'
 DEBUG_DIR = None
 DEBUG_TO_FILE = False
@@ -29,12 +30,14 @@ def load_settings(proj_config):
     global DEBUG_VERBOSITY
     global LISTENERS
     global PAPPY_DIR
+    global DATA_DIR
     global SSL_CA_FILE 
     global SSL_PKEY_FILE
 
     # Substitution dictionary
     subs = {}
-    subs['PAPPYDIR'] = PAPPY_DIR
+    #subs['PAPPYDIR'] = PAPPY_DIR
+    subs['DATADIR'] = DATA_DIR
 
     # Data file settings
     if 'data_file' in proj_config:

pappyproxy/console.py

@@ -807,8 +807,7 @@ class ProxyCmd(cmd2.Cmd):
     def do_gencerts(self, line):
         dest_dir = line or pappyproxy.config.CERT_DIR
         message = "This will overwrite any existing certs in %s. Are you sure?" % dest_dir
-        answer = confirm(message, 'n')
-        if not answer or answer[0].lower() != 'y':
+        if not confirm(message, 'n'):
             return False
         print "Generating certs to %s" % dest_dir
         pappyproxy.proxy.generate_ca_certs(dest_dir)

pappyproxy/default_user_config.json

@@ -1,6 +1,6 @@
 {
     "data_file": "./data.db",
-    "cert_dir": "{PAPPYDIR}/certs",
+    "cert_dir": "{DATADIR}/certs",
     "proxy_listeners": [
         {"port": 8000, "interface": "127.0.0.1"}
     ]

pappyproxy/macros.py

@@ -5,7 +5,6 @@ import random
 import re
 
 from pappyproxy import http
-from pappyproxy import templates
 from pappyproxy import config
 from twisted.internet import defer
 from jinja2 import Environment, FileSystemLoader