From 90f20e64d8923c203584cbccc9665c5713250b2d Mon Sep 17 00:00:00 2001
From: Kristof Mattei <864376+Kristof-Mattei@users.noreply.github.com>
Date: Sat, 24 Jul 2021 11:02:08 -0700
Subject: [PATCH 1/3] adguard: bypass auth for /dns-query, used by DoH.

---
 adguard.subdomain.conf.sample | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/adguard.subdomain.conf.sample b/adguard.subdomain.conf.sample
index 4771b6d..b229d89 100644
--- a/adguard.subdomain.conf.sample
+++ b/adguard.subdomain.conf.sample
@@ -47,4 +47,14 @@ server {
         proxy_pass $upstream_proto://$upstream_app:$upstream_port;
 
     }
+    
+    location /dns-query {
+        include /config/nginx/proxy.conf;
+        resolver 127.0.0.11 valid=30s;
+        set $upstream_app adguard;
+        set $upstream_port 80;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
+    }
 }

From 4943b4fbfb8529bc04651165b4a5cd0c5925330d Mon Sep 17 00:00:00 2001
From: Kristof Mattei <864376+Kristof-Mattei@users.noreply.github.com>
Date: Sat, 24 Jul 2021 11:09:12 -0700
Subject: [PATCH 2/3] Added comments

---
 adguard.subdomain.conf.sample | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/adguard.subdomain.conf.sample b/adguard.subdomain.conf.sample
index b229d89..5f3d2a3 100644
--- a/adguard.subdomain.conf.sample
+++ b/adguard.subdomain.conf.sample
@@ -49,6 +49,8 @@ server {
     }
     
     location /dns-query {
+        # to properly use this please set `allow_unencrypted_doh: true` and `force_https: false` in adguard
+        # see https://github.com/AdguardTeam/AdGuardHome/wiki/Configuration#configuration-file
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app adguard;

From ee3e5857dd84d4d590d7ff0f4e210f71c1c4a5a5 Mon Sep 17 00:00:00 2001
From: Kristof Mattei <864376+Kristof-Mattei@users.noreply.github.com>
Date: Fri, 24 Sep 2021 08:32:53 -0700
Subject: [PATCH 3/3] Bumped date & used new resolver pattern

---
 adguard.subdomain.conf.sample | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/adguard.subdomain.conf.sample b/adguard.subdomain.conf.sample
index 5f3d2a3..e4a17fc 100644
--- a/adguard.subdomain.conf.sample
+++ b/adguard.subdomain.conf.sample
@@ -1,4 +1,4 @@
-## Version 2021/05/18
+## Version 2021/09/24
 # make sure that your dns has a cname set for adguard and that your adguard container is named adguard
 
 server {
@@ -52,7 +52,7 @@ server {
         # to properly use this please set `allow_unencrypted_doh: true` and `force_https: false` in adguard
         # see https://github.com/AdguardTeam/AdGuardHome/wiki/Configuration#configuration-file
         include /config/nginx/proxy.conf;
-        resolver 127.0.0.11 valid=30s;
+        include /config/nginx/resolver.conf;
         set $upstream_app adguard;
         set $upstream_port 80;
         set $upstream_proto http;