]>
Commit | Line | Data |
---|---|---|
b19ec081 AM |
1 | diff -urN exim-4.24.org/src/EDITME exim-4.24/src/EDITME |
2 | --- exim-4.24.org/src/EDITME 2003-09-22 20:54:22.000000000 +0200 | |
3 | +++ exim-4.24/src/EDITME 2003-09-22 20:56:04.000000000 +0200 | |
32f9109c AM |
4 | @@ -98,7 +98,7 @@ |
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 | #------------------------------------------------------------------------------ | |
d53e0fbb AM |
13 | @@ -114,7 +114,7 @@ |
14 | # don't exist. It will also install a default runtime configuration if this | |
15 | # file does not exist. | |
32f9109c AM |
16 | |
17 | -CONFIGURE_FILE=/usr/exim/configure | |
18 | +CONFIGURE_FILE=/etc/mail/exim.conf | |
19 | ||
9a8356f9 | 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. | |
d53e0fbb | 22 | @@ -132,7 +132,8 @@ |
32f9109c AM |
23 | # owner of a local mailbox.) Specifying these values as root is very strongly |
24 | # discouraged. These values are compiled into the binary. | |
25 | ||
26 | -EXIM_USER= | |
27 | +EXIM_UID=79 | |
28 | +EXIM_GID=79 | |
29 | ||
30 | # If the setting of EXIM_USER is numeric (e.g. EXIM_USER=42), there must | |
31 | # also be a setting of EXIM_GROUP. If, on the other hand, you use a name | |
d53e0fbb | 32 | @@ -213,7 +214,7 @@ |
32f9109c AM |
33 | # This one is special-purpose, and commonly not required, so it is not |
34 | # included by default. | |
35 | ||
36 | -# TRANSPORT_LMTP=yes | |
37 | +TRANSPORT_LMTP=yes | |
38 | ||
39 | ||
40 | #------------------------------------------------------------------------------ | |
d53e0fbb | 41 | @@ -222,9 +223,9 @@ |
32f9109c AM |
42 | # MBX, is included only when requested. If you do not know what this is about, |
43 | # leave these settings commented out. | |
44 | ||
45 | -# SUPPORT_MAILDIR=yes | |
46 | -# SUPPORT_MAILSTORE=yes | |
47 | -# SUPPORT_MBX=yes | |
48 | +SUPPORT_MAILDIR=yes | |
49 | +SUPPORT_MAILSTORE=yes | |
50 | +SUPPORT_MBX=yes | |
51 | ||
52 | ||
53 | #------------------------------------------------------------------------------ | |
b19ec081 | 54 | @@ -239,20 +240,20 @@ |
32f9109c AM |
55 | LOOKUP_DBM=yes |
56 | LOOKUP_LSEARCH=yes | |
57 | ||
58 | -# LOOKUP_CDB=yes | |
37c3e2fc | 59 | -# LOOKUP_DNSDB=yes |
d53e0fbb | 60 | -# LOOKUP_DSEARCH=yes |
37c3e2fc AM |
61 | +LOOKUP_CDB=yes |
62 | +LOOKUP_DNSDB=yes | |
d53e0fbb | 63 | +LOOKUP_DSEARCH=yes |
b19ec081 | 64 | # LOOKUP_IBASE=yes |
32f9109c | 65 | # LOOKUP_LDAP=yes |
d53e0fbb AM |
66 | # LOOKUP_MYSQL=yes |
67 | # LOOKUP_NIS=yes | |
37c3e2fc AM |
68 | # LOOKUP_NISPLUS=yes |
69 | # LOOKUP_ORACLE=yes | |
70 | -# LOOKUP_PASSWD=yes | |
71 | +LOOKUP_PASSWD=yes | |
72 | # LOOKUP_PGSQL=yes | |
73 | # LOOKUP_WHOSON=yes | |
74 | -# LOOKUP_WILDLSEARCH=yes | |
b19ec081 | 75 | -# LOOKUP_NWILDLSEARCH=yes |
37c3e2fc | 76 | +LOOKUP_WILDLSEARCH=yes |
b19ec081 | 77 | +LOOKUP_NWILDLSEARCH=yes |
37c3e2fc AM |
78 | |
79 | ||
80 | #------------------------------------------------------------------------------ | |
b19ec081 | 81 | @@ -365,9 +366,9 @@ |
32f9109c AM |
82 | # included in the Exim binary. You will then need to set up the run time |
83 | # configuration to make use of the mechanism(s) selected. | |
84 | ||
85 | -# AUTH_CRAM_MD5=yes | |
86 | -# AUTH_PLAINTEXT=yes | |
d53e0fbb | 87 | -# AUTH_SPA=yes |
32f9109c AM |
88 | +AUTH_CRAM_MD5=yes |
89 | +AUTH_PLAINTEXT=yes | |
d53e0fbb | 90 | +AUTH_SPA=yes |
32f9109c AM |
91 | |
92 | ||
d53e0fbb | 93 | #------------------------------------------------------------------------------ |
b19ec081 | 94 | @@ -445,10 +446,10 @@ |
9a8356f9 | 95 | # leave these settings commented out. |
32f9109c | 96 | |
9a8356f9 | 97 | # This setting is required for any TLS support (either OpenSSL or GnuTLS) |
32f9109c | 98 | -# SUPPORT_TLS=yes |
32f9109c | 99 | +SUPPORT_TLS=yes |
9a8356f9 | 100 | |
101 | # Uncomment this setting if you are using OpenSSL | |
102 | -# TLS_LIBS=-lssl -lcrypto | |
32f9109c AM |
103 | +TLS_LIBS=-lssl -lcrypto |
104 | ||
9a8356f9 | 105 | # Uncomment these settings if you are using GnuTLS |
106 | # USE_GNUTLS=yes | |
b19ec081 | 107 | @@ -499,7 +500,7 @@ |
32f9109c AM |
108 | # Once you have done this, "make install" will build the info files and |
109 | # install them in the directory you have defined. | |
110 | ||
111 | -# INFO_DIRECTORY=/usr/share/info | |
112 | +INFO_DIRECTORY=/usr/share/info | |
113 | ||
114 | ||
115 | #------------------------------------------------------------------------------ | |
b19ec081 | 116 | @@ -512,7 +513,7 @@ |
32f9109c AM |
117 | # %s. This will be replaced by one of the strings "main", "panic", or "reject" |
118 | # to form the final file names. Some installations may want something like this: | |
119 | ||
120 | -# LOG_FILE_PATH=/var/log/exim_%slog | |
121 | +LOG_FILE_PATH=/var/log/exim/%s.log | |
122 | ||
123 | # which results in files with names /var/log/exim_mainlog, etc. The directory | |
124 | # in which the log files are placed must exist; Exim does not try to create | |
b19ec081 | 125 | @@ -561,7 +562,7 @@ |
32f9109c AM |
126 | # files. Both the name of the command and the suffix that it adds to files |
127 | # need to be defined here. See also the EXICYCLOG_MAX configuration. | |
128 | ||
129 | -COMPRESS_COMMAND=/usr/bin/gzip | |
130 | +COMPRESS_COMMAND=/bin/gzip | |
131 | COMPRESS_SUFFIX=gz | |
132 | ||
133 | ||
b19ec081 | 134 | @@ -569,7 +570,7 @@ |
32f9109c AM |
135 | # If the exigrep utility is fed compressed log files, it tries to uncompress |
136 | # them using this command. | |
137 | ||
138 | -ZCAT_COMMAND=/usr/bin/zcat | |
139 | +ZCAT_COMMAND=/bin/zcat | |
140 | ||
141 | ||
142 | #------------------------------------------------------------------------------ | |
b19ec081 | 143 | @@ -578,7 +579,7 @@ |
32f9109c AM |
144 | # (version 5.004 or later) installed, set EXIM_PERL to perl.o. Using embedded |
145 | # Perl costs quite a lot of resources. Only do this if you really need it. | |
146 | ||
147 | -# EXIM_PERL=perl.o | |
148 | +EXIM_PERL=perl.o | |
149 | ||
150 | ||
151 | #------------------------------------------------------------------------------ | |
b19ec081 | 152 | @@ -588,11 +589,12 @@ |
32f9109c AM |
153 | # support, which is intended for use in conjunction with the SMTP AUTH |
154 | # facilities, is included only when requested by the following setting: | |
155 | ||
156 | -# SUPPORT_PAM=yes | |
157 | +SUPPORT_PAM=yes | |
158 | ||
159 | # You probably need to add -lpam to EXTRALIBS, and in some releases of | |
160 | # GNU/Linux -ldl is also needed. | |
161 | ||
162 | +EXTRALIBS=-lpam -ldl | |
163 | ||
164 | #------------------------------------------------------------------------------ | |
165 | # Support for authentication via Radius is also available. The Exim support, | |
b19ec081 | 166 | @@ -617,7 +619,7 @@ |
d53e0fbb AM |
167 | # /var/pwcheck) and chown it to exim's user and group. Once you have installed |
168 | # pwcheck, you should arrange for it to be started by root at boot time. | |
13278cdd ŁJM |
169 | |
170 | -# CYRUS_PWCHECK_SOCKET=/var/pwcheck/pwcheck | |
171 | +CYRUS_PWCHECK_SOCKET=/var/lib/sasl/mux | |
172 | ||
173 | ||
174 | #------------------------------------------------------------------------------ | |
b19ec081 | 175 | @@ -634,7 +636,7 @@ |
d53e0fbb AM |
176 | # group. Once you have installed saslauthd, you should arrange for it to be |
177 | # started by root at boot time. | |
178 | ||
179 | -# CYRUS_SASLAUTHD_SOCKET=/var/state/saslauthd/mux | |
180 | +CYRUS_SASLAUTHD_SOCKET=/var/lib/sasl2/mux | |
181 | ||
182 | ||
183 | #------------------------------------------------------------------------------ | |
b19ec081 | 184 | @@ -746,7 +748,7 @@ |
32f9109c AM |
185 | # period (for example, /usr/exim/configure.host.in.some.domain). If this file |
186 | # does not exist, then the bare configuration file name is tried. | |
187 | ||
188 | -# CONFIGURE_FILE_USE_NODE=yes | |
189 | +CONFIGURE_FILE_USE_NODE=yes | |
190 | ||
191 | ||
192 | #------------------------------------------------------------------------------ | |
b19ec081 | 193 | @@ -896,7 +898,7 @@ |
32f9109c AM |
194 | # (process id) to a file so that it can easily be identified. The path of the |
195 | # file can be specified here. Some installations may want something like this: | |
196 | ||
197 | -# PID_FILE_PATH=/var/lock/exim.pid | |
198 | +PID_FILE_PATH=/var/run/exim%s.pid | |
199 | ||
200 | # If PID_FILE_PATH is not defined, Exim writes a file in its spool directory | |
201 | # using the name "exim-daemon.pid". | |
b19ec081 | 202 | @@ -919,7 +921,7 @@ |
32f9109c AM |
203 | # be changed here. The default is 0640 so that information from the spool is |
204 | # available to anyone who is a member of the Exim group. | |
205 | ||
206 | -# SPOOL_MODE=0640 | |
207 | +SPOOL_MODE=0640 | |
208 | ||
209 | ||
210 | #------------------------------------------------------------------------------ |