IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2026-08-14 06:54:55 -05:00
Code Issues Packages Projects Releases Wiki Activity

Load the CA cert into server NSS databases

Browse Source 
The CA cert was not loaded, so if it was missing from the PKCS#12 file,
installation would fail.
Pass the cert filename to the server installers and include it in
the NSS DB.

Part of the work for: https://fedorahosted.org/freeipa/ticket/3363
This commit is contained in:
Petr Viktorin
2013-04-02 15:28:50 +02:00
committed by Martin Kosek
parent 03a2c66eda
commit 1bc892c02d
6 changed files with 32 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install/tools/ipa-replica-install
+5 -2
View File
@@ -164,7 +164,7 @@ def install_replica_ds(config):
ds.create_replica(config.realm_name,
config.master_host_name, config.host_name,
config.domain_name, config.dirman_password,
pkcs12_info)
pkcs12_info, ca_file = config.dir + "/ca.crt")
return ds
@@ -209,7 +209,10 @@ def install_http(config, auto_redirect):
memcache.create_instance('MEMCACHE', config.host_name, config.dirman_password, ipautil.realm_to_suffix(config.realm_name))
http = httpinstance.HTTPInstance()
http.create_instance(config.realm_name, config.host_name, config.domain_name, config.dirman_password, False, pkcs12_info, self_signed_ca=True, auto_redirect=auto_redirect)
http.create_instance(
config.realm_name, config.host_name, config.domain_name,
config.dirman_password, False, pkcs12_info,
auto_redirect=auto_redirect, ca_file = config.dir + "/ca.crt")
# Now copy the autoconfiguration files
if ipautil.file_exists(config.dir + "/preferences.html"):
install/tools/ipa-server-install
+3 -2
View File
@@ -991,7 +991,8 @@ def main():
dm_password, dirsrv_pkcs12_info,
idstart=options.idstart, idmax=options.idmax,
subject_base=options.subject,
hbac_allow=not options.hbac_allow)
hbac_allow=not options.hbac_allow,
ca_file=ca_file)
else:
ds = dsinstance.DsInstance(fstore=fstore)
ds.create_instance(realm_name, host_name, domain_name,
@@ -1122,7 +1123,7 @@ def main():
http.create_instance(
realm_name, host_name, domain_name, dm_password, autoconfig=False,
pkcs12_info=http_pkcs12_info, subject_base=options.subject,
auto_redirect=options.ui_redirect)
auto_redirect=options.ui_redirect, ca_file=ca_file)
else:
http.create_instance(
realm_name, host_name, domain_name, dm_password, autoconfig=True,