From 81f8c5f0db8ccafb8c51978d92411f7869b3f536 Mon Sep 17 00:00:00 2001 From: Rob Crittenden Date: Wed, 21 Oct 2009 11:14:28 -0400 Subject: [PATCH] Auto-detect whether dogtag needs to be uninstalled --- install/tools/ipa-server-install | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/install/tools/ipa-server-install b/install/tools/ipa-server-install index 094654dbf..d031638ef 100755 --- a/install/tools/ipa-server-install +++ b/install/tools/ipa-server-install @@ -410,12 +410,15 @@ def main(): global fstore fstore = sysrestore.FileStore('/var/lib/ipa/sysrestore') - if options.ca: - ca_type = 'dogtag' + if options.uninstall: + api.bootstrap(in_server=True) else: - ca_type = 'selfsign' + if options.ca: + ca_type = 'dogtag' + else: + ca_type = 'selfsign' - api.bootstrap(in_server=True, ra_plugin=ca_type) + api.bootstrap(in_server=True, ra_plugin=ca_type) api.finalize() if options.uninstall: @@ -426,7 +429,7 @@ def main(): print "Aborting uninstall operation." sys.exit(1) - return uninstall(options.ca) + return uninstall(not certs.ipa_self_signed()) print "==============================================================================" print "This program will setup the FreeIPA Server."