]>
Commit | Line | Data |
---|---|---|
30f1ed35 JK |
1 | diff -dur -x '*~' -x '*.orig' -x '*.rej' postfix-2.11.0.orig/conf/main.cf postfix-2.11.0/conf/main.cf |
2 | --- postfix-2.11.0.orig/conf/main.cf 2014-03-05 17:54:24.197406701 +0100 | |
3 | +++ postfix-2.11.0/conf/main.cf 2014-03-05 17:54:54.260740308 +0100 | |
5a9aead1 | 4 | @@ -39,7 +39,7 @@ |
c1f75f47 JB |
5 | # daemon programs (i.e. programs listed in the master.cf file). This |
6 | # directory must be owned by root. | |
320b372d | 7 | # |
9e5ab0fc | 8 | -daemon_directory = /usr/libexec/postfix |
320b372d AM |
9 | +daemon_directory = /usr/lib/postfix |
10 | ||
5a9aead1 AG |
11 | # The data_directory parameter specifies the location of Postfix-writable |
12 | # data files (caches, random numbers). This directory must be owned | |
13 | @@ -63,7 +63,7 @@ | |
a281e397 AM |
14 | # These rights are used in the absence of a recipient user context. |
15 | # DO NOT SPECIFY A PRIVILEGED USER OR THE POSTFIX OWNER. | |
16 | # | |
17 | -#default_privs = nobody | |
18 | +default_privs = nobody | |
19 | ||
20 | # INTERNET HOST AND DOMAIN NAMES | |
21 | # | |
5a9aead1 | 22 | @@ -95,7 +95,7 @@ |
c1f75f47 JB |
23 | # myorigin also specifies the default domain name that is appended |
24 | # to recipient addresses that have no @domain part. | |
a281e397 | 25 | # |
35e20fbe | 26 | -#myorigin = $myhostname |
35e20fbe | 27 | +myorigin = $myhostname |
9e9007a1 | 28 | #myorigin = $mydomain |
a281e397 | 29 | |
a281e397 | 30 | # RECEIVING MAIL |
5a9aead1 | 31 | @@ -379,7 +379,7 @@ |
a281e397 AM |
32 | # "postfix reload" to eliminate the delay. |
33 | # | |
34 | #alias_maps = dbm:/etc/aliases | |
35 | -#alias_maps = hash:/etc/aliases | |
36 | +alias_maps = hash:/etc/mail/aliases | |
37 | #alias_maps = hash:/etc/aliases, nis:mail.aliases | |
9e5ab0fc | 38 | #alias_maps = netinfo:/aliases |
a281e397 | 39 | |
5a9aead1 | 40 | @@ -390,7 +390,7 @@ |
320b372d AM |
41 | # |
42 | #alias_database = dbm:/etc/aliases | |
43 | #alias_database = dbm:/etc/mail/aliases | |
44 | -#alias_database = hash:/etc/aliases | |
45 | +alias_database = hash:/etc/mail/aliases | |
46 | #alias_database = hash:/etc/aliases, hash:/opt/majordomo/aliases | |
47 | ||
4070b073 | 48 | # ADDRESS EXTENSIONS (e.g., user+foo) |
5a9aead1 | 49 | @@ -418,7 +418,7 @@ |
35e20fbe AM |
50 | # UNIX-style mailboxes are kept. The default setting depends on the |
51 | # system type. | |
a281e397 | 52 | # |
447bfc58 | 53 | -#mail_spool_directory = /var/mail |
35e20fbe | 54 | +mail_spool_directory = /var/mail |
447bfc58 | 55 | #mail_spool_directory = /var/spool/mail |
a281e397 | 56 | |
35e20fbe | 57 | # The mailbox_command parameter specifies the optional external |
5a9aead1 | 58 | @@ -440,8 +440,8 @@ |
4070b073 AF |
59 | # IF YOU USE THIS TO DELIVER MAIL SYSTEM-WIDE, YOU MUST SET UP AN |
60 | # ALIAS THAT FORWARDS MAIL FOR ROOT TO A REAL USER. | |
61 | # | |
62 | -#mailbox_command = /some/where/procmail | |
63 | -#mailbox_command = /some/where/procmail -a "$EXTENSION" | |
64 | +#mailbox_command = /usr/bin/procmail | |
dbc4c78b | 65 | +#mailbox_command = /usr/bin/procmail -a "$EXTENSION" |
4070b073 AF |
66 | |
67 | # The mailbox_transport specifies the optional transport in master.cf | |
68 | # to use after processing aliases and .forward files. This parameter | |
5a9aead1 AG |
69 | @@ -613,45 +613,24 @@ |
70 | # -dmS $process_name gdb $daemon_directory/$process_name | |
71 | # $process_id & sleep 1 | |
320b372d | 72 | |
320b372d | 73 | +biff = no |
5a9aead1 | 74 | + |
830ba608 | 75 | # INSTALL-TIME CONFIGURATION INFORMATION |
76 | # | |
77 | # The following parameters are used when installing a new Postfix version. | |
78 | -# | |
79 | -# sendmail_path: The full pathname of the Postfix sendmail command. | |
80 | -# This is the Sendmail-compatible mail posting interface. | |
81 | -# | |
82 | -sendmail_path = | |
83 | - | |
84 | -# newaliases_path: The full pathname of the Postfix newaliases command. | |
85 | -# This is the Sendmail-compatible command to build alias databases. | |
86 | -# | |
87 | -newaliases_path = | |
88 | - | |
89 | -# mailq_path: The full pathname of the Postfix mailq command. This | |
90 | -# is the Sendmail-compatible mail queue listing command. | |
91 | -# | |
92 | -mailq_path = | |
bf21c84b | 93 | |
830ba608 | 94 | # setgid_group: The group for mail submission and queue management |
95 | # commands. This must be a group name with a numerical group ID that | |
96 | # is not shared with other accounts, not even with the Postfix account. | |
97 | # | |
98 | -setgid_group = | |
30f1ed35 | 99 | - |
bf21c84b JK |
100 | -# html_directory: The location of the Postfix HTML documentation. |
101 | -# | |
102 | -html_directory = | |
30f1ed35 JK |
103 | +setgid_group = maildrop |
104 | ||
830ba608 | 105 | -# manpage_directory: The location of the Postfix on-line manual pages. |
106 | -# | |
107 | -manpage_directory = | |
5a9aead1 AG |
108 | +inet_protocols = ipv4 |
109 | ||
830ba608 | 110 | -# sample_directory: The location of the Postfix sample configuration files. |
bf21c84b | 111 | -# This parameter is obsolete as of Postfix 2.1. |
0ccf72cf JR |
112 | +# The unknown_address_reject_code parameter specifies the SMTP server |
113 | +# response when a client violates the reject_unknown_sender_domain | |
114 | +# or reject_unknown_recipient_domain restrictions. | |
5a9aead1 AG |
115 | # |
116 | -sample_directory = | |
117 | - | |
118 | -# readme_directory: The location of the Postfix README files. | |
1fc4ff6b | 119 | +# Contrary to what Wietse thinks (450) this should be 550 |
5a9aead1 AG |
120 | # |
121 | -readme_directory = | |
122 | -inet_protocols = ipv4 | |
0ccf72cf | 123 | +unknown_address_reject_code = 550 |
30f1ed35 JK |
124 | diff -dur -x '*~' -x '*.orig' -x '*.rej' postfix-2.11.0.orig/src/global/mail_params.h postfix-2.11.0/src/global/mail_params.h |
125 | --- postfix-2.11.0.orig/src/global/mail_params.h 2014-03-05 17:54:24.730740039 +0100 | |
126 | +++ postfix-2.11.0/src/global/mail_params.h 2014-03-05 17:54:54.260740308 +0100 | |
127 | @@ -67,7 +67,7 @@ | |
128 | extern gid_t var_owner_gid; | |
129 | ||
130 | #define VAR_SGID_GROUP "setgid_group" | |
131 | -#define DEF_SGID_GROUP "postdrop" | |
132 | +#define DEF_SGID_GROUP "maildrop" | |
133 | extern char *var_sgid_group; | |
134 | extern gid_t var_sgid_gid; | |
135 | ||
136 | diff -dur -x '*~' -x '*.orig' -x '*.rej' postfix-2.11.0.orig/src/util/sys_defs.h postfix-2.11.0/src/util/sys_defs.h | |
137 | --- postfix-2.11.0.orig/src/util/sys_defs.h 2014-03-05 17:54:24.944073374 +0100 | |
138 | +++ postfix-2.11.0/src/util/sys_defs.h 2014-03-05 17:58:20.204075514 +0100 | |
139 | @@ -769,7 +769,7 @@ | |
140 | #define HAS_FSYNC | |
141 | #define HAS_DB | |
142 | #define NATIVE_DB_TYPE "hash" | |
143 | -#define ALIAS_DB_MAP DEF_DB_TYPE ":/etc/aliases" | |
144 | +#define ALIAS_DB_MAP DEF_DB_TYPE ":/etc/mail/aliases" | |
145 | #ifndef NO_NIS | |
146 | #define HAS_NIS | |
5a9aead1 | 147 | #endif |