summaryrefslogtreecommitdiffstats
path: root/ipapython
diff options
context:
space:
mode:
authorStanislav Laznicka <slaznick@redhat.com>2017-01-13 09:08:42 +0100
committerJan Cholasta <jcholast@redhat.com>2017-03-01 09:43:41 +0000
commit5ab85b365ae886558b1f077b0d039a0d24bebfa7 (patch)
tree270e8328af5b0d7934e55b81928a2417daa95985 /ipapython
parent24b134c633390343ba76e4091fa612650976280a (diff)
downloadfreeipa-5ab85b365ae886558b1f077b0d039a0d24bebfa7.tar.gz
freeipa-5ab85b365ae886558b1f077b0d039a0d24bebfa7.tar.xz
freeipa-5ab85b365ae886558b1f077b0d039a0d24bebfa7.zip
Moving ipaCert from HTTPD_ALIAS_DIR
The "ipaCert" nicknamed certificate is not required to be in /var/lib/ipa/radb NSSDB anymore as we were keeping a copy of this file in a separate file anyway. Remove it from there and track only the file. Remove the IPA_RADB_DIR as well as it is not required anymore. https://fedorahosted.org/freeipa/ticket/5695 https://fedorahosted.org/freeipa/ticket/6680 Reviewed-By: Jan Cholasta <jcholast@redhat.com>
Diffstat (limited to 'ipapython')
-rw-r--r--ipapython/dogtag.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/ipapython/dogtag.py b/ipapython/dogtag.py
index 4aeb897fd..ff7dc4464 100644
--- a/ipapython/dogtag.py
+++ b/ipapython/dogtag.py
@@ -131,8 +131,9 @@ def ca_status(ca_host=None):
return _parse_ca_status(body)
-def https_request(host, port, url, cafile, client_certfile,
- method='POST', headers=None, body=None, **kw):
+def https_request(
+ host, port, url, cafile, client_certfile, client_keyfile,
+ method='POST', headers=None, body=None, **kw):
"""
:param method: HTTP request method (defalut: 'POST')
:param url: The path (not complete URL!) to post to.
@@ -149,6 +150,7 @@ def https_request(host, port, url, cafile, client_certfile,
host, port,
cafile=cafile,
client_certfile=client_certfile,
+ client_keyfile=client_keyfile,
tls_version_min=api.env.tls_version_min,
tls_version_max=api.env.tls_version_max)