From ae35587582f0e4ae1e9fac3270d2f6942f4f7a31 Mon Sep 17 00:00:00 2001 From: Alexander Bokovoy Date: Tue, 20 Mar 2018 09:35:51 +0200 Subject: [PATCH 2/2] Update template directory with new variables when upgrading ipa.conf.template With e6c707b168067ebb3705c21efc377acd29b23fff we changed httpd configuration to use abstracted out variables in the template. However, during upgrade we haven't resolved these variables so an upgrade from pre-e6c707b168067ebb3705c21efc377acd29b23fff install will fail. Add all missing variables to the upgrade code. Fixes https://pagure.io/freeipa/issue/7454 Signed-off-by: Alexander Bokovoy --- ipaserver/install/server/upgrade.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ipaserver/install/server/upgrade.py b/ipaserver/install/server/upgrade.py index a38f4115c..5654cc32d 100644 --- a/ipaserver/install/server/upgrade.py +++ b/ipaserver/install/server/upgrade.py @@ -1617,7 +1617,12 @@ def upgrade_configuration(): AUTOREDIR='' if auto_redirect else '#', CRL_PUBLISH_PATH=paths.PKI_CA_PUBLISH_DIR, DOGTAG_PORT=8009, - CLONE='#' + CLONE='#', + WSGI_PREFIX_DIR=paths.WSGI_PREFIX_DIR, + GSSAPI_SESSION_KEY=paths.GSSAPI_SESSION_KEY, + FONTS_DIR=paths.FONTS_DIR, + IPA_CCACHES=paths.IPA_CCACHES, + IPA_CUSTODIA_SOCKET=paths.IPA_CUSTODIA_SOCKET ) subject_base = find_subject_base() -- 2.14.3