|
 |
483b06 |
From 1ab5b1a4cdcab8b913f42488ae642a9f0ef77d92 Mon Sep 17 00:00:00 2001
|
|
|
483b06 |
From: Jan Cholasta <jcholast@redhat.com>
|
|
|
483b06 |
Date: Mon, 5 Jun 2017 12:42:52 +0000
|
|
|
483b06 |
Subject: [PATCH] server upgrade: do not enable PKINIT by default
|
|
|
483b06 |
|
|
|
483b06 |
Enabling PKINIT often fails during server upgrade when requesting the KDC
|
|
|
483b06 |
certificate.
|
|
|
483b06 |
|
|
|
483b06 |
Now that PKINIT can be enabled post-install using ipa-pkinit-manage, avoid
|
|
|
483b06 |
the upgrade failure by not enabling PKINIT by default.
|
|
|
483b06 |
|
|
|
483b06 |
https://pagure.io/freeipa/issue/7000
|
|
|
483b06 |
|
|
|
483b06 |
Reviewed-By: Martin Babinsky <mbabinsk@redhat.com>
|
|
|
483b06 |
---
|
|
|
483b06 |
ipaserver/install/server/upgrade.py | 10 ++--------
|
|
|
483b06 |
1 file changed, 2 insertions(+), 8 deletions(-)
|
|
|
483b06 |
|
|
|
483b06 |
diff --git a/ipaserver/install/server/upgrade.py b/ipaserver/install/server/upgrade.py
|
|
|
483b06 |
index db86353165809c57d1ac27bf762393721231fefd..b1f59d3e29d69bffc11935ec22d4b5f510293355 100644
|
|
|
483b06 |
--- a/ipaserver/install/server/upgrade.py
|
|
|
483b06 |
+++ b/ipaserver/install/server/upgrade.py
|
|
|
483b06 |
@@ -1519,14 +1519,8 @@ def add_default_caacl(ca):
|
|
|
483b06 |
def setup_pkinit(krb):
|
|
|
483b06 |
root_logger.info("[Setup PKINIT]")
|
|
|
483b06 |
|
|
|
483b06 |
- pkinit_is_enabled = krbinstance.is_pkinit_enabled()
|
|
|
483b06 |
- ca_is_enabled = api.Command.ca_is_enabled()['result']
|
|
|
483b06 |
-
|
|
|
483b06 |
- if not pkinit_is_enabled:
|
|
|
483b06 |
- if ca_is_enabled:
|
|
|
483b06 |
- krb.issue_ipa_ca_signed_pkinit_certs()
|
|
|
483b06 |
- else:
|
|
|
483b06 |
- krb.issue_selfsigned_pkinit_certs()
|
|
|
483b06 |
+ if not krbinstance.is_pkinit_enabled():
|
|
|
483b06 |
+ krb.issue_selfsigned_pkinit_certs()
|
|
|
483b06 |
|
|
|
483b06 |
aug = Augeas(flags=Augeas.NO_LOAD | Augeas.NO_MODL_AUTOLOAD,
|
|
|
483b06 |
loadpath=paths.USR_SHARE_IPA_DIR)
|
|
|
483b06 |
--
|
|
|
483b06 |
2.9.4
|
|
|
483b06 |
|