From 662c35606456feded2ff1b1c61bd26dcbd703e83 Mon Sep 17 00:00:00 2001 From: A Holt Date: Fri, 30 Jul 2021 11:04:39 -0400 Subject: [PATCH 1/3] 0-init/tasks/network.yml: Clarify var FQDN_changed falling into disuse? --- roles/0-init/tasks/network.yml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/roles/0-init/tasks/network.yml b/roles/0-init/tasks/network.yml index 4680672a0..6a1a04cef 100644 --- a/roles/0-init/tasks/network.yml +++ b/roles/0-init/tasks/network.yml @@ -46,15 +46,18 @@ iiab_fqdn: "{{ iiab_hostname }}.{{ iiab_domain }}" FQDN_changed: False -- name: "Set 'FQDN_changed: True' when iiab_fqdn != ansible_fqdn ({{ ansible_fqdn }})" +- name: Set hostname in various places -- if iiab_fqdn != ansible_fqdn ({{ ansible_fqdn }}) + include_tasks: hostname.yml + when: iiab_fqdn != ansible_fqdn + +# 2021-07-30: FQDN_changed isn't used as in the past -- its remaining use is +# for {named, dhcpd, squid} in roles/network/tasks/main.yml -- possibly it +# should be reconsidered? See PR #2876: roles/network might become optional? +- name: "Also set 'FQDN_changed: True' -- if iiab_fqdn != ansible_fqdn ({{ ansible_fqdn }})" set_fact: FQDN_changed: True when: iiab_fqdn != ansible_fqdn -- name: Set hostname if FQDN_changed - include_tasks: hostname.yml - when: FQDN_changed - - name: "Set 'gui_port: 80' for Admin Console if not adm_cons_force_ssl" set_fact: From c695063f4be1c143c8d666d2164c833b8a4fec23 Mon Sep 17 00:00:00 2001 From: A Holt Date: Fri, 30 Jul 2021 11:29:18 -0400 Subject: [PATCH 2/3] Explain hostname.yml more accurately in 0-init/tasks/network.yml --- roles/0-init/tasks/network.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/0-init/tasks/network.yml b/roles/0-init/tasks/network.yml index 6a1a04cef..01ed1a55f 100644 --- a/roles/0-init/tasks/network.yml +++ b/roles/0-init/tasks/network.yml @@ -46,7 +46,7 @@ iiab_fqdn: "{{ iiab_hostname }}.{{ iiab_domain }}" FQDN_changed: False -- name: Set hostname in various places -- if iiab_fqdn != ansible_fqdn ({{ ansible_fqdn }}) +- name: Set hostname / domain (etc) in various places -- if iiab_fqdn != ansible_fqdn ({{ ansible_fqdn }}) include_tasks: hostname.yml when: iiab_fqdn != ansible_fqdn From 85500480142705d15a0349c396006c1c6c79cba9 Mon Sep 17 00:00:00 2001 From: A Holt Date: Fri, 30 Jul 2021 11:32:27 -0400 Subject: [PATCH 3/3] Explain hostname.yml more accurately in 0-init/tasks/main.yml --- roles/0-init/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/0-init/tasks/main.yml b/roles/0-init/tasks/main.yml index 85fcd02dc..802739623 100644 --- a/roles/0-init/tasks/main.yml +++ b/roles/0-init/tasks/main.yml @@ -56,7 +56,7 @@ - name: "Time Zone / TZ: Set symlink /etc/localtime to UTC if it doesn't exist?" include_tasks: tz.yml -- name: Test Gateway + Test Internet + Set new hostname if nec + Set 'gui_port' to 80 or 443 for Admin Console +- name: Test Gateway + Test Internet + Set new hostname/domain if nec + Set 'gui_port' to 80 or 443 for Admin Console include_tasks: network.yml