mirror of
https://github.com/iiab/iiab.git
synced 2025-03-09 15:40:17 +00:00
Correct discription of network.yml to hostname.yml
This commit is contained in:
parent
5196b4dff9
commit
59cd7ecc13
3 changed files with 16 additions and 44 deletions
|
@ -1,3 +1,8 @@
|
||||||
|
- name: "Set 'iiab_fqdn: {{ iiab_hostname }}.{{ iiab_domain }}'"
|
||||||
|
set_fact:
|
||||||
|
iiab_fqdn: "{{ iiab_hostname }}.{{ iiab_domain }}"
|
||||||
|
FQDN_changed: False
|
||||||
|
|
||||||
- name: Does /etc/cloud/cloud.cfg exist e.g. is this Ubuntu Server 18+ ?
|
- name: Does /etc/cloud/cloud.cfg exist e.g. is this Ubuntu Server 18+ ?
|
||||||
stat:
|
stat:
|
||||||
path: /etc/cloud/cloud.cfg
|
path: /etc/cloud/cloud.cfg
|
||||||
|
@ -17,16 +22,7 @@
|
||||||
# 2021-08-31: Periods in /etc/hostname fail with some WiFi routers (#2904)
|
# 2021-08-31: Periods in /etc/hostname fail with some WiFi routers (#2904)
|
||||||
# command: hostnamectl set-hostname "{{ iiab_hostname }}.{{ iiab_domain }}"
|
# command: hostnamectl set-hostname "{{ iiab_hostname }}.{{ iiab_domain }}"
|
||||||
|
|
||||||
#- name: Install /etc/sysconfig/network from template (redhat)
|
# should the first entry match just hostname and domain move to after localhost?
|
||||||
# template:
|
|
||||||
# src: roles/network/templates/network/sysconfig.network.j2
|
|
||||||
# dest: /etc/sysconfig/network
|
|
||||||
# owner: root
|
|
||||||
# group: root
|
|
||||||
# mode: 0644
|
|
||||||
# when: is_redhat
|
|
||||||
|
|
||||||
# roles/network/tasks/hosts.yml [no longer in use] ALSO did this:
|
|
||||||
- name: 'Put FQDN & hostnames in /etc/hosts: "127.0.0.1 {{ iiab_hostname }}.{{ iiab_domain }} localhost.localdomain localhost {{ iiab_hostname }} box box.lan"'
|
- name: 'Put FQDN & hostnames in /etc/hosts: "127.0.0.1 {{ iiab_hostname }}.{{ iiab_domain }} localhost.localdomain localhost {{ iiab_hostname }} box box.lan"'
|
||||||
lineinfile:
|
lineinfile:
|
||||||
path: /etc/hosts
|
path: /etc/hosts
|
||||||
|
@ -36,6 +32,14 @@
|
||||||
#group: root
|
#group: root
|
||||||
#mode: 0644
|
#mode: 0644
|
||||||
|
|
||||||
|
# 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: Re-configuring httpd - not initial install
|
#- name: Re-configuring httpd - not initial install
|
||||||
# include_tasks: roles/httpd/tasks/main.yml
|
# include_tasks: roles/httpd/tasks/main.yml
|
||||||
# when: iiab_stage|int > 3
|
# when: iiab_stage|int > 3
|
||||||
|
|
|
@ -51,9 +51,8 @@
|
||||||
- name: "Time Zone / TZ: Set symlink /etc/localtime to UTC if it doesn't exist?"
|
- name: "Time Zone / TZ: Set symlink /etc/localtime to UTC if it doesn't exist?"
|
||||||
include_tasks: tz.yml
|
include_tasks: tz.yml
|
||||||
|
|
||||||
- name: Set new hostname/domain (hostname.yml) if nec
|
- name: Set hostname / domain (etc) in various places
|
||||||
include_tasks: network.yml
|
include_tasks: hostname.yml
|
||||||
|
|
||||||
|
|
||||||
- name: Add 'runtime' variable values to {{ iiab_ini_file }}
|
- name: Add 'runtime' variable values to {{ iiab_ini_file }}
|
||||||
ini_file:
|
ini_file:
|
||||||
|
|
|
@ -1,31 +0,0 @@
|
||||||
- name: "Set 'iiab_fqdn: {{ iiab_hostname }}.{{ iiab_domain }}'"
|
|
||||||
set_fact:
|
|
||||||
iiab_fqdn: "{{ iiab_hostname }}.{{ iiab_domain }}"
|
|
||||||
FQDN_changed: False
|
|
||||||
|
|
||||||
- name: Set hostname / domain (etc) 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
|
|
||||||
|
|
||||||
|
|
||||||
# 2021-08-17: (1) iiab-gen-iptables works better if gui_port is set directly in
|
|
||||||
# default_vars.yml and/or local_vars.yml (2) Admin Console's iiab-admin.yml
|
|
||||||
# and js-menu.yml set 'adm_cons_force_ssl: False'
|
|
||||||
|
|
||||||
# - name: "Set 'gui_port: 80' for Admin Console if not adm_cons_force_ssl"
|
|
||||||
# set_fact:
|
|
||||||
# gui_port: 80
|
|
||||||
# when: not adm_cons_force_ssl
|
|
||||||
|
|
||||||
# - name: "Set 'gui_port: 443' for Admin Console if adm_cons_force_ssl"
|
|
||||||
# set_fact:
|
|
||||||
# gui_port: 443
|
|
||||||
# when: adm_cons_force_ssl
|
|
Loading…
Add table
Add a link
Reference in a new issue