summaryrefslogtreecommitdiffstats
path: root/ipaserver/install
diff options
context:
space:
mode:
authorJan Cholasta <jcholast@redhat.com>2017-01-06 10:47:02 +0100
committerMartin Basti <mbasti@redhat.com>2017-01-16 14:37:25 +0100
commitad49bda907b3c2ec5b98946a2c4000bb6edaf835 (patch)
treeeff492860b175171c1c425f2455d503073c8dbf2 /ipaserver/install
parentd5af11f65cc2a2d6860579a63a173b67cb12bcf3 (diff)
downloadfreeipa-ad49bda907b3c2ec5b98946a2c4000bb6edaf835.tar.gz
freeipa-ad49bda907b3c2ec5b98946a2c4000bb6edaf835.tar.xz
freeipa-ad49bda907b3c2ec5b98946a2c4000bb6edaf835.zip
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 <slaznick@redhat.com> Reviewed-By: Alexander Bokovoy <abokovoy@redhat.com>
Diffstat (limited to 'ipaserver/install')
-rw-r--r--ipaserver/install/dogtaginstance.py2
-rw-r--r--ipaserver/install/server/upgrade.py4
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,