From cb656fc9fdf05f88c8ef8709b63e8bb19d8a2046 Mon Sep 17 00:00:00 2001
From: Florent Daigniere <nextgens@freenetproject.org>
Date: Fri, 13 May 2022 18:05:22 +0200
Subject: [PATCH] Silence some errors in nginx

"could not be resolved (3: Host not found) while in resolving client
address, client:"
---
 core/nginx/conf/nginx.conf          | 1 -
 towncrier/newsfragments/2346.bugfix | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 towncrier/newsfragments/2346.bugfix

diff --git a/core/nginx/conf/nginx.conf b/core/nginx/conf/nginx.conf
index 4e6919f8..ec58b308 100644
--- a/core/nginx/conf/nginx.conf
+++ b/core/nginx/conf/nginx.conf
@@ -278,7 +278,6 @@ mail {
     server_name {{ HOSTNAMES.split(",")[0] }};
     auth_http http://127.0.0.1:8000/auth/email;
     proxy_pass_error_message on;
-    resolver {{ RESOLVER }} valid=30s;
     error_log /dev/stderr info;
 
     {% if TLS and not TLS_ERROR %}
diff --git a/towncrier/newsfragments/2346.bugfix b/towncrier/newsfragments/2346.bugfix
new file mode 100644
index 00000000..9feac519
--- /dev/null
+++ b/towncrier/newsfragments/2346.bugfix
@@ -0,0 +1 @@
+Disable the built-in nginx resolver for traffic going through the mail plugin. This will silence errors about DNS resolution when the connecting host has no rDNS.