refactor(systemd-resolved): rename facts to common_resolved variables for consistency
This commit is contained in:
@@ -3,25 +3,25 @@
|
|||||||
# Set some facts
|
# Set some facts
|
||||||
# ---
|
# ---
|
||||||
|
|
||||||
- name: (systemd-resolved.yml) Set fact_resolved_nameserver (blank separated list)
|
- name: (systemd-resolved.yml) Set common_resolved_nameserver (blank separated list)
|
||||||
ansible.builtin.set_fact:
|
ansible.builtin.set_fact:
|
||||||
fact_resolved_nameserver: "{{ resolved_nameserver | join(' ') }}"
|
common_resolved_nameserver: "{{ resolved_nameserver | join(' ') }}"
|
||||||
when:
|
when:
|
||||||
- resolved_nameserver is defined and resolved_nameserver | length > 0
|
- resolved_nameserver is defined and resolved_nameserver | length > 0
|
||||||
tags:
|
tags:
|
||||||
- systemd-resolved
|
- systemd-resolved
|
||||||
|
|
||||||
- name: (systemd-resolved.yml) Set fact_resolved_fallback_nameserver (blank separated list)
|
- name: (systemd-resolved.yml) Set common_resolved_fallback_nameserver (blank separated list)
|
||||||
ansible.builtin.set_fact:
|
ansible.builtin.set_fact:
|
||||||
fact_resolved_fallback_nameserver: "{{ resolved_fallback_nameserver | join(' ') }}"
|
common_resolved_fallback_nameserver: "{{ resolved_fallback_nameserver | join(' ') }}"
|
||||||
when:
|
when:
|
||||||
- resolved_fallback_nameserver is defined and resolved_fallback_nameserver | length > 0
|
- resolved_fallback_nameserver is defined and resolved_fallback_nameserver | length > 0
|
||||||
tags:
|
tags:
|
||||||
- systemd-resolved
|
- systemd-resolved
|
||||||
|
|
||||||
- name: (systemd-resolved.yml) Set fact_resolved_domains (blank separated list)
|
- name: (systemd-resolved.yml) Set common_resolved_domains (blank separated list)
|
||||||
ansible.builtin.set_fact:
|
ansible.builtin.set_fact:
|
||||||
fact_resolved_domains: "{{ resolved_domains | join(' ') }}"
|
common_resolved_domains: "{{ resolved_domains | join(' ') }}"
|
||||||
when:
|
when:
|
||||||
- resolved_domains is defined and resolved_domains | length > 0
|
- resolved_domains is defined and resolved_domains | length > 0
|
||||||
tags:
|
tags:
|
||||||
@@ -35,6 +35,7 @@
|
|||||||
ansible.builtin.package:
|
ansible.builtin.package:
|
||||||
pkg: systemd-resolved
|
pkg: systemd-resolved
|
||||||
state: present
|
state: present
|
||||||
|
register: common_systemd_resolved_package
|
||||||
when:
|
when:
|
||||||
- systemd_resolved is defined and systemd_resolved|bool
|
- systemd_resolved is defined and systemd_resolved|bool
|
||||||
tags:
|
tags:
|
||||||
@@ -44,6 +45,7 @@
|
|||||||
ansible.builtin.systemd:
|
ansible.builtin.systemd:
|
||||||
name: systemd-resolved
|
name: systemd-resolved
|
||||||
enabled: true
|
enabled: true
|
||||||
|
register: common_systemd_resolved_service
|
||||||
when:
|
when:
|
||||||
- systemd_resolved is defined and systemd_resolved|bool
|
- systemd_resolved is defined and systemd_resolved|bool
|
||||||
tags:
|
tags:
|
||||||
@@ -60,6 +62,7 @@
|
|||||||
mode: "0755"
|
mode: "0755"
|
||||||
group: root
|
group: root
|
||||||
owner: root
|
owner: root
|
||||||
|
register: common_systemd_resolved_directory
|
||||||
|
|
||||||
- name: (systemd-resolved.yml) Create/Update file '/etc/systemd/resolved.conf.d/50-resolved-local.conf' from template sshd_config.j2
|
- name: (systemd-resolved.yml) Create/Update file '/etc/systemd/resolved.conf.d/50-resolved-local.conf' from template sshd_config.j2
|
||||||
ansible.builtin.template:
|
ansible.builtin.template:
|
||||||
@@ -68,8 +71,16 @@
|
|||||||
owner: root
|
owner: root
|
||||||
group: root
|
group: root
|
||||||
mode: "0644"
|
mode: "0644"
|
||||||
|
register: common_systemd_resolved_template
|
||||||
|
|
||||||
- name: Restart systemd-resolved service
|
- name: (systemd-resolved.yml) Restart systemd-resolved service
|
||||||
ansible.builtin.service:
|
ansible.builtin.service:
|
||||||
name: systemd-resolved
|
name: systemd-resolved
|
||||||
state: restarted
|
state: restarted
|
||||||
|
when:
|
||||||
|
- systemd_resolved is defined and systemd_resolved|bool
|
||||||
|
- >-
|
||||||
|
(common_systemd_resolved_package.changed | default(false))
|
||||||
|
or (common_systemd_resolved_service.changed | default(false))
|
||||||
|
or (common_systemd_resolved_directory.changed | default(false))
|
||||||
|
or (common_systemd_resolved_template.changed | default(false))
|
||||||
|
|||||||
@@ -5,20 +5,20 @@
|
|||||||
# *** ---------------------------------------------- ***
|
# *** ---------------------------------------------- ***
|
||||||
|
|
||||||
[Resolve]
|
[Resolve]
|
||||||
{% if (fact_resolved_nameserver is defined) and fact_resolved_nameserver %}
|
{% if (common_resolved_nameserver is defined) and common_resolved_nameserver %}
|
||||||
DNS={{ fact_resolved_nameserver}}
|
DNS={{ common_resolved_nameserver}}
|
||||||
{% else %}
|
{% else %}
|
||||||
#DNS=
|
#DNS=
|
||||||
{% endif -%}
|
{% endif -%}
|
||||||
|
|
||||||
{% if (fact_resolved_fallback_nameserver is defined) and fact_resolved_fallback_nameserver %}
|
{% if (common_resolved_fallback_nameserver is defined) and common_resolved_fallback_nameserver %}
|
||||||
FallbackDNS={{ fact_resolved_fallback_nameserver }}
|
FallbackDNS={{ common_resolved_fallback_nameserver }}
|
||||||
{% else %}
|
{% else %}
|
||||||
#FallbackDNS=
|
#FallbackDNS=
|
||||||
{% endif -%}
|
{% endif -%}
|
||||||
|
|
||||||
{% if (fact_resolved_domains is defined) and fact_resolved_domains %}
|
{% if (common_resolved_domains is defined) and common_resolved_domains %}
|
||||||
Domains={{ fact_resolved_domains }}
|
Domains={{ common_resolved_domains }}
|
||||||
{% else %}
|
{% else %}
|
||||||
#Domains=
|
#Domains=
|
||||||
{% endif -%}
|
{% endif -%}
|
||||||
|
|||||||
Reference in New Issue
Block a user