summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStanislav Laznicka <slaznick@redhat.com>2017-03-01 15:40:10 +0100
committerJan Cholasta <jcholast@redhat.com>2017-03-01 15:38:43 +0000
commita7c8077ce8f72eee26e8f5d4362239313ffdae3d (patch)
treea9520e76ee2025924743bbc08ecd2047d69f5b2e
parent88fd936a761dfce099c4b03529d679256c9860d6 (diff)
downloadfreeipa-a7c8077ce8f72eee26e8f5d4362239313ffdae3d.tar.gz
freeipa-a7c8077ce8f72eee26e8f5d4362239313ffdae3d.tar.xz
freeipa-a7c8077ce8f72eee26e8f5d4362239313ffdae3d.zip
Fix CA-less upgrade
In CA-less mode there's no /etc/pki/pki-tomcat/password.conf so it does not make sense to try to create a password file for an NSS database from it (the NSS database does not exist either). https://fedorahosted.org/freeipa/ticket/5695 Reviewed-By: Jan Cholasta <jcholast@redhat.com>
-rw-r--r--ipaserver/install/server/upgrade.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/ipaserver/install/server/upgrade.py b/ipaserver/install/server/upgrade.py
index d3fd4329a..d7271e595 100644
--- a/ipaserver/install/server/upgrade.py
+++ b/ipaserver/install/server/upgrade.py
@@ -1537,7 +1537,7 @@ def upgrade_configuration():
# create passswd.txt file in PKI_TOMCAT_ALIAS_DIR if it does not exist
# this file will be required on most actions over this NSS DB in FIPS
- if not os.path.exists(os.path.join(
+ if ca.is_configured() and not os.path.exists(os.path.join(
paths.PKI_TOMCAT_ALIAS_DIR, 'pwdfile.txt')):
ca.create_certstore_passwdfile()