3 files changed, 45 insertions, 21 deletions
diff --git a/adguard-home/tasks/disable-dns-bypass.yaml b/adguard-home/tasks/disable-dns-bypass.yaml
new file mode 100644
index 0000000..10add0a
--- /dev/null
+++ b/adguard-home/tasks/disable-dns-bypass.yaml
@@ -0,0 +1,24 @@
+---
+
+- name: check if resolv.conf exists
+  stat: path="/etc/resolv.conf"
+  register: sym
+
+- name: replace systemd-resolved conf stub
+  become: yes
+  copy:
+    remote_src: yes
+    src:  "/run/systemd/resolve/resolv.conf"
+    dest: "/etc/resolv.conf"
+  when: sym.stat.islnk is defined and sym.stat.islnk
+
+- name: ensure nameserver is self
+  become: yes
+  lineinfile:
+    path: "/etc/resolv.conf"
+    regexp: "^nameserver"
+    line: "nameserver {{ansible_default_ipv4.address}}"
+
+- name: disable systemd-resolved service
+  become: yes
+  systemd: name="systemd-resolved.service" enabled="no" state="stopped"
diff --git a/adguard-home/tasks/enable-dns-bypass.yaml b/adguard-home/tasks/enable-dns-bypass.yaml
new file mode 100644
index 0000000..efb2122
--- /dev/null
+++ b/adguard-home/tasks/enable-dns-bypass.yaml
@@ -0,0 +1,17 @@
+---
+
+- name: check if resolv.conf exists
+  stat: path="/etc/resolv.conf"
+  register: sym
+
+- name: replace systemd-resolved conf link
+  become: yes
+  file:
+    src:  "../run/systemd/resolve/stub-resolv.conf"
+    dest: "/etc/resolv.conf"
+    state: "link"
+  when: sym.stat.islnk is defined and not sym.stat.islnk
+
+- name: enable systemd-resolved service
+  become: yes
+  systemd: name="systemd-resolved.service" enabled="yes" state="started"
diff --git a/adguard-home/tasks/main.yaml b/adguard-home/tasks/main.yaml
index f9220bf..fc604da 100644
--- a/adguard-home/tasks/main.yaml
+++ b/adguard-home/tasks/main.yaml
@@ -44,28 +44,11 @@
   template: src="AdGuardHome.yaml.j2" dest="/etc/AdGuardHome/AdGuardHome.yaml"
   notify: restart adguard home
 
-- name: check if resolv.conf exists
-  stat: path="/etc/resolv.conf"
-  register: sym
+- include: enable-dns-bypass.yaml
+  when: adguard_dns_bypass
 
-- name: replace systemd-resolved conf stub
-  become: yes
-  copy:
-    remote_src: yes
-    src:  "/run/systemd/resolve/resolv.conf"
-    dest: "/etc/resolv.conf"
-  when: sym.stat.islnk is defined and sym.stat.islnk
-
-- name: ensure nameserver is self
-  become: yes
-  lineinfile:
-    path: "/etc/resolv.conf"
-    regexp: "^nameserver"
-    line: "nameserver {{ansible_default_ipv4.address}}"
-
-- name: disable systemd-resolved service
-  become: yes
-  systemd: name="systemd-resolved.service" enabled="no" state="stopped"
+- include: disable-dns-bypass.yaml
+  when: not adguard_dns_bypass
 
 - name: ensure adguard home is started
   become: yes