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

ipaserver: Use ipaclient_ prefix for client settings

Browse Source 
The client settings are:

ipaclient_mkhomedir
ipaclient_no_ntp
ipaclient_ssh_trust_dns
ipaclient_no_ssh
ipaclient_no_sshd
ipaclient_no_dns_sshfp
This commit is contained in:
Thomas Woerner
2018-01-29 17:46:53 +01:00
parent 9faea32375
commit bc253e7233
2 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
roles/ipaserver/defaults/main.yml
View File

@@ -12,12 +12,12 @@ ipaserver_no_pkinit: no
ipaserver_no_ui_redirect: no ipaserver_no_ui_redirect: no
### ssl certificate ### ### ssl certificate ###
### client ### ### client ###
ipaserver_mkhomedir: no ipaclient_mkhomedir: no
ipaserver_no_ntp: no ipaclient_no_ntp: no
#ipaserver_ssh_trust_dns: no #ipaclient_ssh_trust_dns: no
#ipaserver_no_ssh: no #ipaclient_no_ssh: no
#ipaserver_no_sshd: no #ipaclient_no_sshd: no
#ipaserver_no_dns_sshfp: no #ipaclient_no_dns_sshfp: no
### certificate system ### ### certificate system ###
ipaserver_external_ca: no ipaserver_external_ca: no
### dns ### ### dns ###

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

@@ -59,7 +59,7 @@
# pkinit_name # pkinit_name
### client ### ### client ###
# mkhomedir # mkhomedir
no_ntp: "{{ ipaserver_no_ntp }}" no_ntp: "{{ ipaclient_no_ntp }}"
# ssh_trust_dns # ssh_trust_dns
# no_ssh # no_ssh
# no_sshd # no_sshd
@@ -133,7 +133,7 @@
- name: Install - Setup NTP - name: Install - Setup NTP
ipaserver_setup_ntp: ipaserver_setup_ntp:
when: not ipaserver_no_ntp | bool and (ipaserver_external_cert_files is undefined or ipaserver_external_cert_files|length < 1) when: not ipaclient_no_ntp | bool and (ipaserver_external_cert_files is undefined or ipaserver_external_cert_files|length < 1)
- name: Install - Setup DS - name: Install - Setup DS
ipaserver_setup_ds: ipaserver_setup_ds:
@@ -323,11 +323,11 @@
# realm: "{{ ipaserver_test.realm }}" # realm: "{{ ipaserver_test.realm }}"
# server: "{{ ipaserver_test.hostname }}" # server: "{{ ipaserver_test.hostname }}"
# hostname: "{{ ipaserver_test.hostname }}" # hostname: "{{ ipaserver_test.hostname }}"
# #no_dns_sshfp: "{{ ipaserver_no_dns_sshfp }}" # #no_dns_sshfp: "{{ ipaclient_no_dns_sshfp }}"
# #ssh_trust_dns: "{{ ipaserver_ssh_trust_dns }}" # #ssh_trust_dns: "{{ ipaclient_ssh_trust_dns }}"
# #no_ssh: "{{ ipaserver_no_ssh }}" # #no_ssh: "{{ ipaclient_no_ssh }}"
# #no_sshd: "{{ ipaserver_no_sshd }}" # #no_sshd: "{{ ipaclient_no_sshd }}"
# mkhomedir: "{{ ipaserver_mkhomedir }}" # mkhomedir: "{{ ipaclient_mkhomedir }}"
- name: Install - Setup client - name: Install - Setup client
command: > command: >
@@ -338,12 +338,12 @@
--realm "{{ ipaserver_test.realm }}" --realm "{{ ipaserver_test.realm }}"
--server "{{ ipaserver_test.hostname }}" --server "{{ ipaserver_test.hostname }}"
--hostname "{{ ipaserver_test.hostname }}" --hostname "{{ ipaserver_test.hostname }}"
{{ "--mkhomedir" if ipaserver_mkhomedir | bool else "" }} {{ "--mkhomedir" if ipaclient_mkhomedir | bool else "" }}
# {{ "--no-dns-sshfp" if ipaserver_no_dns_sshfp | bool else "" }} # {{ "--no-dns-sshfp" if ipaclient_no_dns_sshfp | bool else "" }}
# {{ "--ssh-trust-dns" if ipaserver_ssh_trust_dns | bool else "" }} # {{ "--ssh-trust-dns" if ipaclient_ssh_trust_dns | bool else "" }}
# {{ "--no-ssh" if ipaserver_no_ssh | bool else "" }} # {{ "--no-ssh" if ipaclient_no_ssh | bool else "" }}
# {{ "--no-sshd" if ipaserver_no_sshd | bool else "" }} # {{ "--no-sshd" if ipaclient_no_sshd | bool else "" }}
- name: Install - Enable IPA - name: Install - Enable IPA
ipaserver_enable_ipa: ipaserver_enable_ipa: