From 9cfb210ebba507a83543077c88a710df2a222f5c Mon Sep 17 00:00:00 2001
From: Deon George <deon@dege.au>
Date: Mon, 14 Oct 2024 14:07:26 +1100
Subject: [PATCH] Dont use proxy_proto by default for streams, disable default
 mail server configuration

---
 etc/nginx/include.d/mail.conf   | 38 +++++++++++++++++----------------
 etc/nginx/include.d/stream.conf |  2 --
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/etc/nginx/include.d/mail.conf b/etc/nginx/include.d/mail.conf
index f6965a5..87bf660 100644
--- a/etc/nginx/include.d/mail.conf
+++ b/etc/nginx/include.d/mail.conf
@@ -14,23 +14,25 @@ mail {
 	#ssl_session_cache	shared:SSL:10m;
 	#ssl_session_timeout	10m;
 
-	server {
-		listen		25;
-		listen		465 ssl;
-		protocol	smtp;
-		smtp_auth	login plain cram-md5;
-	}
+	include			/etc/nginx/mail.d/*.conf;
 
-	server {
-		listen		110;
-		listen		995 ssl;
-		protocol	pop3;
-		pop3_auth	plain apop cram-md5;
-	}
-
-	 server {
-		listen		143;
-		listen		993 ssl;
-		protocol	imap;
-	}
+#	server {
+#		listen		25;
+#		listen		465 ssl;
+#		protocol	smtp;
+#		smtp_auth	login plain cram-md5;
+#	}
+#
+#	server {
+#		listen		110;
+#		listen		995 ssl;
+#		protocol	pop3;
+#		pop3_auth	plain apop cram-md5;
+#	}
+#
+#	 server {
+#		listen		143;
+#		listen		993 ssl;
+#		protocol	imap;
+#	}
 }
diff --git a/etc/nginx/include.d/stream.conf b/etc/nginx/include.d/stream.conf
index da300b0..d38cf9e 100644
--- a/etc/nginx/include.d/stream.conf
+++ b/etc/nginx/include.d/stream.conf
@@ -8,7 +8,5 @@ stream {
                  '$session_time "$upstream_addr" '
                  '"$upstream_bytes_sent" "$upstream_bytes_received" "$upstream_connect_time"';
 
-	proxy_protocol	on;
-
 	include		/etc/nginx/stream.d/*.conf;
 }