diff options
| author | Marcelo Glezer <mg@tekii.com.ar> | 2014-12-11 14:54:14 -0300 |
|---|---|---|
| committer | Marcelo Glezer <mg@tekii.com.ar> | 2014-12-11 14:54:14 -0300 |
| commit | 4952643a0d76eb1e9bd51cbbe95c565ae48b97a2 (patch) | |
| tree | f43fc647bdfabb522bdef32e21ea4a36404cc311 /libmproxy/onboarding/app.py | |
| parent | 83b1d4e0e0490e5be05943da459c925a3ee3ff14 (diff) | |
| parent | ffb95a1db742d71d7671f9e9c6db552774bb0ead (diff) | |
| download | mitmproxy-4952643a0d76eb1e9bd51cbbe95c565ae48b97a2.tar.gz mitmproxy-4952643a0d76eb1e9bd51cbbe95c565ae48b97a2.tar.bz2 mitmproxy-4952643a0d76eb1e9bd51cbbe95c565ae48b97a2.zip | |
Merge remote-tracking branch 'base/master'
Diffstat (limited to 'libmproxy/onboarding/app.py')
| -rw-r--r-- | libmproxy/onboarding/app.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libmproxy/onboarding/app.py b/libmproxy/onboarding/app.py index 9b5db38a..4023fae2 100644 --- a/libmproxy/onboarding/app.py +++ b/libmproxy/onboarding/app.py @@ -18,12 +18,12 @@ def index(): @mapp.route("/cert/pem") def certs_pem(): - p = os.path.join(master().server.config.confdir, config.CONF_BASENAME + "-ca-cert.pem") + p = os.path.join(master().server.config.cadir, 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, config.CONF_BASENAME + "-ca-cert.p12") + p = os.path.join(master().server.config.cadir, config.CONF_BASENAME + "-ca-cert.p12") return flask.Response(open(p, "rb").read(), mimetype='application/x-pkcs12') |