diff options
| author | Aldo Cortesi <aldo@corte.si> | 2014-03-10 17:24:05 +1300 |
|---|---|---|
| committer | Aldo Cortesi <aldo@corte.si> | 2014-03-10 17:24:05 +1300 |
| commit | 554deee222fa4d2100b93becc4dd06f7342e3694 (patch) | |
| tree | 8acbf873630193e7bc34185f3a243e1aab408869 /libmproxy/app.py | |
| parent | 2e50b1073538730fc5bd6369e2cb8176874f2f03 (diff) | |
| parent | dd3aedca01a61f2fe33d009320f7fe656f1fc671 (diff) | |
| download | mitmproxy-554deee222fa4d2100b93becc4dd06f7342e3694.tar.gz mitmproxy-554deee222fa4d2100b93becc4dd06f7342e3694.tar.bz2 mitmproxy-554deee222fa4d2100b93becc4dd06f7342e3694.zip | |
Merge pull request #233 from mitmproxy/untangle_circular_dependencies
Untangle circular dependencies
Diffstat (limited to 'libmproxy/app.py')
| -rw-r--r-- | libmproxy/app.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libmproxy/app.py b/libmproxy/app.py index 24187704..69721031 100644 --- a/libmproxy/app.py +++ b/libmproxy/app.py @@ -17,12 +17,12 @@ def index(): @mapp.route("/cert/pem") def certs_pem(): - p = os.path.join(master().server.config.confdir, proxy.CONF_BASENAME + "-ca-cert.pem") + p = os.path.join(master().server.config.confdir, proxy.config.CONF_BASENAME + "-ca-cert.pem") return flask.Response(open(p, "rb").read(), mimetype='application/x-x509-ca-cert') @mapp.route("/cert/p12") def certs_p12(): - p = os.path.join(master().server.config.confdir, proxy.CONF_BASENAME + "-ca-cert.p12") + p = os.path.join(master().server.config.confdir, proxy.config.CONF_BASENAME + "-ca-cert.p12") return flask.Response(open(p, "rb").read(), mimetype='application/x-pkcs12') |