diff options
| author | Rob Crittenden <rcritten@redhat.com> | 2011-09-09 17:07:09 -0400 |
|---|---|---|
| committer | Martin Kosek <mkosek@redhat.com> | 2011-09-13 16:09:15 +0200 |
| commit | 4fd20966f69014d4dc3747ce6b7940adfa669b13 (patch) | |
| tree | 6cb0a821df78b5d159923fc3f074c7bbc73dc167 /ipaserver/install/httpinstance.py | |
| parent | 5ddc027d7f75109224b50777d0c58fa6198c98a6 (diff) | |
| download | freeipa.git-4fd20966f69014d4dc3747ce6b7940adfa669b13.tar.gz freeipa.git-4fd20966f69014d4dc3747ce6b7940adfa669b13.tar.xz freeipa.git-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 'ipaserver/install/httpinstance.py')
| -rw-r--r-- | ipaserver/install/httpinstance.py | 5 |
1 files changed, 5 insertions, 0 deletions
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: |