summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Löthberg <johannes@kyriasis.com>2018-04-07 20:26:00 +0100
committerJohannes Löthberg <johannes@kyriasis.com>2018-04-07 20:26:00 +0100
commit73ac57dab4461c6ccc0f1f298644f8fe341f4aea (patch)
treea7717f752599d5585a80855c2ebf8afb48b55e19
parent4891d591439a86191ff8e8c35c3e500e11ac6a9b (diff)
downloadpillar-73ac57dab4461c6ccc0f1f298644f8fe341f4aea.tar.xz
Add updated smtpd config
Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
-rw-r--r--opensmtpd/theos.sls55
1 files changed, 13 insertions, 42 deletions
diff --git a/opensmtpd/theos.sls b/opensmtpd/theos.sls
index 99bad72..1728b00 100644
--- a/opensmtpd/theos.sls
+++ b/opensmtpd/theos.sls
@@ -41,7 +41,6 @@ opensmtpd:
- 'kyrias: @theos.kyriasis.com,@kyriasis.com'
- 'xanadu: xan@kyriasis.com,xanadu@kyriasis.com'
-
listeners:
- interface: ens4
port: 25
@@ -64,28 +63,14 @@ opensmtpd:
auth: True
senders: <sendertable> masquerade
- - interface: cjdns
- port: 25
- tls: True
- pki: theos.kyriasis.com
- auth-optional: True
- senders: <sendertable> masquerade
-
- - interface: cjdns
- port: 587
- tls-require: True
- pki: theos.kyriasis.com
- auth: True
- senders: <sendertable> masquerade
-
- - interface: lo
- port: 10026
- tag: DKIM-IN
-
- interface: lo
port: 10029
tag: DKIM-OUT
+ - interface: lo
+ port: 10031
+ tag: SpamAssassin
+
- interface: localhost
senders: <sendertable> masquerade
@@ -97,42 +82,28 @@ opensmtpd:
for: domain "lucifer.kyriasis.com"
relay: backup theos.kyriasis.com
- - backup for the-tk.com:
- type: accept
- from: any
- for: domain "the-tk.com"
- relay: backup
-
- - incoming mailinglists:
- type: accept
- tagged: DKIM-IN
- from: any
- for: domain "lists.kyriasis.com" virtual { "@lists.kyriasis.com" = list }
- deliver_to: mda "/usr/local/bin/mlmmj-receive -L /home/lists/spool/%{dest.user:strip}/"
-
- incoming to local host:
type: accept
- tagged: DKIM-IN
+ tagged: SpamAssassin
for: domain "theos.kyriasis.com" alias { root = kyrias }
deliver_to: lmtp "/var/run/dovecot/lmtp"
- - incoming to top-level domains:
+ - incoming mailinglists:
type: accept
- tagged: DKIM-IN
- from: any
- for: 'domain { kyriasis.com, the-tk.com } virtual <users>'
- deliver_to: lmtp "/var/run/dovecot/lmtp"
+ tagged: SpamAssassin
+ for: domain "lists.kyriasis.com" virtual { "@lists.kyriasis.com" = lists }
+ deliver_to: mda "/usr/local/bin/mlmmj-receive -L /home/lists/spool/%{dest.user:strip}/"
- - local email:
+ - incoming to top-level domains:
type: accept
- from: local
- for: local
+ tagged: SpamAssassin
+ for: 'domain { kyriasis.com } virtual <users>'
deliver_to: lmtp "/var/run/dovecot/lmtp"
- relay incoming through dkimproxy:
type: accept
from: any
- for: domain { kyriasis.com, theos.kyriasis.com, the-tk.com }
+ for: domain { kyriasis.com, theos.kyriasis.com, lists.kyriasis.com }
relay: via smtp://127.0.0.1:10025
- outgoing from dkimproxy: