IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

ipa-kra-install: allow to install first KRA on replica

Browse Source 
https://fedorahosted.org/freeipa/ticket/5460

Reviewed-By: Martin Babinsky <mbabinsk@redhat.com>
This commit is contained in:
Martin Basti 2015-11-23 13:43:53 +01:00
parent 17f9ca154b
commit efeb7d54ba
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ipaserver/install/krainstance.py
View File

@ -219,18 +219,13 @@ class KRAInstance(DogtagInstance):
str(DN(('uid', 'pkidbuser'), ('ou', 'people'), ('o', 'ipaca')))) str(DN(('uid', 'pkidbuser'), ('ou', 'people'), ('o', 'ipaca'))))
_p12_tmpfile_handle, p12_tmpfile_name = tempfile.mkstemp(dir=paths.TMP) _p12_tmpfile_handle, p12_tmpfile_name = tempfile.mkstemp(dir=paths.TMP)
if self.clone: if self.clone:
krafile = self.pkcs12_info[0] krafile = self.pkcs12_info[0]
shutil.copy(krafile, p12_tmpfile_name) shutil.copy(krafile, p12_tmpfile_name)
pent = pwd.getpwnam(PKI_USER) pent = pwd.getpwnam(PKI_USER)
os.chown(p12_tmpfile_name, pent.pw_uid, pent.pw_gid) os.chown(p12_tmpfile_name, pent.pw_uid, pent.pw_gid)
# FIXME
# # create admin cert file if it does not exist
# cert = DogtagInstance.get_admin_cert(self)
# with open(paths.ADMIN_CERT_PATH, "w") as admin_path:
# admin_path.write(cert)
# Security domain registration # Security domain registration
config.set("KRA", "pki_security_domain_hostname", self.master_host) config.set("KRA", "pki_security_domain_hostname", self.master_host)
config.set("KRA", "pki_security_domain_https_port", "443") config.set("KRA", "pki_security_domain_https_port", "443")
@ -246,6 +241,11 @@ class KRAInstance(DogtagInstance):
config.set( config.set(
"KRA", "pki_clone_uri", "KRA", "pki_clone_uri",
"https://%s" % ipautil.format_netloc(self.master_host, 443)) "https://%s" % ipautil.format_netloc(self.master_host, 443))
else:
# the admin cert file is needed for the first instance of KRA
cert = DogtagInstance.get_admin_cert(self)
with open(paths.ADMIN_CERT_PATH, "w") as admin_path:
admin_path.write(cert)
# Generate configuration file # Generate configuration file
with open(cfg_file, "wb") as f: with open(cfg_file, "wb") as f: