From 3c86b0ef3e684d45301ae2c2452932ea4f279f08 Mon Sep 17 00:00:00 2001 From: Martin Basti Date: Wed, 13 May 2015 10:53:59 +0200 Subject: [PATCH] Dont use the proxy to check CA status Checking status of the CA via proxy cause issues when httpd instance is down. To check status of CA we do not need proxy. https://fedorahosted.org/freeipa/ticket/4994 Reviewed-By: Jan Cholasta --- ipaplatform/redhat/services.py | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/ipaplatform/redhat/services.py b/ipaplatform/redhat/services.py index c9994e409..d6fa080ad 100644 --- a/ipaplatform/redhat/services.py +++ b/ipaplatform/redhat/services.py @@ -171,16 +171,6 @@ class RedHatSSHService(RedHatService): class RedHatCAService(RedHatService): def wait_until_running(self): - # We must not wait for the httpd proxy if httpd is not set up yet. - # Unfortunately, knownservices.httpd.is_installed() can return - # false positives, so check for existence of our configuration file. - # TODO: Use a cleaner solution - use_proxy = True - if not (os.path.exists('/etc/httpd/conf.d/ipa.conf') and - os.path.exists(paths.HTTPD_IPA_PKI_PROXY_CONF)): - root_logger.debug( - 'The httpd proxy is not installed, wait on local port') - use_proxy = False root_logger.debug('Waiting until the CA is running') timeout = float(api.env.startup_timeout) op_timeout = time.time() + timeout @@ -192,8 +182,6 @@ class RedHatCAService(RedHatService): # status = dogtag.ca_status(use_proxy=use_proxy) # port = 8443 - if use_proxy: - port = 443 url = "https://%(host_port)s%(path)s" % { "host_port": ipautil.format_netloc(api.env.ca_host, port),