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