summaryrefslogtreecommitdiff
path: root/docs/configdiff/emailout/postfix.diff
blob: 1e1d75949bc2ad1a03aa169c1dae44b24ac3d544 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
diff -urwN wheezy-chroot/etc/postfix/dynamicmaps.cf vm-emailout/rootfs/etc/postfix/dynamicmaps.cf
--- wheezy-chroot/etc/postfix/dynamicmaps.cf	2016-05-08 00:51:54.738716333 +0200
+++ vm-emailout/rootfs/etc/postfix/dynamicmaps.cf	2015-02-02 13:58:10.151038663 +0100
@@ -4,3 +4,4 @@
 #====	================================	=============	============
 tcp	/usr/lib/postfix/dict_tcp.so		dict_tcp_open	
 sqlite	/usr/lib/postfix/dict_sqlite.so		dict_sqlite_open	
+pcre	/usr/lib/postfix/dict_pcre.so		dict_pcre_open	
diff -urwN wheezy-chroot/etc/postfix/main.cf vm-emailout/rootfs/etc/postfix/main.cf
--- wheezy-chroot/etc/postfix/main.cf	2016-05-08 00:51:55.514721219 +0200
+++ vm-emailout/rootfs/etc/postfix/main.cf	2015-02-02 19:13:43.370652677 +0100
@@ -5,6 +5,8 @@
 # line of that file to be used as the name.  The Debian default
 # is /etc/mailname.
 #myorigin = /etc/mailname
+mydomain = emailout.intra.cacert.org
+smtp_helo_name = infrastructure.cacert.org
 
 smtpd_banner = $myhostname ESMTP $mail_name (Debian/GNU)
 biff = no
@@ -24,16 +26,37 @@
 smtpd_tls_session_cache_database = btree:${data_directory}/smtpd_scache
 smtp_tls_session_cache_database = btree:${data_directory}/smtp_scache
 
+smtp_tls_security_level = may
+
+# map internal host names to their corresponding admin addresses
+canonical_maps = pcre:/etc/postfix/canonical_maps
+
 # See /usr/share/doc/postfix/TLS_README.gz in the postfix-doc package for
 # information on enabling SSL in the smtp client.
 
-myhostname = infra02.intra.cacert.org
+myhostname = emailout.intra.cacert.org
 alias_maps = hash:/etc/aliases
 alias_database = hash:/etc/aliases
 myorigin = /etc/mailname
-mydestination = infra02.intra.cacert.org, localhost.intra.cacert.org, , localhost
+mydestination = emailout.cacert.org, emailout, localhost.localdomain, localhost
 relayhost = 
-mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128
+mynetworks = 172.16.2.0/24 10.0.0.0/24 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128
 mailbox_size_limit = 0
 recipient_delimiter = +
 inet_interfaces = all
+inet_protocols = all
+
+# DKIM milter
+# http://www.postfix.org/MILTER_README.html
+# TODO: enable DKIM once the DNS record is in place
+#smtpd_milters = unix:/opendkim/opendkim.sock
+#non_smtpd_milters = $smtpd_milters
+
+# what to do if the dkim filter fails
+#milter_default_action = accept
+#milter_command_timeout = 5s
+#milter_connect_timeout = $milter_command_timeout
+#milter_content_timeout = 45s
+
+transport_maps = hash:/etc/postfix/transport
+local_transport = error:local delivery is disabled