Browse Source

Postfix config changes made on mailserver.

Signed-off-by: Maximilian Wilhelm <max@rfc2324.org>
Maximilian Wilhelm 7 years ago
parent
commit
d3d9b2b203
3 changed files with 23 additions and 3 deletions
  1. 16 0
      postfix/aliases.mail.in.ffho.net
  2. 3 1
      postfix/init.sls
  3. 4 2
      postfix/master.cf.mail.in.ffho.net

+ 16 - 0
postfix/aliases.mail.in.ffho.net

@@ -0,0 +1,16 @@
+# /etc/aliases
+mailer-daemon: postmaster
+postmaster: root
+nobody: root
+hostmaster: root
+usenet: root
+news: root
+webmaster: root
+www: root
+ftp: root
+abuse: root
+noc: root
+security: root
+
+root: ops@ffho.net
+clamav: root

+ 3 - 1
postfix/init.sls

@@ -32,7 +32,9 @@ postfix:
 # Send root mail to ops@ffho.net
 /etc/aliases:
   file.managed:
-    - source: salt://postfix/aliases
+    - source:
+      - salt://postfix/aliases.{{ grains['id'] }}
+      - salt://postfix/aliases
 
 newaliases:
   cmd.wait:

+ 4 - 2
postfix/master.cf.mail.in.ffho.net

@@ -37,9 +37,9 @@ smtp      inet  n       -       -       -       -       smtpd
 #  -o smtpd_relay_restrictions=permit_sasl_authenticated,reject
 #  -o milter_macro_daemon_name=ORIGINATING
 #628       inet  n       -       -       -       -       qmqpd
-pickup    unix  n       -       -       60      1       pickup
+pickup    fifo  n       -       -       60      1       pickup
 cleanup   unix  n       -       -       -       0       cleanup
-qmgr      unix  n       -       n       300     1       qmgr
+qmgr      fifo  n       -       n       300     1       qmgr
 #qmgr     unix  n       -       n       300     1       oqmgr
 tlsmgr    unix  -       -       -       1000?   1       tlsmgr
 rewrite   unix  -       -       -       -       -       trivial-rewrite
@@ -121,4 +121,6 @@ scalemail-backend unix	-	n	n	-	2	pipe
 mailman   unix  -       n       n       -       -       pipe
   flags=FR user=list argv=/usr/lib/mailman/bin/postfix-to-mailman.py
   ${nexthop} ${user}
+greyfix    unix  -       n       n       -       -       spawn
+      user=nobody argv=/usr/local/sbin/greyfix --greylist-delay 60 -/ 24 -6 56