summaryrefslogtreecommitdiffstats
path: root/install/tools
diff options
context:
space:
mode:
authorJan Cholasta <jcholast@redhat.com>2014-10-07 16:46:15 +0200
committerMartin Kosek <mkosek@redhat.com>2014-10-10 08:48:25 +0200
commit92a08266afb565bd50a8f059ef40f3d727fc2466 (patch)
tree64d7be7f424e66c44364a397ae5a958ed6cc1ec6 /install/tools
parentcf956fa998d6a849aba928a361f6c5d568d65189 (diff)
downloadfreeipa-92a08266afb565bd50a8f059ef40f3d727fc2466.tar.gz
freeipa-92a08266afb565bd50a8f059ef40f3d727fc2466.tar.xz
freeipa-92a08266afb565bd50a8f059ef40f3d727fc2466.zip
Fix certmonger configuration in installer code
https://fedorahosted.org/freeipa/ticket/4619 Reviewed-By: David Kupka <dkupka@redhat.com>
Diffstat (limited to 'install/tools')
-rwxr-xr-xinstall/tools/ipa-server-install5
-rw-r--r--install/tools/ipa-upgradeconfig2
2 files changed, 3 insertions, 4 deletions
diff --git a/install/tools/ipa-server-install b/install/tools/ipa-server-install
index 89d73304f..f394f1e3c 100755
--- a/install/tools/ipa-server-install
+++ b/install/tools/ipa-server-install
@@ -561,14 +561,13 @@ def uninstall():
kra_instance = krainstance.KRAInstance(
api.env.realm, dogtag_constants=dogtag_constants)
- kra_instance.stop_tracking_certificates(dogtag_constants)
+ kra_instance.stop_tracking_certificates()
if kra_instance.is_installed():
kra_instance.uninstall()
ca_instance = cainstance.CAInstance(
api.env.realm, certs.NSS_DIR, dogtag_constants=dogtag_constants)
- ca_instance.stop_tracking_certificates(dogtag_constants)
- ca_instance.stop_tracking_agent_certificate(dogtag_constants)
+ ca_instance.stop_tracking_certificates()
if ca_instance.is_configured():
ca_instance.uninstall()
diff --git a/install/tools/ipa-upgradeconfig b/install/tools/ipa-upgradeconfig
index 3914eb590..339dcb9ec 100644
--- a/install/tools/ipa-upgradeconfig
+++ b/install/tools/ipa-upgradeconfig
@@ -727,7 +727,7 @@ def certificate_renewal_update(ca):
# Ok, now we need to stop tracking, then we can start tracking them
# again with new configuration:
- ca.stop_tracking_certificates(dogtag_constants)
+ ca.stop_tracking_certificates()
if not sysupgrade.get_upgrade_state('dogtag',
'certificate_renewal_update_1'):