diff options
| author | Simo Sorce <simo@redhat.com> | 2016-12-22 13:34:34 -0500 |
|---|---|---|
| committer | Jan Cholasta <jcholast@redhat.com> | 2017-02-15 07:13:37 +0100 |
| commit | c2b1b2a36200b50babfda1eca37fb4b51fefa9c6 (patch) | |
| tree | 1cd81a044816481796f3fe0f346ac9b3786325bf /ipaserver/install/dsinstance.py | |
| parent | f648c5631afa5e7954eee9a84fb1222d3bce3bf1 (diff) | |
| download | freeipa-c2b1b2a36200b50babfda1eca37fb4b51fefa9c6.tar.gz freeipa-c2b1b2a36200b50babfda1eca37fb4b51fefa9c6.tar.xz freeipa-c2b1b2a36200b50babfda1eca37fb4b51fefa9c6.zip | |
Always use /etc/ipa/ca.crt as CA cert file
It seem like ALIAS_CACERT_ASC was just a redundant location for the CA
cert file which is always available in /etc/ipa/ca.crt
Just use the canonical CA cert location in /etc/ipa for all cases and
stop creating a separate cacert file.
https://fedorahosted.org/freeipa/ticket/5959
Signed-off-by: Simo Sorce <simo@redhat.com>
Reviewed-By: Jan Cholasta <jcholast@redhat.com>
Diffstat (limited to 'ipaserver/install/dsinstance.py')
| -rw-r--r-- | ipaserver/install/dsinstance.py | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/ipaserver/install/dsinstance.py b/ipaserver/install/dsinstance.py index 31358957b..9172b65f3 100644 --- a/ipaserver/install/dsinstance.py +++ b/ipaserver/install/dsinstance.py @@ -810,10 +810,6 @@ class DsInstance(service.Service): self.nickname, self.principal, dsdb.passwd_fname, 'restart_dirsrv %s' % self.serverid) else: - cadb = certs.CertDB(self.realm, host_name=self.fqdn, subject_base=self.subject_base) - - # FIXME, need to set this nickname in the RA plugin - cadb.export_ca_cert('ipaCert', False) dsdb.create_from_cacert() ca_args = ['/usr/libexec/certmonger/dogtag-submit', '--ee-url', 'https://%s:8443/ca/ee/ca' % self.fqdn, @@ -1241,7 +1237,7 @@ class DsInstance(service.Service): subject_base=self.subject_base, ca_subject=self.ca_subject, ) - db.create_from_cacert(paths.IPA_CA_CRT) + db.create_from_cacert() db.request_service_cert(self.nickname, self.principal, self.fqdn) db.create_pin_file() |