From 4fd20966f69014d4dc3747ce6b7940adfa669b13 Mon Sep 17 00:00:00 2001 From: Rob Crittenden Date: Fri, 9 Sep 2011 17:07:09 -0400 Subject: 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 --- ipaserver/install/httpinstance.py | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'ipaserver') diff --git a/ipaserver/install/httpinstance.py b/ipaserver/install/httpinstance.py index eae60754..dbb0dd50 100644 --- a/ipaserver/install/httpinstance.py +++ b/ipaserver/install/httpinstance.py @@ -282,6 +282,11 @@ class HTTPInstance(service.Service): logging.debug(error) pass + # Remove the configuration files we create + installutils.remove_file("/etc/httpd/conf.d/ipa-rewrite.conf") + installutils.remove_file("/etc/httpd/conf.d/ipa.conf") + installutils.remove_file("/etc/httpd/conf.d/ipa-pki-proxy.conf") + sebool_state = self.restore_state("httpd_can_network_connect") if not sebool_state is None: try: -- cgit