summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Goodliffe <dan@randomdan.homeip.net>2021-06-06 22:50:32 +0100
committerDan Goodliffe <dan@randomdan.homeip.net>2021-06-06 22:51:13 +0100
commitd06035f203e3c445aee41949e7c0e37f089bc889 (patch)
tree84b3007a44f08b17740e1405e08a4ca8f974111b
parentOnly check critical HAProxy services (diff)
downloadconfig-d06035f203e3c445aee41949e7c0e37f089bc889.tar.bz2
config-d06035f203e3c445aee41949e7c0e37f089bc889.tar.xz
config-d06035f203e3c445aee41949e7c0e37f089bc889.zip
Add explicit secure submission service port to exim
Add to HAProxy
-rw-r--r--etc/exim.conf9
-rw-r--r--etc/haproxy.cfg9
2 files changed, 14 insertions, 4 deletions
diff --git a/etc/exim.conf b/etc/exim.conf
index 8086a01..8507b91 100644
--- a/etc/exim.conf
+++ b/etc/exim.conf
@@ -1,8 +1,9 @@
-daemon_smtp_port = 11025
+daemon_smtp_port = 11025 : 11465
+tls_on_connect_ports = 11465
# tls_advertise_hosts =
tls_advertise_hosts = *
-tls_certificate = /var/www/shared/letsencrypt/live/randomdan.homeip.net/fullchain.pem
-tls_privatekey = /var/www/shared/letsencrypt/live/randomdan.homeip.net/privkey.pem
+tls_certificate = /var/www/shared/letsencrypt/live/smtp.randomdan.homeip.net/fullchain.pem
+tls_privatekey = /var/www/shared/letsencrypt/live/smtp.randomdan.homeip.net/privkey.pem
domainlist local_domains = @ : randomdan.homeip.net : random.lan
hostlist relay_from_hosts = 127.0.0.1 : 10.10.0.0/16
hosts_proxy = <;10.10.0.0/16; fdc7:602:e9c5:b8f0::/16
@@ -70,7 +71,7 @@ userforward:
no_verify
no_expn
check_ancestor
- file_transport = address_file
+ file_transport = address_file
pipe_transport = address_pipe
reply_transport = address_reply
localuser:
diff --git a/etc/haproxy.cfg b/etc/haproxy.cfg
index 0c38d15..f93b813 100644
--- a/etc/haproxy.cfg
+++ b/etc/haproxy.cfg
@@ -53,6 +53,15 @@ listen smtp
server defiant defiant:11025
server firebrand firebrand:11025
+# Submissions
+listen submissions
+ description Exim SMTP
+ bind *:465
+ mode tcp
+ default-server send-proxy-v2 observe layer4 check check-ssl
+ server defiant defiant:11465
+ server firebrand firebrand:11465
+
# IMAPS
listen imaps
description Courier IMAP