From eb844fe9e56a30be9462508f1e5330aaa73342b3 Mon Sep 17 00:00:00 2001
From: Stanislav Laznicka <slaznick@redhat.com>
Date: Mon, 31 Oct 2016 16:51:49 +0100
Subject: [PATCH] Fix missing file that fails DL1 replica installation
Replica installation on DL1 would fail to create a httpd instance
due to missing '/etc/httpd/alias/cacert.asc'. Create this file
in the setup_ssl step to avoid the error.
https://fedorahosted.org/freeipa/ticket/6393
Reviewed-By: Jan Cholasta <jcholast@redhat.com>
---
ipaserver/install/httpinstance.py | 25 +++++++++++++++++--------
1 file changed, 17 insertions(+), 8 deletions(-)
diff --git a/ipaserver/install/httpinstance.py b/ipaserver/install/httpinstance.py
index 431671eaf55d4ac63dc01190e254931dac096dec..aeae10902e6597ca1e494240a625caed9f7b7192 100644
--- a/ipaserver/install/httpinstance.py
+++ b/ipaserver/install/httpinstance.py
@@ -343,14 +343,23 @@ class HTTPInstance(service.Service):
self.__set_mod_nss_nickname(nickname)
self.add_cert_to_service()
- elif not self.promote:
- db.create_password_conf()
- self.dercert = db.create_server_cert(self.cert_nickname, self.fqdn,
- ca_db)
- db.track_server_cert(self.cert_nickname, self.principal,
- db.passwd_fname, 'restart_httpd')
- db.create_signing_cert("Signing-Cert", "Object Signing Cert", ca_db)
- self.add_cert_to_service()
+ else:
+ if not self.promote:
+ db.create_password_conf()
+ self.dercert = db.create_server_cert(self.cert_nickname, self.fqdn,
+ ca_db)
+ db.track_server_cert(self.cert_nickname, self.principal,
+ db.passwd_fname, 'restart_httpd')
+ db.create_signing_cert("Signing-Cert", "Object Signing Cert", ca_db)
+ self.add_cert_to_service()
+
+ server_certs = db.find_server_certs()
+ if not server_certs:
+ raise RuntimeError("Could not find a suitable server cert.")
+
+ # We only handle one server cert
+ nickname = server_certs[0][0]
+ db.export_ca_cert(nickname)
# Fix the database permissions
os.chmod(certs.NSS_DIR + "/cert8.db", 0o660)
--
2.7.4