summaryrefslogtreecommitdiffstats
path: root/install/tools/ipa-server-install
diff options
context:
space:
mode:
authorRob Crittenden <rcritten@redhat.com>2011-09-09 17:07:09 -0400
committerMartin Kosek <mkosek@redhat.com>2011-09-13 16:09:15 +0200
commit4fd20966f69014d4dc3747ce6b7940adfa669b13 (patch)
tree6cb0a821df78b5d159923fc3f074c7bbc73dc167 /install/tools/ipa-server-install
parent5ddc027d7f75109224b50777d0c58fa6198c98a6 (diff)
downloadfreeipa-4fd20966f69014d4dc3747ce6b7940adfa669b13.tar.gz
freeipa-4fd20966f69014d4dc3747ce6b7940adfa669b13.tar.xz
freeipa-4fd20966f69014d4dc3747ce6b7940adfa669b13.zip
Improved handling for ipa-pki-proxy.conf
- Remove ipa-pki-proxy.conf when IPA is uninstalled - Move file removal to httpinstance.py and use remove_file() - Add a version stanza - Create the file if it doesn't exist on upgraded installs https://fedorahosted.org/freeipa/ticket/1771
Diffstat (limited to 'install/tools/ipa-server-install')
-rwxr-xr-xinstall/tools/ipa-server-install6
1 files changed, 1 insertions, 5 deletions
diff --git a/install/tools/ipa-server-install b/install/tools/ipa-server-install
index e9f2c75fb..504d6af50 100755
--- a/install/tools/ipa-server-install
+++ b/install/tools/ipa-server-install
@@ -491,12 +491,8 @@ def uninstall():
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
sstore._load()
group_exists = sstore.restore_state("install", "group_exists")