From e56ce057e166ae32c41b6edfcd94a6a8e0cbde88 Mon Sep 17 00:00:00 2001
From: Michael Schmitz <s_michael1@gmx.de>
Date: Sat, 12 Oct 2024 13:58:03 +0200
Subject: [PATCH] TMP

---
 defaults/main.yml                             |  2 +-
 tasks/main.yml                                | 72 +++++++++----------
 .../etc/dnsmasq.d/consul-forward.conf.j2      |  1 -
 .../systemd/resolved.conf.d/consul.conf.j2    |  4 ++
 4 files changed, 41 insertions(+), 38 deletions(-)
 delete mode 100644 templates/etc/dnsmasq.d/consul-forward.conf.j2
 create mode 100644 templates/etc/systemd/resolved.conf.d/consul.conf.j2

diff --git a/defaults/main.yml b/defaults/main.yml
index b7231ca..ed31eb4 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -7,7 +7,7 @@ _consul:
   flags:
     - "-dev"
   domain: "consul"
-  use_dnsmasq_forwarding: true
+  use_dns_forwarding: true
   download:
     consul_url: "https://releases.hashicorp.com/consul/1.12.9/consul_1.12.9_linux_amd64.zip"
   logfile: "/var/log/consul.log"
diff --git a/tasks/main.yml b/tasks/main.yml
index aff9d1f..37c92dd 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -3,79 +3,79 @@
 
 - name: Install Consul
   ansible.builtin.unarchive:
-    remote_src: yes
+    remote_src: true
     src: "{{ item }}"
-    dest: "/usr/local/bin"
+    dest: /usr/local/bin
   with_items:
     - "{{ _consul.download.consul_url }}"
 
 - name: Create consul group
   ansible.builtin.group:
-    name: "consul"
+    name: consul
     state: present
-    system: yes
+    system: true
 
 - name: Create consul user
   ansible.builtin.user:
-    name: "consul"
+    name: consul
     state: present
-    system: yes
-    group: "consul"
-    createhome: no
-    home: "/tmp"
-    shell: "/usr/sbin/nologin"
+    system: true
+    group: consul
+    createhome: false
+    home: /tmp
+    shell: /usr/sbin/nologin
 
 - name: Create Consul Config Directory
   ansible.builtin.file:
     name: "{{ _consul.config_dir }}"
     state: directory
-    owner: "root"
-    group: "consul"
+    owner: root
+    group: consul
     mode: "0755"
 
 - name: Create Consul systemd Script
   ansible.builtin.template:
-    src: "etc/systemd/system/consul.service.j2"
-    dest: "/etc/systemd/system/{{ _consul.service_name }}.service"
-    owner: "root"
-    group: "root"
+    src: etc/systemd/system/consul.service.j2
+    dest: /etc/systemd/system/{{ _consul.service_name }}.service
+    owner: root
+    group: root
     mode: "0644"
 
 - name: Create Consul Logrotate Configuration
   ansible.builtin.template:
-    src: "etc/logrotate.d/consul.j2"
-    dest: "/etc/logrotate.d/consul"
-    owner: "root"
-    group: "root"
+    src: etc/logrotate.d/consul.j2
+    dest: /etc/logrotate.d/consul
+    owner: root
+    group: root
     mode: "0644"
 
 - name: Disable services autostart
   ansible.builtin.service:
     name: "{{ item }}"
-    enabled: no
-  with_items:
-     - "{{ _consul.service_name }}"
+    enabled: false
+  loop:
+    - "{{ _consul.service_name }}"
 
 - name: Get package facts
   ansible.builtin.package_facts:
-    manager: "auto"
-  when: _consul.use_dnsmasq_forwarding|default(false)
+    manager: auto
+  when: _consul.use_dns_forwarding | default(false)
   no_log: true
 
-- name: Dnsmasq forwarding
-  when: _consul.use_dnsmasq_forwarding|default(false) and 'dnsmasq' in ansible_facts.packages
+- name: Systemd-resolved forwarding
+  when: _consul.use_dns_forwarding | default(false) and 'systemd-resolved' in ansible_facts.packages
   block:
-    - name: Create dnsmasq config to forward consul domain to agent
+    - name: Create systemd-resolved config to forward consul domain to agent
       ansible.builtin.template:
         src: "{{ item }}.j2"
-        dest: "/{{ item }}"
+        dest: /{{ item }}
         mode: "0644"
-      with_items:
-        - "etc/dnsmasq.d/consul-forward.conf"
-      register: dnsmasq_consul
+      loop:
+        - etc/systemd/resolved.conf.d/consul.conf.j2
+      register: systemd_resolved_consul
 
-    - name: Restart dnsmasq if config changed to enable consul queries
-      ansible.builtin.service:
-        name: dnsmasq
+    - name: Restart systemd-resolved
+      ansible.builtin.systemd:
+        name: systemd-resolved
         state: restarted
-      when: dnsmasq_consul is changed
+      when: systemd_resolved_consul is changed
diff --git a/templates/etc/dnsmasq.d/consul-forward.conf.j2 b/templates/etc/dnsmasq.d/consul-forward.conf.j2
deleted file mode 100644
index 4f4d939..0000000
--- a/templates/etc/dnsmasq.d/consul-forward.conf.j2
+++ /dev/null
@@ -1 +0,0 @@
-server=/{{ _consul.domain }}/127.0.0.1#{{ _consul.dns_port|default(8600) }}
diff --git a/templates/etc/systemd/resolved.conf.d/consul.conf.j2 b/templates/etc/systemd/resolved.conf.d/consul.conf.j2
new file mode 100644
index 0000000..3af9498
--- /dev/null
+++ b/templates/etc/systemd/resolved.conf.d/consul.conf.j2
@@ -0,0 +1,4 @@
+[Resolve]
+DNS=127.0.0.1:{{ _consul.dns_port|default(8600) }}
+DNSSEC=false
+Domains=~{{ _consul.domain }}