From ad49bda907b3c2ec5b98946a2c4000bb6edaf835 Mon Sep 17 00:00:00 2001 From: Jan Cholasta Date: Fri, 6 Jan 2017 10:47:02 +0100 Subject: [PATCH] dogtaginstance: track server certificate with our renew agent Track Dogtag's server certificate with dogtag-ipa-ca-renew-agent instead of dogtag-ipa-renew-agent. https://fedorahosted.org/freeipa/ticket/5959 Reviewed-By: Stanislav Laznicka Reviewed-By: Alexander Bokovoy --- ipaserver/install/dogtaginstance.py | 2 +- ipaserver/install/server/upgrade.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ipaserver/install/dogtaginstance.py b/ipaserver/install/dogtaginstance.py index c3c470d62..4c02d733b 100644 --- a/ipaserver/install/dogtaginstance.py +++ b/ipaserver/install/dogtaginstance.py @@ -325,7 +325,7 @@ class DogtagInstance(service.Service): pin = self.__get_pin() try: certmonger.dogtag_start_tracking( - ca='dogtag-ipa-renew-agent', + ca='dogtag-ipa-ca-renew-agent', nickname=self.server_cert_name, pin=pin, pinfile=None, diff --git a/ipaserver/install/server/upgrade.py b/ipaserver/install/server/upgrade.py index 5d8e59657..10f2e3d19 100644 --- a/ipaserver/install/server/upgrade.py +++ b/ipaserver/install/server/upgrade.py @@ -917,7 +917,7 @@ def certificate_renewal_update(ca, ds, http): dirsrv_dir = dsinstance.config_dirname(serverid) # bump version when requests is changed - version = 5 + version = 6 requests = ( ( paths.PKI_TOMCAT_ALIAS_DIR, @@ -962,7 +962,7 @@ def certificate_renewal_update(ca, ds, http): ( paths.PKI_TOMCAT_ALIAS_DIR, 'Server-Cert cert-pki-ca', - 'dogtag-ipa-renew-agent', + 'dogtag-ipa-ca-renew-agent', template % 'stop_pkicad', '%s "Server-Cert cert-pki-ca"' % (template % 'renew_ca_cert'), None,