summaryrefslogtreecommitdiffstats
path: root/ipapython
diff options
context:
space:
mode:
authorMartin Kosek <mkosek@redhat.com>2013-10-09 22:33:20 +0200
committerMartin Kosek <mkosek@redhat.com>2013-10-11 09:50:44 +0200
commitdbfa7157ccf0c467e33f742176fc82a789c72e2e (patch)
tree29001184607e0577859ac3868ac692b30e27c139 /ipapython
parentcb9331ebfcc33ad676b6d188156a6d56b2996a18 (diff)
downloadfreeipa-dbfa7157ccf0c467e33f742176fc82a789c72e2e.tar.gz
freeipa-dbfa7157ccf0c467e33f742176fc82a789c72e2e.tar.xz
freeipa-dbfa7157ccf0c467e33f742176fc82a789c72e2e.zip
PKI installation on replica failing due to missing proxy conf
Proxy configuration was not detected correctly. Both ipa-pki-proxy.conf and ipa.conf need to be in place and httpd restarted to be able to check it's status. https://fedorahosted.org/freeipa/ticket/3964
Diffstat (limited to 'ipapython')
-rw-r--r--ipapython/platform/fedora16/service.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/ipapython/platform/fedora16/service.py b/ipapython/platform/fedora16/service.py
index 297e68332..36e7a31c4 100644
--- a/ipapython/platform/fedora16/service.py
+++ b/ipapython/platform/fedora16/service.py
@@ -143,7 +143,8 @@ class Fedora16CAService(Fedora16Service):
# Unfortunately, knownservices.httpd.is_installed() can return
# false positives, so check for existence of our configuration file.
# TODO: Use a cleaner solution
- if not os.path.exists('/etc/httpd/conf.d/ipa.conf'):
+ if not (os.path.exists('/etc/httpd/conf.d/ipa.conf') and
+ os.path.exists('/etc/httpd/conf.d/ipa-pki-proxy.conf')):
root_logger.debug(
'The httpd proxy is not installed, skipping wait for CA')
return