diff options
| -rwxr-xr-x | install/tools/ipa-server-install | 7 | ||||
| -rw-r--r-- | ipa-client/ipa-install/ipa-client-install | 6 |
2 files changed, 12 insertions, 1 deletions
diff --git a/install/tools/ipa-server-install b/install/tools/ipa-server-install index 43095a499..ee3045974 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 f5eb21ff5..f6157b210 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(" = ") |