Skip to content

Commit

Permalink
certs: do not implicitly create DS pin.txt
Browse files Browse the repository at this point in the history
Do not implicitly create DS pin.txt in `CertDB.init_from_pkcs12()`, create
it explicitly in `DSInstance.__enable_ssl()`.

This stops the file from being created in /etc/httpd/alias during classic
replica install.

https://pagure.io/freeipa/issue/4639

Reviewed-By: Martin Babinsky <mbabinsk@redhat.com>
  • Loading branch information
Jan Cholasta authored and Martin Babinsky committed Mar 22, 2017
1 parent b662459 commit bbd18cf
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
1 change: 0 additions & 1 deletion ipaserver/install/certs.py
Original file line number Diff line number Diff line change
Expand Up @@ -635,7 +635,6 @@ def init_from_pkcs12(self, pkcs12_fname, pkcs12_passwd,
self.cacert_name = ca_names[-1]
self.trust_root_cert(self.cacert_name, trust_flags)

self.create_pin_file()
self.export_ca_cert(nickname, False)

def publish_ca_cert(self, location):
Expand Down
3 changes: 2 additions & 1 deletion ipaserver/install/dsinstance.py
Original file line number Diff line number Diff line change
Expand Up @@ -838,7 +838,8 @@ def __enable_ssl(self):
certmonger.modify_ca_helper('IPA', prev_helper)

self.dercert = dsdb.get_cert_from_db(self.nickname, pem=False)
dsdb.create_pin_file()

dsdb.create_pin_file()

self.cacert_name = dsdb.cacert_name

Expand Down

0 comments on commit bbd18cf

Please sign in to comment.