From f739cb30c562e77a3475f1056e8dc258022310d0 Mon Sep 17 00:00:00 2001
From: Tine <tine@tjo.space>
Date: Fri, 29 Nov 2024 08:20:09 +0100
Subject: [PATCH] fix(email): do not block ips for email

---
 root/etc/nginx/nginx.conf           | 72 +++++++++++++++--------------
 root/etc/nginx/partials/server.conf |  3 --
 2 files changed, 38 insertions(+), 37 deletions(-)

diff --git a/root/etc/nginx/nginx.conf b/root/etc/nginx/nginx.conf
index e0ea453..4c0c0e7 100644
--- a/root/etc/nginx/nginx.conf
+++ b/root/etc/nginx/nginx.conf
@@ -98,47 +98,51 @@ stream {
 
   # HTTPS
   server {
-    access_log     syslog:server=unix:/dev/log geoip_with_upstream;
-    listen         0.0.0.0:443;
-    listen         [::]:443;
-    proxy_pass     $selected_upstream;
-    proxy_protocol on;
-    include        /etc/nginx/partials/server.conf;
-    include        /etc/nginx/partials/blocked.conf;
-    include        /etc/nginx/partials/manual-blocks.conf;
+    access_log        syslog:server=unix:/dev/log geoip_with_upstream;
+    listen            0.0.0.0:443;
+    listen            [::]:443;
+    proxy_pass        $selected_upstream;
+    proxy_protocol    on;
+    resolver          9.9.9.9 1.1.1.1 8.8.8.8 8.8.4.4;
+    set_real_ip_from  0.0.0.0/0;
+    ssl_preread       on;
+    include           /etc/nginx/partials/blocked.conf;
+    include           /etc/nginx/partials/manual-blocks.conf;
   }
 
   # GIT
   server {
-    access_log     syslog:server=unix:/dev/log geoip;
-    listen         0.0.0.0:22;
-    listen         [::]:22;
-    proxy_pass     batuu.system.tjo.space:2244;
-    proxy_protocol on;
-    include        /etc/nginx/partials/server.conf;
-    include        /etc/nginx/partials/blocked.conf;
-    include        /etc/nginx/partials/manual-blocks.conf;
+    access_log        syslog:server=unix:/dev/log geoip;
+    listen            0.0.0.0:22;
+    listen            [::]:22;
+    proxy_pass        batuu.system.tjo.space:2244;
+    proxy_protocol    on;
+    resolver          9.9.9.9 1.1.1.1 8.8.8.8 8.8.4.4;
+    set_real_ip_from  0.0.0.0/0;
+    include           /etc/nginx/partials/blocked.conf;
+    include           /etc/nginx/partials/manual-blocks.conf;
   }
 
   # EMAIL
   server {
-    access_log     syslog:server=unix:/dev/log geoip;
-    listen         0.0.0.0:25;
-    listen         [::]:25;
-    listen         0.0.0.0:143;
-    listen         [::]:143;
-    listen         0.0.0.0:465;
-    listen         [::]:465;
-    listen         0.0.0.0:587;
-    listen         [::]:587;
-    listen         0.0.0.0:993;
-    listen         [::]:993;
-    listen         0.0.0.0:4190;
-    listen         [::]:4190;
-    proxy_pass     nevaroo.system.tjo.space:$server_port;
-    proxy_protocol on;
-    include        /etc/nginx/partials/server.conf;
-    include        /etc/nginx/partials/blocked.conf;
-    include        /etc/nginx/partials/manual-blocks.conf;
+    access_log        syslog:server=unix:/dev/log geoip;
+    listen            0.0.0.0:25;
+    listen            [::]:25;
+    listen            0.0.0.0:143;
+    listen            [::]:143;
+    listen            0.0.0.0:465;
+    listen            [::]:465;
+    listen            0.0.0.0:587;
+    listen            [::]:587;
+    listen            0.0.0.0:993;
+    listen            [::]:993;
+    listen            0.0.0.0:4190;
+    listen            [::]:4190;
+    proxy_pass        nevaroo.system.tjo.space:$server_port;
+    proxy_protocol    on;
+    resolver          9.9.9.9 1.1.1.1 8.8.8.8 8.8.4.4;
+    set_real_ip_from  0.0.0.0/0;
+    #include        /etc/nginx/partials/blocked.conf;
+    #include        /etc/nginx/partials/manual-blocks.conf;
   }
 }
diff --git a/root/etc/nginx/partials/server.conf b/root/etc/nginx/partials/server.conf
index 989a875..1359503 100644
--- a/root/etc/nginx/partials/server.conf
+++ b/root/etc/nginx/partials/server.conf
@@ -1,4 +1 @@
 # Default server configuration
-resolver              9.9.9.9 1.1.1.1 8.8.8.8 8.8.4.4;
-set_real_ip_from      0.0.0.0/0;
-ssl_preread           on;