diff options
| author | Jan Cholasta <jcholast@redhat.com> | 2014-10-13 14:10:13 +0200 |
|---|---|---|
| committer | Martin Kosek <mkosek@redhat.com> | 2014-10-17 12:53:11 +0200 |
| commit | cbb4caa3500f528f47a32767cbd11ac176e4fdbe (patch) | |
| tree | 67c137d925d3372900224f6bc491ce6e5a89b2fc /install/tools/ipa-upgradeconfig | |
| parent | 588e7bc899c23af2633a3820a34b7c4545c0b27a (diff) | |
| download | freeipa-cbb4caa3500f528f47a32767cbd11ac176e4fdbe.tar.gz freeipa-cbb4caa3500f528f47a32767cbd11ac176e4fdbe.tar.xz freeipa-cbb4caa3500f528f47a32767cbd11ac176e4fdbe.zip | |
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 <dkupka@redhat.com>
Diffstat (limited to 'install/tools/ipa-upgradeconfig')
| -rw-r--r-- | install/tools/ipa-upgradeconfig | 6 |
1 files changed, 5 insertions, 1 deletions
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, |