diff options
author | Jan Cholasta <jcholast@redhat.com> | 2013-10-15 17:47:12 +0000 |
---|---|---|
committer | Martin Kosek <mkosek@redhat.com> | 2014-01-08 09:47:23 +0100 |
commit | 911f5e9eb76099f8e5cfcff1232c1b10ad05b45a (patch) | |
tree | cdb649813d809697b55e409794b547f45f26d260 /ipaserver | |
parent | 4a64a1f18bd51c65bf34a13fd7541e1d6b4b75fd (diff) | |
download | freeipa-911f5e9eb76099f8e5cfcff1232c1b10ad05b45a.tar.gz freeipa-911f5e9eb76099f8e5cfcff1232c1b10ad05b45a.tar.xz freeipa-911f5e9eb76099f8e5cfcff1232c1b10ad05b45a.zip |
PKI service restart after CA renewal failed
Fix both the service restart procedure and registration of old
pki-cad well known service name.
This patch was adapted from original patch of Jan Cholasta 178 to
fix ticket 4092.
https://fedorahosted.org/freeipa/ticket/4092
Diffstat (limited to 'ipaserver')
-rw-r--r-- | ipaserver/install/cainstance.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ipaserver/install/cainstance.py b/ipaserver/install/cainstance.py index ac5c81de..52c91b68 100644 --- a/ipaserver/install/cainstance.py +++ b/ipaserver/install/cainstance.py @@ -1283,7 +1283,7 @@ class CAInstance(service.Service): """ caconfig = dogtag.install_constants.CS_CFG_PATH - with stopped_service('pki_tomcatd', + with stopped_service(self.dogtag_constants.SERVICE_NAME, instance_name=self.dogtag_constants.PKI_INSTANCE_NAME): # Enable file publishing, disable LDAP @@ -1723,7 +1723,7 @@ def update_cert_config(nickname, cert, dogtag_constants=None): 'subsystemCert cert-pki-ca': 'ca.subsystem.cert', 'Server-Cert cert-pki-ca': 'ca.sslserver.cert'} - with stopped_service('pki_tomcatd', + with stopped_service(dogtag_constants.SERVICE_NAME, instance_name=dogtag_constants.PKI_INSTANCE_NAME): installutils.set_directive(dogtag.configured_constants().CS_CFG_PATH, |