From f5b5fa503927f2f635fab8317e45ecf1888feadf Mon Sep 17 00:00:00 2001
From: Sebastian Hugentobler <sebastian@vanwa.ch>
Date: Wed, 6 Jul 2016 13:59:56 +0200
Subject: [PATCH] update postfix run script

---
 rootfs/etc/confd/templates/master.cf.tmpl | 75 +++++++----------------
 tmp                                       | 21 +++++++
 2 files changed, 42 insertions(+), 54 deletions(-)
 create mode 100644 tmp

diff --git a/rootfs/etc/confd/templates/master.cf.tmpl b/rootfs/etc/confd/templates/master.cf.tmpl
index 79b6966..ea1e4a3 100644
--- a/rootfs/etc/confd/templates/master.cf.tmpl
+++ b/rootfs/etc/confd/templates/master.cf.tmpl
@@ -1,59 +1,26 @@
-{{range $mailhosts := split (getenv "MAILHOSTS") ";"}}
-{{$values := split ($mailhosts) ":"}}
-{{index $values 0}}:smtp  inet  n - - - -  smtpd
-  -o myhostname={{index $values 1}}
-  -o smtpd_tls_key_file=/etc/ssl/mail/{{index $values 1}}/privkey.pem
-  -o smtpd_tls_cert_file=/etc/ssl/mail/{{index $values 1}}//fullchain.pem
 
-{{index $values 1}}-out unix -     -    -    -    -    smtp
-  -o smtp_bind_address={{index $values 0}}
-  -o smtp_helo_name={{index $values 2}}
-  -o syslog_name=postfix-{{index $values 2}}
-
-{{index $values 0}}:submission  inet  n  - - - -  smtpd
-  -o syslog_name=postfix/submission
-  -o smtpd_tls_security_level=encrypt
-  -o smtpd_sasl_auth_enable=yes
-  -o smtpd_client_restrictions=permit_sasl_authenticated,reject
-  -o milter_macro_daemon_name=ORIGINATING
-  -o smtpd_tls_key_file=/etc/ssl/mail/{{index $values 1}}/privkey.pem
-  -o smtpd_tls_cert_file=/etc/ssl/mail/{{index $values 1}}//fullchain.pem
-{{end}}
- 
-pickup    fifo  n       -       -       60      1       pickup
-cleanup   unix  n       -       -       -       0       cleanup
-qmgr      fifo  n       -       n       300     1       qmgr
-#qmgr     fifo  n       -       n       300     1       oqmgr
-tlsmgr    unix  -       -       -       1000?   1       tlsmgr
-rewrite   unix  -       -       -       -       -       trivial-rewrite
-bounce    unix  -       -       -       -       0       bounce
-defer     unix  -       -       -       -       0       bounce
-trace     unix  -       -       -       -       0       bounce
-verify    unix  -       -       -       -       1       verify
-flush     unix  n       -       -       1000?   0       flush
+smtp      inet  n       -       n       -       -       smtpd
+pickup    unix  n       -       n       60      1       pickup
+cleanup   unix  n       -       n       -       0       cleanup
+qmgr      unix  n       -       n       300     1       qmgr
+#qmgr     unix  n       -       n       300     1       oqmgr
+tlsmgr    unix  -       -       n       1000?   1       tlsmgr
+rewrite   unix  -       -       n       -       -       trivial-rewrite
+bounce    unix  -       -       n       -       0       bounce
+defer     unix  -       -       n       -       0       bounce
+trace     unix  -       -       n       -       0       bounce
+verify    unix  -       -       n       -       1       verify
+flush     unix  n       -       n       1000?   0       flush
 proxymap  unix  -       -       n       -       -       proxymap
 proxywrite unix -       -       n       -       1       proxymap
-smtp      unix  -       -       -       -       -       smtp
-relay     unix  -       -       -       -       -       smtp
-showq     unix  n       -       -       -       -       showq
-error     unix  -       -       -       -       -       error
-retry     unix  -       -       -       -       -       error
-discard   unix  -       -       -       -       -       discard
+smtp      unix  -       -       n       -       -       smtp
+relay     unix  -       -       n       -       -       smtp
+showq     unix  n       -       n       -       -       showq
+error     unix  -       -       n       -       -       error
+retry     unix  -       -       n       -       -       error
+discard   unix  -       -       n       -       -       discard
 local     unix  -       n       n       -       -       local
 virtual   unix  -       n       n       -       -       virtual
-lmtp      unix  -       -       -       -       -       lmtp
-anvil     unix  -       -       -       -       1       anvil
-scache    unix  -       -       -       -       1       scache
-maildrop  unix  -       n       n       -       -       pipe
-  flags=DRhu user=vmail argv=/usr/local/bin/maildrop -d ${recipient}
-uucp      unix  -       n       n       -       -       pipe
-  flags=Fqhu user=uucp argv=uux -r -n -z -a$sender - $nexthop!rmail ($recipient)
-ifmail    unix  -       n       n       -       -       pipe
-  flags=F user=ftn argv=/usr/lib/ifmail/ifmail -r $nexthop ($recipient)
-bsmtp     unix  -       n       n       -       -       pipe
-  flags=Fq. user=bsmtp argv=/usr/local/sbin/bsmtp -t$nexthop -f$sender $recipient
-scalemail-backend unix    -    n    n    -    2    pipe
-  flags=R user=scalemail argv=/usr/lib/scalemail/bin/scalemail-store ${nexthop} ${user} ${extension}
-mailman   unix  -       n       n       -       -       pipe
-  flags=FR user=list argv=/usr/lib/mailman/bin/postfix-to-mailman.py
-  ${nexthop} ${user}
+lmtp      unix  -       -       n       -       -       lmtp
+anvil     unix  -       -       n       -       1       anvil
+scache    unix  -       -       n       -       1       scache
diff --git a/tmp b/tmp
new file mode 100644
index 0000000..d5b8511
--- /dev/null
+++ b/tmp
@@ -0,0 +1,21 @@
+{{range $mailhosts := split (getenv "MAILHOSTS") ";"}}
+{{$values := split ($mailhosts) ":"}}
+{{index $values 0}}:smtp  inet  n - - - -  smtpd
+  -o myhostname={{index $values 1}}
+  -o smtpd_tls_key_file=/etc/ssl/mail/{{index $values 1}}/privkey.pem
+  -o smtpd_tls_cert_file=/etc/ssl/mail/{{index $values 1}}//fullchain.pem
+
+{{index $values 1}}-out unix -     -    -    -    -    smtp
+  -o smtp_bind_address={{index $values 0}}
+  -o smtp_helo_name={{index $values 2}}
+  -o syslog_name=postfix-{{index $values 2}}
+
+{{index $values 0}}:submission  inet  n  - - - -  smtpd
+  -o syslog_name=postfix/submission
+  -o smtpd_tls_security_level=encrypt
+  -o smtpd_sasl_auth_enable=yes
+  -o smtpd_client_restrictions=permit_sasl_authenticated,reject
+  -o milter_macro_daemon_name=ORIGINATING
+  -o smtpd_tls_key_file=/etc/ssl/mail/{{index $values 1}}/privkey.pem
+  -o smtpd_tls_cert_file=/etc/ssl/mail/{{index $values 1}}//fullchain.pem
+{{end}}
\ No newline at end of file