summaryrefslogtreecommitdiffstats
path: root/ipaserver/install/httpinstance.py
diff options
context:
space:
mode:
authorChristian Heimes <cheimes@redhat.com>2015-06-29 10:45:15 +0200
committerPetr Vobornik <pvoborni@redhat.com>2015-06-29 17:24:03 +0200
commit2842a83568301c85d340801daae42078333ce63d (patch)
tree9ed684190e74334ebc9e854284b808f9f9350c88 /ipaserver/install/httpinstance.py
parent5e92c981b0e433ee28b953d222a1b531b525ff1c (diff)
downloadfreeipa-2842a83568301c85d340801daae42078333ce63d.tar.gz
freeipa-2842a83568301c85d340801daae42078333ce63d.tar.xz
freeipa-2842a83568301c85d340801daae42078333ce63d.zip
Fix removal of ipa-kdc-proxy.conf symlink
installutils.remove_file() ignored broken symlinks. Now it uses os.path.lexists() to detect and also remove dangling symlinks. Reviewed-By: Fraser Tweedale <ftweedal@redhat.com>
Diffstat (limited to 'ipaserver/install/httpinstance.py')
-rw-r--r--ipaserver/install/httpinstance.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/ipaserver/install/httpinstance.py b/ipaserver/install/httpinstance.py
index 107c20d7f..f5f2a86fc 100644
--- a/ipaserver/install/httpinstance.py
+++ b/ipaserver/install/httpinstance.py
@@ -481,8 +481,8 @@ class HTTPInstance(service.Service):
installutils.remove_file(paths.HTTPD_IPA_REWRITE_CONF)
installutils.remove_file(paths.HTTPD_IPA_CONF)
installutils.remove_file(paths.HTTPD_IPA_PKI_PROXY_CONF)
- installutils.remove_file(paths.HTTPD_IPA_KDCPROXY_CONF)
installutils.remove_file(paths.HTTPD_IPA_KDCPROXY_CONF_SYMLINK)
+ installutils.remove_file(paths.HTTPD_IPA_KDCPROXY_CONF)
# Restore SELinux boolean states
boolean_states = {name: self.restore_state(name)