From ac8ee952fe17c7c82e2ee5ec4dff5c256c118556 2023-08-24 02:24:37
From: x <xbr@c3l.lu>
Date: 2023-08-24 02:24:37
Subject: [PATCH] fix: move systemd-resolved config

---

diff --git a/gateway/initial_gw_setup.yml b/gateway/initial_gw_setup.yml
index 9e1186edd64753fe6b64ca5fbb9c98dbe8021734..423795836ed513430f602c0ebbfbb2d46597124b 100644
--- a/gateway/initial_gw_setup.yml
+++ b/gateway/initial_gw_setup.yml
@@ -36,6 +36,36 @@
           - wget # for fastd-blacklist
       tags: update
 
+    # fix systemd-resolved's default config
+    - name: Stop systemd-resolved
+      ansible.builtin.service:
+        name: "systemd-resolved"
+        state: "stopped"
+      tags: config
+    - name: Copy resolved.conf
+      ansible.builtin.copy:
+        src: "{{ server_config_dir }}/systemd-resolved/resolved.conf"
+        dest: /etc/systemd/resolved.conf
+        owner: root
+        group: root
+        mode: "0644"
+      tags: config
+    - name: Create a symbolic link for resolv.conf, replacing the initial resolv.conf
+      ansible.builtin.file:
+        src: /run/systemd/resolve/resolv.conf
+        dest: /etc/resolv.conf
+        owner: root
+        group: root
+        state: link
+        force: true
+      tags: config
+    - name: Start systemd-resolved
+      ansible.builtin.service:
+        name: "systemd-resolved"
+        state: "started"
+        enabled: "true"
+      tags: config
+
     - name: Add the routing table for freifunk
       ansible.builtin.blockinfile:
         path: /etc/iproute2/rt_tables
@@ -317,35 +347,7 @@
         enabled: "true"
       tags: config
 
-    # Disables systemd-resolved Stub Listener
-    - name: Stop systemd-resolved
-      ansible.builtin.service:
-        name: "systemd-resolved"
-        state: "stopped"
-      tags: config
-    - name: Copy resolved.conf
-      ansible.builtin.copy:
-        src: "{{ server_config_dir }}/systemd-resolved/resolved.conf"
-        dest: /etc/systemd/resolved.conf
-        owner: root
-        group: root
-        mode: "0644"
-      tags: config
-    - name: Create a symbolic link for resolv.conf, replacing the initial resolv.conf
-      ansible.builtin.file:
-        src: /run/systemd/resolve/resolv.conf
-        dest: /etc/resolv.conf
-        owner: root
-        group: root
-        state: link
-        force: true
-      tags: config
-    - name: Start systemd-resolved
-      ansible.builtin.service:
-        name: "systemd-resolved"
-        state: "started"
-        enabled: "true"
-      tags: config
+    # dnsmasq
     - name: Make sure dnsmasq is started
       ansible.builtin.service:
         name: "dnsmasq"