internet/ansible-freeipa
4
0
Fork 0
mirror of https://github.com/freeipa/ansible-freeipa.git synced 2026-07-30 11:24:50 +00:00
Code Issues Projects Releases Wiki Activity

ipaserver: Properly set settings related to pkcs12 files

Browse Source 
Use and generation of dirsrv_pkcs12_info, http_pkcs12_info and
pkinit_pkcs12_info has been fixed in:

- ipaserver_setup_ds
- ipaserver_setup_http
- ipaserver_test
This commit is contained in:
Thomas Woerner
2019-07-17 19:39:43 +02:00
parent 03688da522
commit f9066fa55b
4 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
roles/ipaserver/library/ipaserver_setup_ds.py
View File

@@ -82,6 +82,7 @@ def main():
dirsrv_config_file=dict(required=False), dirsrv_config_file=dict(required=False),
### ssl certificate ### ### ssl certificate ###
dirsrv_cert_files=dict(required=False, type='list', default=[]), dirsrv_cert_files=dict(required=False, type='list', default=[]),
_dirsrv_pkcs12_info=dict(required=False),
### certificate system ### ### certificate system ###
external_cert_files=dict(required=False, type='list', default=[]), external_cert_files=dict(required=False, type='list', default=[]),
subject_base=dict(required=False), subject_base=dict(required=False),
@@ -108,6 +109,8 @@ def main():
options.no_pkinit = ansible_module.params.get('no_pkinit') options.no_pkinit = ansible_module.params.get('no_pkinit')
options.no_hbac_allow = ansible_module.params.get('no_hbac_allow') options.no_hbac_allow = ansible_module.params.get('no_hbac_allow')
options.dirsrv_config_file = ansible_module.params.get('dirsrv_config_file') options.dirsrv_config_file = ansible_module.params.get('dirsrv_config_file')
options._dirsrv_pkcs12_info = ansible_module.params.get(
'_dirsrv_pkcs12_info')
### ssl certificate ### ### ssl certificate ###
options.dirsrv_cert_files = ansible_module.params.get('dirsrv_cert_files') options.dirsrv_cert_files = ansible_module.params.get('dirsrv_cert_files')
### certificate system ### ### certificate system ###

3
roles/ipaserver/library/ipaserver_setup_http.py
View File

@@ -97,6 +97,7 @@ def main():
#_update_hosts_file=dict(required=False, type='bool', default=False), #_update_hosts_file=dict(required=False, type='bool', default=False),
_dirsrv_pkcs12_info=dict(required=False), _dirsrv_pkcs12_info=dict(required=False),
_http_pkcs12_info=dict(required=False),
), ),
) )
@@ -146,6 +147,8 @@ def main():
#options._update_hosts_file = ansible_module.params.get('_update_hosts_file') #options._update_hosts_file = ansible_module.params.get('_update_hosts_file')
options._dirsrv_pkcs12_info = ansible_module.params.get( options._dirsrv_pkcs12_info = ansible_module.params.get(
'_dirsrv_pkcs12_info') '_dirsrv_pkcs12_info')
options._http_pkcs12_info = ansible_module.params.get(
'_http_pkcs12_info')
# init ################################################################## # init ##################################################################

6
roles/ipaserver/library/ipaserver_test.py
View File

@@ -821,7 +821,7 @@ def main():
key_nickname=options.http_cert_name, key_nickname=options.http_cert_name,
ca_cert_files=options.ca_cert_files, ca_cert_files=options.ca_cert_files,
host_name=host_name) host_name=host_name)
http_pkcs12_info = (http_pkcs12_file.name, options.http_pin) http_pkcs12_info = (http_pkcs12_file.name, http_pin)
if options.dirsrv_cert_files: if options.dirsrv_cert_files:
if options.dirsrv_pin is None: if options.dirsrv_pin is None:
@@ -833,7 +833,7 @@ def main():
key_nickname=options.dirsrv_cert_name, key_nickname=options.dirsrv_cert_name,
ca_cert_files=options.ca_cert_files, ca_cert_files=options.ca_cert_files,
host_name=host_name) host_name=host_name)
dirsrv_pkcs12_info = (dirsrv_pkcs12_file.name, options.dirsrv_pin) dirsrv_pkcs12_info = (dirsrv_pkcs12_file.name, dirsrv_pin)
if options.pkinit_cert_files: if options.pkinit_cert_files:
if options.pkinit_pin is None: if options.pkinit_pin is None:
@@ -845,7 +845,7 @@ def main():
key_nickname=options.pkinit_cert_name, key_nickname=options.pkinit_cert_name,
ca_cert_files=options.ca_cert_files, ca_cert_files=options.ca_cert_files,
realm_name=realm_name) realm_name=realm_name)
pkinit_pkcs12_info = (pkinit_pkcs12_file.name, options.pkinit_pin) pkinit_pkcs12_info = (pkinit_pkcs12_file.name, pkinit_pin)
if (options.http_cert_files and options.dirsrv_cert_files and if (options.http_cert_files and options.dirsrv_cert_files and
http_ca_cert != dirsrv_ca_cert): http_ca_cert != dirsrv_ca_cert):

2
roles/ipaserver/tasks/install.yml
View File

@@ -190,6 +190,7 @@
# no_host_dns: "{{ result_ipaserver_test.no_host_dns }}" # no_host_dns: "{{ result_ipaserver_test.no_host_dns }}"
dirsrv_config_file: "{{ ipaserver_dirsrv_config_file | default(omit) }}" dirsrv_config_file: "{{ ipaserver_dirsrv_config_file | default(omit) }}"
dirsrv_cert_files: "{{ ipaserver_dirsrv_cert_files | default(omit) }}" dirsrv_cert_files: "{{ ipaserver_dirsrv_cert_files | default(omit) }}"
_dirsrv_pkcs12_info: "{{ result_ipaserver_test._dirsrv_pkcs12_info }}"
external_cert_files: external_cert_files:
"{{ ipaserver_external_cert_files | default(omit) }}" "{{ ipaserver_external_cert_files | default(omit) }}"
subject_base: "{{ result_ipaserver_prepare.subject_base }}" subject_base: "{{ result_ipaserver_prepare.subject_base }}"
@@ -319,6 +320,7 @@
idmax: "{{ result_ipaserver_test.idmax }}" idmax: "{{ result_ipaserver_test.idmax }}"
http_cert_files: "{{ ipaserver_http_cert_files | default([]) }}" http_cert_files: "{{ ipaserver_http_cert_files | default([]) }}"
no_ui_redirect: "{{ ipaserver_no_ui_redirect }}" no_ui_redirect: "{{ ipaserver_no_ui_redirect }}"
_http_pkcs12_info: "{{ result_ipaserver_test._http_pkcs12_info }}"
- name: Install - Setup KRA - name: Install - Setup KRA
ipaserver_setup_kra: ipaserver_setup_kra: