ansible/oopen-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor(systemd-resolved): rename facts to common_resolved variables for consistency

Browse Source
This commit is contained in:
Christoph
2026-07-28 01:10:41 +02:00
parent 5832d0b938
commit 5525fa3e73
2 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
roles/common/tasks/systemd-resolved.yml
+18 -7
View File
@@ -3,25 +3,25 @@
# 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:
fact_resolved_nameserver: "{{ resolved_nameserver | join(' ') }}"
common_resolved_nameserver: "{{ resolved_nameserver | join(' ') }}"
when:
- resolved_nameserver is defined and resolved_nameserver | length > 0
tags:
- 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:
fact_resolved_fallback_nameserver: "{{ resolved_fallback_nameserver | join(' ') }}"
common_resolved_fallback_nameserver: "{{ resolved_fallback_nameserver | join(' ') }}"
when:
- resolved_fallback_nameserver is defined and resolved_fallback_nameserver | length > 0
tags:
- 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:
fact_resolved_domains: "{{ resolved_domains | join(' ') }}"
common_resolved_domains: "{{ resolved_domains | join(' ') }}"
when:
- resolved_domains is defined and resolved_domains | length > 0
tags:
@@ -35,6 +35,7 @@
ansible.builtin.package:
pkg: systemd-resolved
state: present
register: common_systemd_resolved_package
when:
- systemd_resolved is defined and systemd_resolved|bool
tags:
@@ -44,6 +45,7 @@
ansible.builtin.systemd:
name: systemd-resolved
enabled: true
register: common_systemd_resolved_service
when:
- systemd_resolved is defined and systemd_resolved|bool
tags:
@@ -60,6 +62,7 @@
mode: "0755"
group: 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
ansible.builtin.template:
@@ -68,8 +71,16 @@
owner: root
group: root
mode: "0644"
register: common_systemd_resolved_template
- name: Restart systemd-resolved service
- name: (systemd-resolved.yml) Restart systemd-resolved service
ansible.builtin.service:
name: systemd-resolved
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))
roles/common/templates/etc/systemd/resolved.conf.d/50-resolved-local.conf
+6 -6
View File
@@ -5,20 +5,20 @@
# *** ---------------------------------------------- ***
[Resolve]
{% if (fact_resolved_nameserver is defined) and fact_resolved_nameserver %}
DNS={{ fact_resolved_nameserver}}
{% if (common_resolved_nameserver is defined) and common_resolved_nameserver %}
DNS={{ common_resolved_nameserver}}
{% else %}
#DNS=
{% endif -%}
{% if (fact_resolved_fallback_nameserver is defined) and fact_resolved_fallback_nameserver %}
FallbackDNS={{ fact_resolved_fallback_nameserver }}
{% if (common_resolved_fallback_nameserver is defined) and common_resolved_fallback_nameserver %}
FallbackDNS={{ common_resolved_fallback_nameserver }}
{% else %}
#FallbackDNS=
{% endif -%}
{% if (fact_resolved_domains is defined) and fact_resolved_domains %}
Domains={{ fact_resolved_domains }}
{% if (common_resolved_domains is defined) and common_resolved_domains %}
Domains={{ common_resolved_domains }}
{% else %}
#Domains=
{% endif -%}