]>
Commit | Line | Data |
---|---|---|
ee2e20a0 AM |
1 | diff -urN exim-4.43.org/src/EDITME exim-4.43/src/EDITME |
2 | --- exim-4.43.org/src/EDITME 2004-10-07 14:25:49.533597214 +0200 | |
3 | +++ exim-4.43/src/EDITME 2004-10-07 14:28:22.292872122 +0200 | |
a59efb33 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 | #------------------------------------------------------------------------------ | |
02568c72 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. | |
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. | |
02568c72 | 22 | @@ -132,7 +132,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 | |
ee2e20a0 AM |
32 | @@ -206,7 +207,7 @@ |
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 | #------------------------------------------------------------------------------ | |
86166e68 | 41 | @@ -227,7 +228,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 | #------------------------------------------------------------------------------ | |
86166e68 | 50 | @@ -236,9 +237,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 | #------------------------------------------------------------------------------ | |
86166e68 | 63 | @@ -253,16 +254,16 @@ |
a59efb33 AM |
64 | LOOKUP_DBM=yes |
65 | LOOKUP_LSEARCH=yes | |
66 | ||
67 | -# LOOKUP_CDB=yes | |
2d19282f | 68 | -# LOOKUP_DNSDB=yes |
02568c72 | 69 | -# LOOKUP_DSEARCH=yes |
2d19282f AM |
70 | +LOOKUP_CDB=yes |
71 | +LOOKUP_DNSDB=yes | |
02568c72 | 72 | +LOOKUP_DSEARCH=yes |
07713049 | 73 | # LOOKUP_IBASE=yes |
a59efb33 | 74 | # LOOKUP_LDAP=yes |
02568c72 AM |
75 | # LOOKUP_MYSQL=yes |
76 | # LOOKUP_NIS=yes | |
2d19282f AM |
77 | # LOOKUP_NISPLUS=yes |
78 | # LOOKUP_ORACLE=yes | |
79 | -# LOOKUP_PASSWD=yes | |
80 | +LOOKUP_PASSWD=yes | |
81 | # LOOKUP_PGSQL=yes | |
82 | # LOOKUP_WHOSON=yes | |
2d19282f | 83 | |
ee2e20a0 | 84 | @@ -406,10 +407,10 @@ |
a59efb33 AM |
85 | # included in the Exim binary. You will then need to set up the run time |
86 | # configuration to make use of the mechanism(s) selected. | |
87 | ||
88 | -# AUTH_CRAM_MD5=yes | |
9f023285 | 89 | -# AUTH_CYRUS_SASL=yes |
a59efb33 | 90 | -# AUTH_PLAINTEXT=yes |
02568c72 | 91 | -# AUTH_SPA=yes |
a59efb33 | 92 | +AUTH_CRAM_MD5=yes |
9f023285 | 93 | +AUTH_CYRUS_SASL=yes |
a59efb33 | 94 | +AUTH_PLAINTEXT=yes |
02568c72 | 95 | +AUTH_SPA=yes |
a59efb33 AM |
96 | |
97 | ||
02568c72 | 98 | #------------------------------------------------------------------------------ |
ee2e20a0 | 99 | @@ -495,10 +496,10 @@ |
49288260 | 100 | # leave these settings commented out. |
a59efb33 | 101 | |
49288260 | 102 | # This setting is required for any TLS support (either OpenSSL or GnuTLS) |
a59efb33 | 103 | -# SUPPORT_TLS=yes |
a59efb33 | 104 | +SUPPORT_TLS=yes |
49288260 | 105 | |
106 | # Uncomment this setting if you are using OpenSSL | |
107 | -# TLS_LIBS=-lssl -lcrypto | |
a59efb33 AM |
108 | +TLS_LIBS=-lssl -lcrypto |
109 | ||
49288260 | 110 | # Uncomment these settings if you are using GnuTLS |
111 | # USE_GNUTLS=yes | |
ee2e20a0 | 112 | @@ -549,7 +550,7 @@ |
a59efb33 AM |
113 | # Once you have done this, "make install" will build the info files and |
114 | # install them in the directory you have defined. | |
115 | ||
116 | -# INFO_DIRECTORY=/usr/share/info | |
117 | +INFO_DIRECTORY=/usr/share/info | |
118 | ||
119 | ||
120 | #------------------------------------------------------------------------------ | |
ee2e20a0 | 121 | @@ -562,7 +563,7 @@ |
a59efb33 AM |
122 | # %s. This will be replaced by one of the strings "main", "panic", or "reject" |
123 | # to form the final file names. Some installations may want something like this: | |
124 | ||
125 | -# LOG_FILE_PATH=/var/log/exim_%slog | |
126 | +LOG_FILE_PATH=/var/log/exim/%s.log | |
127 | ||
128 | # which results in files with names /var/log/exim_mainlog, etc. The directory | |
129 | # in which the log files are placed must exist; Exim does not try to create | |
ee2e20a0 | 130 | @@ -611,7 +612,7 @@ |
a59efb33 AM |
131 | # files. Both the name of the command and the suffix that it adds to files |
132 | # need to be defined here. See also the EXICYCLOG_MAX configuration. | |
133 | ||
134 | -COMPRESS_COMMAND=/usr/bin/gzip | |
135 | +COMPRESS_COMMAND=/bin/gzip | |
136 | COMPRESS_SUFFIX=gz | |
137 | ||
138 | ||
ee2e20a0 | 139 | @@ -619,7 +620,7 @@ |
a59efb33 AM |
140 | # If the exigrep utility is fed compressed log files, it tries to uncompress |
141 | # them using this command. | |
142 | ||
143 | -ZCAT_COMMAND=/usr/bin/zcat | |
144 | +ZCAT_COMMAND=/bin/zcat | |
145 | ||
146 | ||
147 | #------------------------------------------------------------------------------ | |
ee2e20a0 | 148 | @@ -628,7 +629,7 @@ |
a59efb33 AM |
149 | # (version 5.004 or later) installed, set EXIM_PERL to perl.o. Using embedded |
150 | # Perl costs quite a lot of resources. Only do this if you really need it. | |
151 | ||
152 | -# EXIM_PERL=perl.o | |
153 | +EXIM_PERL=perl.o | |
154 | ||
155 | ||
156 | #------------------------------------------------------------------------------ | |
ee2e20a0 | 157 | @@ -638,11 +639,12 @@ |
a59efb33 AM |
158 | # support, which is intended for use in conjunction with the SMTP AUTH |
159 | # facilities, is included only when requested by the following setting: | |
160 | ||
161 | -# SUPPORT_PAM=yes | |
162 | +SUPPORT_PAM=yes | |
163 | ||
164 | # You probably need to add -lpam to EXTRALIBS, and in some releases of | |
165 | # GNU/Linux -ldl is also needed. | |
166 | ||
167 | +EXTRALIBS=-lpam -ldl | |
168 | ||
169 | #------------------------------------------------------------------------------ | |
170 | # Support for authentication via Radius is also available. The Exim support, | |
ee2e20a0 | 171 | @@ -682,7 +684,7 @@ |
02568c72 AM |
172 | # /var/pwcheck) and chown it to exim's user and group. Once you have installed |
173 | # pwcheck, you should arrange for it to be started by root at boot time. | |
ecc5bdcd ŁJM |
174 | |
175 | -# CYRUS_PWCHECK_SOCKET=/var/pwcheck/pwcheck | |
176 | +CYRUS_PWCHECK_SOCKET=/var/lib/sasl/mux | |
177 | ||
178 | ||
179 | #------------------------------------------------------------------------------ | |
ee2e20a0 | 180 | @@ -699,7 +701,7 @@ |
02568c72 AM |
181 | # group. Once you have installed saslauthd, you should arrange for it to be |
182 | # started by root at boot time. | |
183 | ||
184 | -# CYRUS_SASLAUTHD_SOCKET=/var/state/saslauthd/mux | |
185 | +CYRUS_SASLAUTHD_SOCKET=/var/lib/sasl2/mux | |
186 | ||
187 | ||
188 | #------------------------------------------------------------------------------ | |
ee2e20a0 AM |
189 | @@ -759,7 +761,7 @@ |
190 | # is "yes", as well as supporting line editing, a history of input lines in the | |
191 | # current run is maintained. | |
192 | ||
193 | -# USE_READLINE=yes | |
194 | +USE_READLINE=yes | |
195 | ||
196 | ||
197 | ||
198 | @@ -830,7 +832,7 @@ | |
a59efb33 AM |
199 | # period (for example, /usr/exim/configure.host.in.some.domain). If this file |
200 | # does not exist, then the bare configuration file name is tried. | |
201 | ||
202 | -# CONFIGURE_FILE_USE_NODE=yes | |
203 | +CONFIGURE_FILE_USE_NODE=yes | |
204 | ||
205 | ||
206 | #------------------------------------------------------------------------------ | |
ee2e20a0 | 207 | @@ -1003,7 +1005,7 @@ |
a59efb33 AM |
208 | # be changed here. The default is 0640 so that information from the spool is |
209 | # available to anyone who is a member of the Exim group. | |
210 | ||
211 | -# SPOOL_MODE=0640 | |
212 | +SPOOL_MODE=0640 | |
213 | ||
214 | ||
215 | #------------------------------------------------------------------------------ |