]>
Commit | Line | Data |
---|---|---|
3a8fb3b3 AM |
1 | diff -urN exim-4.64.org/src/EDITME exim-4.64/src/EDITME |
2 | --- exim-4.64.org/src/EDITME 2006-12-20 10:46:04.000000000 +0100 | |
d09678c6 | 3 | +++ exim-4.64/src/EDITME 2006-12-21 16:57:08.676246750 +0100 |
b5aad17c | 4 | @@ -100,7 +100,7 @@ |
a59efb33 AM |
5 | # /usr/local/sbin. The installation script will try to create this directory, |
6 | # and any superior directories, if they do not exist. | |
7 | ||
8 | -BIN_DIRECTORY=/usr/exim/bin | |
9 | +BIN_DIRECTORY=/usr/bin | |
10 | ||
11 | ||
12 | #------------------------------------------------------------------------------ | |
b5aad17c | 13 | @@ -116,7 +116,7 @@ |
02568c72 AM |
14 | # don't exist. It will also install a default runtime configuration if this |
15 | # file does not exist. | |
a59efb33 AM |
16 | |
17 | -CONFIGURE_FILE=/usr/exim/configure | |
18 | +CONFIGURE_FILE=/etc/mail/exim.conf | |
19 | ||
49288260 | 20 | # It is possible to specify a colon-separated list of files for CONFIGURE_FILE. |
21 | # In this case, Exim will use the first of them that exists when it is run. | |
b5aad17c | 22 | @@ -134,7 +134,8 @@ |
a59efb33 | 23 | # owner of a local mailbox.) Specifying these values as root is very strongly |
86166e68 | 24 | # discouraged. |
a59efb33 AM |
25 | |
26 | -EXIM_USER= | |
27 | +EXIM_UID=79 | |
28 | +EXIM_GID=79 | |
29 | ||
86166e68 | 30 | # If you specify EXIM_USER as a name, this is looked up at build time, and the |
31 | # uid number is built into the binary. However, you can specify that this | |
3a8fb3b3 | 32 | @@ -214,7 +215,7 @@ |
ee2e20a0 AM |
33 | |
34 | # This one is very special-purpose, so is not included by default. | |
35 | ||
36 | -# ROUTER_IPLOOKUP=yes | |
37 | +ROUTER_IPLOOKUP=yes | |
38 | ||
39 | ||
40 | #------------------------------------------------------------------------------ | |
3a8fb3b3 | 41 | @@ -235,7 +236,7 @@ |
a59efb33 AM |
42 | # This one is special-purpose, and commonly not required, so it is not |
43 | # included by default. | |
44 | ||
45 | -# TRANSPORT_LMTP=yes | |
46 | +TRANSPORT_LMTP=yes | |
47 | ||
48 | ||
49 | #------------------------------------------------------------------------------ | |
3a8fb3b3 | 50 | @@ -244,9 +245,9 @@ |
a59efb33 AM |
51 | # MBX, is included only when requested. If you do not know what this is about, |
52 | # leave these settings commented out. | |
53 | ||
54 | -# SUPPORT_MAILDIR=yes | |
55 | -# SUPPORT_MAILSTORE=yes | |
56 | -# SUPPORT_MBX=yes | |
57 | +SUPPORT_MAILDIR=yes | |
58 | +SUPPORT_MAILSTORE=yes | |
59 | +SUPPORT_MBX=yes | |
60 | ||
61 | ||
62 | #------------------------------------------------------------------------------ | |
f4d0d081 | 63 | @@ -263,15 +264,15 @@ |
a59efb33 | 64 | LOOKUP_LSEARCH=yes |
c33d15a3 | 65 | LOOKUP_DNSDB=yes |
a59efb33 AM |
66 | |
67 | -# LOOKUP_CDB=yes | |
02568c72 | 68 | -# LOOKUP_DSEARCH=yes |
2d19282f | 69 | +LOOKUP_CDB=yes |
02568c72 | 70 | +LOOKUP_DSEARCH=yes |
07713049 | 71 | # LOOKUP_IBASE=yes |
a59efb33 | 72 | # LOOKUP_LDAP=yes |
02568c72 | 73 | # LOOKUP_MYSQL=yes |
90120299 | 74 | # LOOKUP_MYSQL_PC=mariadb |
02568c72 | 75 | # LOOKUP_NIS=yes |
2d19282f AM |
76 | # LOOKUP_NISPLUS=yes |
77 | # LOOKUP_ORACLE=yes | |
78 | -# LOOKUP_PASSWD=yes | |
79 | +LOOKUP_PASSWD=yes | |
80 | # LOOKUP_PGSQL=yes | |
3a8fb3b3 | 81 | # LOOKUP_SQLITE=yes |
69cd3d0e | 82 | @@ -391,7 +391,7 @@ EXIM_MONITOR=eximon.bin |
b5aad17c AM |
83 | # and the MIME ACL. Please read the documentation to learn more about these |
84 | # features. | |
85 | ||
86 | -# WITH_CONTENT_SCAN=yes | |
87 | +WITH_CONTENT_SCAN=yes | |
88 | ||
b5aad17c | 89 | #------------------------------------------------------------------------------ |
69cd3d0e | 90 | # If you're using ClamAV and are backporting fixes to an old version, instead |
f4d0d081 | 91 | @@ -629,15 +630,15 @@ FIXED_NEVER_USERS=root |
a59efb33 AM |
92 | # included in the Exim binary. You will then need to set up the run time |
93 | # configuration to make use of the mechanism(s) selected. | |
94 | ||
95 | -# AUTH_CRAM_MD5=yes | |
b5aad17c AM |
96 | +AUTH_CRAM_MD5=yes |
97 | # AUTH_CYRUS_SASL=yes | |
d09678c6 | 98 | -# AUTH_DOVECOT=yes |
362e143b AM |
99 | +AUTH_DOVECOT=yes |
100 | # AUTH_GSASL=yes | |
101 | # AUTH_GSASL_PC=libgsasl | |
102 | # AUTH_HEIMDAL_GSSAPI=yes | |
103 | # AUTH_HEIMDAL_GSSAPI_PC=heimdal-gssapi | |
ef320990 | 104 | # AUTH_HEIMDAL_GSSAPI_PC=heimdal-gssapi heimdal-krb5 |
a59efb33 | 105 | -# AUTH_PLAINTEXT=yes |
02568c72 | 106 | -# AUTH_SPA=yes |
f4d0d081 | 107 | -# AUTH_TLS=yes |
a59efb33 | 108 | +AUTH_PLAINTEXT=yes |
02568c72 | 109 | +AUTH_SPA=yes |
f4d0d081 | 110 | +AUTH_TLS=yes |
a59efb33 | 111 | |
f4d0d081 | 112 | @@ -610,7 +611,7 @@ |
e462f7e8 AM |
113 | # one that is set in the headers_charset option. The default setting is |
114 | # defined by this setting: | |
115 | ||
116 | -HEADERS_CHARSET="ISO-8859-1" | |
117 | +HEADERS_CHARSET="UTF-8" | |
118 | ||
119 | # If you are going to make use of $header_xxx expansions in your configuration | |
120 | # file, or if your users are going to use them in filter files, and the normal | |
f4d0d081 | 121 | @@ -690,11 +691,11 @@ |
49288260 | 122 | # leave these settings commented out. |
a59efb33 | 123 | |
49288260 | 124 | # This setting is required for any TLS support (either OpenSSL or GnuTLS) |
a59efb33 | 125 | -# SUPPORT_TLS=yes |
a59efb33 | 126 | +SUPPORT_TLS=yes |
49288260 | 127 | |
362e143b AM |
128 | # Uncomment one of these settings if you are using OpenSSL; pkg-config vs not |
129 | -# USE_OPENSSL_PC=openssl | |
49288260 | 130 | -# TLS_LIBS=-lssl -lcrypto |
362e143b | 131 | +USE_OPENSSL_PC=openssl |
a59efb33 AM |
132 | +TLS_LIBS=-lssl -lcrypto |
133 | ||
362e143b AM |
134 | # Uncomment the first and either the second or the third of these if you |
135 | # are using GnuTLS. If you have pkg-config, then the second, else the third. | |
3a8fb3b3 | 136 | @@ -630,7 +631,7 @@ |
a59efb33 AM |
137 | # Once you have done this, "make install" will build the info files and |
138 | # install them in the directory you have defined. | |
139 | ||
140 | -# INFO_DIRECTORY=/usr/share/info | |
141 | +INFO_DIRECTORY=/usr/share/info | |
142 | ||
143 | ||
144 | #------------------------------------------------------------------------------ | |
3a8fb3b3 | 145 | @@ -643,7 +644,7 @@ |
a59efb33 AM |
146 | # %s. This will be replaced by one of the strings "main", "panic", or "reject" |
147 | # to form the final file names. Some installations may want something like this: | |
148 | ||
149 | -# LOG_FILE_PATH=/var/log/exim_%slog | |
150 | +LOG_FILE_PATH=/var/log/exim/%s.log | |
151 | ||
152 | # which results in files with names /var/log/exim_mainlog, etc. The directory | |
153 | # in which the log files are placed must exist; Exim does not try to create | |
3a8fb3b3 | 154 | @@ -692,7 +693,7 @@ |
a59efb33 AM |
155 | # files. Both the name of the command and the suffix that it adds to files |
156 | # need to be defined here. See also the EXICYCLOG_MAX configuration. | |
157 | ||
158 | -COMPRESS_COMMAND=/usr/bin/gzip | |
159 | +COMPRESS_COMMAND=/bin/gzip | |
160 | COMPRESS_SUFFIX=gz | |
161 | ||
162 | ||
3a8fb3b3 | 163 | @@ -700,7 +701,7 @@ |
f4d0d081 AM |
164 | # ZCAT_COMMAND=zcat |
165 | # | |
166 | # Or specify the full pathname: | |
a59efb33 AM |
167 | -ZCAT_COMMAND=/usr/bin/zcat |
168 | +ZCAT_COMMAND=/bin/zcat | |
169 | ||
a59efb33 | 170 | #------------------------------------------------------------------------------ |
f4d0d081 | 171 | # Compiling in support for embedded Perl: If you want to be able to |
3a8fb3b3 | 172 | @@ -709,7 +710,7 @@ |
a59efb33 AM |
173 | # (version 5.004 or later) installed, set EXIM_PERL to perl.o. Using embedded |
174 | # Perl costs quite a lot of resources. Only do this if you really need it. | |
175 | ||
176 | -# EXIM_PERL=perl.o | |
177 | +EXIM_PERL=perl.o | |
178 | ||
179 | ||
180 | #------------------------------------------------------------------------------ | |
3a8fb3b3 AM |
181 | @@ -719,7 +720,7 @@ |
182 | # that the local_scan API is made available by the linker. You may also need | |
183 | # to add -ldl to EXTRALIBS so that dlopen() is available to Exim. | |
48a0e242 AM |
184 | |
185 | -# EXPAND_DLFUNC=yes | |
186 | +EXPAND_DLFUNC=yes | |
187 | ||
188 | ||
189 | #------------------------------------------------------------------------------ | |
3a8fb3b3 | 190 | @@ -729,11 +730,12 @@ |
a59efb33 AM |
191 | # support, which is intended for use in conjunction with the SMTP AUTH |
192 | # facilities, is included only when requested by the following setting: | |
193 | ||
194 | -# SUPPORT_PAM=yes | |
195 | +SUPPORT_PAM=yes | |
196 | ||
197 | # You probably need to add -lpam to EXTRALIBS, and in some releases of | |
198 | # GNU/Linux -ldl is also needed. | |
199 | ||
200 | +EXTRALIBS=-lpam -ldl | |
201 | ||
202 | #------------------------------------------------------------------------------ | |
203 | # Support for authentication via Radius is also available. The Exim support, | |
3a8fb3b3 | 204 | @@ -780,7 +782,7 @@ |
02568c72 AM |
205 | # /var/pwcheck) and chown it to exim's user and group. Once you have installed |
206 | # pwcheck, you should arrange for it to be started by root at boot time. | |
ecc5bdcd ŁJM |
207 | |
208 | -# CYRUS_PWCHECK_SOCKET=/var/pwcheck/pwcheck | |
209 | +CYRUS_PWCHECK_SOCKET=/var/lib/sasl/mux | |
210 | ||
211 | ||
212 | #------------------------------------------------------------------------------ | |
3a8fb3b3 | 213 | @@ -797,7 +799,7 @@ |
02568c72 AM |
214 | # group. Once you have installed saslauthd, you should arrange for it to be |
215 | # started by root at boot time. | |
216 | ||
217 | -# CYRUS_SASLAUTHD_SOCKET=/var/state/saslauthd/mux | |
218 | +CYRUS_SASLAUTHD_SOCKET=/var/lib/sasl2/mux | |
219 | ||
220 | ||
221 | #------------------------------------------------------------------------------ | |
3a8fb3b3 | 222 | @@ -857,7 +859,7 @@ |
ee2e20a0 AM |
223 | # is "yes", as well as supporting line editing, a history of input lines in the |
224 | # current run is maintained. | |
225 | ||
226 | -# USE_READLINE=yes | |
227 | +USE_READLINE=yes | |
228 | ||
3a8fb3b3 | 229 | # You may need to add -ldl to EXTRALIBS when you set USE_READLINE=yes. |
b5aad17c | 230 | # Note that this option adds to the size of the Exim binary, because the |
3a8fb3b3 | 231 | @@ -932,7 +934,7 @@ |
a59efb33 AM |
232 | # period (for example, /usr/exim/configure.host.in.some.domain). If this file |
233 | # does not exist, then the bare configuration file name is tried. | |
234 | ||
235 | -# CONFIGURE_FILE_USE_NODE=yes | |
236 | +CONFIGURE_FILE_USE_NODE=yes | |
237 | ||
238 | ||
239 | #------------------------------------------------------------------------------ | |
3a8fb3b3 | 240 | @@ -1105,7 +1107,7 @@ |
a59efb33 AM |
241 | # be changed here. The default is 0640 so that information from the spool is |
242 | # available to anyone who is a member of the Exim group. | |
243 | ||
244 | -# SPOOL_MODE=0640 | |
245 | +SPOOL_MODE=0640 | |
246 | ||
247 | ||
248 | #------------------------------------------------------------------------------ | |
f4d0d081 | 249 | @@ -1164,6 +1166,6 @@ |
f5c2c23d AM |
250 | # feature should only be used in very exceptional circumstances. YOU HAVE BEEN |
251 | # WARNED. | |
252 | ||
253 | -# ENABLE_DISABLE_FSYNC=yes | |
254 | +ENABLE_DISABLE_FSYNC=yes | |
255 | ||
256 | # End of EDITME for Exim 4. |