diff options
Diffstat (limited to 'ipaserver/install/drminstance.py')
| -rw-r--r-- | ipaserver/install/drminstance.py | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/ipaserver/install/drminstance.py b/ipaserver/install/drminstance.py index c4edd2cd4..a251e39a3 100644 --- a/ipaserver/install/drminstance.py +++ b/ipaserver/install/drminstance.py @@ -111,18 +111,6 @@ class DRMInstance(DogtagInstance): self.start_creation(runtime=210) - def start_instance(self): - DogtagInstance.start_instance(self) - - def stop_instance(self): - DogtagInstance.stop_instance(self) - - def restart_instance(self): - DogtagInstance.restart_instance(self) - - def http_proxy(self): - DogtagInstance.http_proxy(self) - def __spawn_instance(self): """ Create and configure a new DRM instance using pkispawn. @@ -172,8 +160,9 @@ class DRMInstance(DogtagInstance): str(DN(('cn', 'ipa-ca-agent'), self.subject_base))) config.set("KRA", "pki_import_admin_cert", "True") config.set("KRA", "pki_admin_cert_file", - "/root/.dogtag/pki-tomcat/ca_admin.cert") - config.set("KRA", "pki_client_admin_cert_p12", "/root/ca-agent.p12") + DogtagInstance.ADMIN_CERT_PATH) + config.set("KRA", "pki_client_admin_cert_p12", + DogtagInstance.AGENT_P12_PATH) # Directory server config.set("KRA", "pki_ds_ldap_port", str(self.ds_port)) @@ -222,6 +211,11 @@ class DRMInstance(DogtagInstance): pent = pwd.getpwnam(PKI_USER) os.chown("/tmp/drm.p12", pent.pw_uid, pent.pw_gid) + # create admin cert file if it does not exist + cert = DogtagInstance.get_admin_cert(self) + with open(DogtagInstance.ADMIN_CERT_PATH, "w") as admin_path: + admin_path.write(cert) + # Security domain registration config.set("KRA", "pki_security_domain_hostname", self.master_host) config.set("KRA", "pki_security_domain_https_port", "443") |