From bf63cd30a6224f76ceeaacead57af557208fbb93 Mon Sep 17 00:00:00 2001 From: Rob Crittenden Date: Thu, 28 Jan 2010 14:22:50 -0500 Subject: Remove some configuration files we create upon un-installation This is particularly important for Apache since we'd leave the web server handling unconfigured locations. --- install/tools/ipa-server-install | 7 ++++++- ipa-client/ipa-install/ipa-client-install | 6 ++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/install/tools/ipa-server-install b/install/tools/ipa-server-install index 43095a49..ee304597 100755 --- a/install/tools/ipa-server-install +++ b/install/tools/ipa-server-install @@ -397,6 +397,12 @@ def uninstall(ca = False): os.remove(ANSWER_CACHE) except Exception: pass + # ipa-client-install removes /etc/ipa/default.conf + try: + os.remove("/etc/httpd/conf.d/ipa-rewrite.conf") + os.remove("/etc/httpd/conf.d/ipa.conf") + except: + pass return 0 @@ -624,7 +630,6 @@ def main(): dns_forwarders = () # Create the management framework config file and finalize api - fstore.backup_file("/etc/ipa/default.conf") fd = open("/etc/ipa/default.conf", "w") fd.write("[global]\n") fd.write("basedn=" + util.realm_to_suffix(realm_name) + "\n") diff --git a/ipa-client/ipa-install/ipa-client-install b/ipa-client/ipa-install/ipa-client-install index f5eb21ff..f6157b21 100644 --- a/ipa-client/ipa-install/ipa-client-install +++ b/ipa-client/ipa-install/ipa-client-install @@ -140,6 +140,12 @@ def uninstall(options): print "Reboot command failed to exceute. " + str(e) sys.exit(1) + # Remove the IPA configuration file + try: + os.remove("/etc/ipa/default.conf") + except: + pass + def configure_ipa_conf(fstore, cli_basedn, cli_realm, cli_domain, cli_server): ipaconf = ipaclient.ipachangeconf.IPAChangeConf("IPA Installer") ipaconf.setOptionAssignment(" = ") -- cgit