From e4b62d05294c6d00fddd1ad574085ddba1b887ee Mon Sep 17 00:00:00 2001 From: Rob Crittenden Date: Wed, 24 Aug 2011 11:28:20 -0400 Subject: Remove 389-ds upgrade state during uninstall When we perform an upgrade 389-ds is set to listen only on its ldapi port. Theoretically it should be restored to the previous state regardless of whether the upgrades were successful or not. To be sure that a subsequent re-install will be successful go ahead and remove the state for these options. Think of it as wearing a belt and suspenders. Otherwise a re-install could return an error message that IPA is already configured. https://fedorahosted.org/freeipa/ticket/1667 --- ipaserver/install/dsinstance.py | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'ipaserver') diff --git a/ipaserver/install/dsinstance.py b/ipaserver/install/dsinstance.py index 008aee3e..7243a61d 100644 --- a/ipaserver/install/dsinstance.py +++ b/ipaserver/install/dsinstance.py @@ -683,6 +683,12 @@ class DsInstance(service.Service): except ipautil.CalledProcessError, e: logging.critical("failed to delete user %s" % e) + # Make sure some upgrade-related state is removed. This could cause + # re-installation problems. + self.restore_state('nsslapd-port') + self.restore_state('nsslapd-security') + self.restore_state('nsslapd-ldapiautobind') + if self.restore_state("running"): self.start() -- cgit