From cbb4caa3500f528f47a32767cbd11ac176e4fdbe Mon Sep 17 00:00:00 2001 From: Jan Cholasta Date: Mon, 13 Oct 2014 14:10:13 +0200 Subject: [PATCH] Do not create ipa-pki-proxy.conf if CA is not configured in ipa-upgradeconfig This fixes upgrade from CA-less to CA-full after IPA upgrade. https://fedorahosted.org/freeipa/ticket/4621 Reviewed-By: David Kupka --- install/tools/ipa-upgradeconfig | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/install/tools/ipa-upgradeconfig b/install/tools/ipa-upgradeconfig index a1f085be4..9844a5876 100644 --- a/install/tools/ipa-upgradeconfig +++ b/install/tools/ipa-upgradeconfig @@ -1221,7 +1221,11 @@ def main(): upgrade(sub_dict, paths.HTTPD_IPA_CONF, ipautil.SHARE_DIR + "ipa.conf") upgrade(sub_dict, paths.HTTPD_IPA_REWRITE_CONF, ipautil.SHARE_DIR + "ipa-rewrite.conf") - upgrade(sub_dict, paths.HTTPD_IPA_PKI_PROXY_CONF, ipautil.SHARE_DIR + "ipa-pki-proxy.conf", add=True) + if ca.is_configured(): + upgrade(sub_dict, paths.HTTPD_IPA_PKI_PROXY_CONF, ipautil.SHARE_DIR + "ipa-pki-proxy.conf", add=True) + else: + if ipautil.file_exists(paths.HTTPD_IPA_PKI_PROXY_CONF): + os.remove(paths.HTTPD_IPA_PKI_PROXY_CONF) if subject_base: upgrade( sub_dict,