summaryrefslogtreecommitdiffstats
path: root/install/restart_scripts/stop_pkicad
diff options
context:
space:
mode:
authorJan Cholasta <jcholast@redhat.com>2013-10-15 17:47:12 +0000
committerMartin Kosek <mkosek@redhat.com>2014-01-08 09:47:23 +0100
commit911f5e9eb76099f8e5cfcff1232c1b10ad05b45a (patch)
treecdb649813d809697b55e409794b547f45f26d260 /install/restart_scripts/stop_pkicad
parent4a64a1f18bd51c65bf34a13fd7541e1d6b4b75fd (diff)
downloadfreeipa.git-911f5e9eb76099f8e5cfcff1232c1b10ad05b45a.tar.gz
freeipa.git-911f5e9eb76099f8e5cfcff1232c1b10ad05b45a.tar.xz
freeipa.git-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 'install/restart_scripts/stop_pkicad')
-rwxr-xr-x[-rw-r--r--]install/restart_scripts/stop_pkicad16
1 files changed, 8 insertions, 8 deletions
diff --git a/install/restart_scripts/stop_pkicad b/install/restart_scripts/stop_pkicad
index 9c24a99e..c275eaee 100644..100755
--- a/install/restart_scripts/stop_pkicad
+++ b/install/restart_scripts/stop_pkicad
@@ -29,15 +29,15 @@ api.bootstrap(context='restart')
api.finalize()
configured_constants = dogtag.configured_constants(api)
+dogtag_service = ipaservices.knownservices[configured_constants.SERVICE_NAME]
dogtag_instance = configured_constants.PKI_INSTANCE_NAME
-syslog.syslog(syslog.LOG_NOTICE, "certmonger stopping %sd" % dogtag_instance)
-
+syslog.syslog(syslog.LOG_NOTICE, "Stopping %s" % dogtag_service.service_name)
try:
- if configured_constants.DOGTAG_VERSION == 9:
- ipaservices.knownservices.pki_cad.stop(dogtag_instance)
- else:
- ipaservices.knownservices.pki_tomcatd.stop(dogtag_instance)
+ dogtag_service.stop(dogtag_instance)
except Exception, e:
- syslog.syslog(syslog.LOG_ERR, "Cannot stop %sd: %s" %
- (dogtag_instance, str(e)))
+ syslog.syslog(
+ syslog.LOG_ERR, "Cannot stop %s: %s" % (dogtag_service.service_name, e))
+else:
+ syslog.syslog(
+ syslog.LOG_NOTICE, "Stopped %s" % dogtag_service.service_name)