From 911f5e9eb76099f8e5cfcff1232c1b10ad05b45a Mon Sep 17 00:00:00 2001 From: Jan Cholasta Date: Tue, 15 Oct 2013 17:47:12 +0000 Subject: 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 --- ipapython/dogtag.py | 4 ++++ ipapython/platform/base/__init__.py | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'ipapython') diff --git a/ipapython/dogtag.py b/ipapython/dogtag.py index ea769b027..f829b9340 100644 --- a/ipapython/dogtag.py +++ b/ipapython/dogtag.py @@ -62,6 +62,8 @@ class Dogtag10Constants(object): SERVICE_PROFILE_DIR = '%s/ca/profiles/ca' % PKI_ROOT ALIAS_DIR = '/etc/pki/pki-tomcat/alias' + SERVICE_NAME = 'pki_tomcatd' + RACERT_LINE_SEP = '\n' IPA_SERVICE_PROFILE = '%s/caIPAserviceCert.cfg' % SERVICE_PROFILE_DIR @@ -92,6 +94,8 @@ class Dogtag9Constants(object): SERVICE_PROFILE_DIR = '%s/profiles/ca' % PKI_ROOT ALIAS_DIR = '%s/alias' % PKI_ROOT + SERVICE_NAME = 'pki-cad' + RACERT_LINE_SEP = '\r\n' ADMIN_SECURE_PORT = 9445 diff --git a/ipapython/platform/base/__init__.py b/ipapython/platform/base/__init__.py index 48b89cfcb..c1b076b2c 100644 --- a/ipapython/platform/base/__init__.py +++ b/ipapython/platform/base/__init__.py @@ -27,7 +27,7 @@ import os wellknownservices = ['certmonger', 'dirsrv', 'httpd', 'ipa', 'krb5kdc', 'messagebus', 'nslcd', 'nscd', 'ntpd', 'portmap', 'rpcbind', 'kadmin', 'sshd', 'autofs', 'rpcgssd', - 'rpcidmapd', 'pki_tomcatd', 'pki-cad', 'chronyd'] + 'rpcidmapd', 'pki_tomcatd', 'pki_cad', 'chronyd'] # System may support more time&date services. FreeIPA supports ntpd only, other # services will be disabled during IPA installation -- cgit