]>
Commit | Line | Data |
---|---|---|
2d19282f AM |
1 | diff -urN exim-4.22.org/src/EDITME exim-4.22/src/EDITME |
2 | --- exim-4.22.org/src/EDITME 2003-09-03 23:36:28.000000000 +0200 | |
3 | +++ exim-4.22/src/EDITME 2003-09-03 23:38:08.000000000 +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 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 | |
02568c72 | 32 | @@ -213,7 +214,7 @@ |
a59efb33 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 | #------------------------------------------------------------------------------ | |
02568c72 | 41 | @@ -222,9 +223,9 @@ |
a59efb33 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 | #------------------------------------------------------------------------------ | |
2d19282f | 54 | @@ -239,18 +240,18 @@ |
a59efb33 AM |
55 | LOOKUP_DBM=yes |
56 | LOOKUP_LSEARCH=yes | |
57 | ||
58 | -# LOOKUP_CDB=yes | |
2d19282f | 59 | -# LOOKUP_DNSDB=yes |
02568c72 | 60 | -# LOOKUP_DSEARCH=yes |
2d19282f AM |
61 | +LOOKUP_CDB=yes |
62 | +LOOKUP_DNSDB=yes | |
02568c72 | 63 | +LOOKUP_DSEARCH=yes |
a59efb33 | 64 | # LOOKUP_LDAP=yes |
02568c72 AM |
65 | # LOOKUP_MYSQL=yes |
66 | # LOOKUP_NIS=yes | |
2d19282f AM |
67 | # LOOKUP_NISPLUS=yes |
68 | # LOOKUP_ORACLE=yes | |
69 | -# LOOKUP_PASSWD=yes | |
70 | +LOOKUP_PASSWD=yes | |
71 | # LOOKUP_PGSQL=yes | |
72 | # LOOKUP_WHOSON=yes | |
73 | -# LOOKUP_WILDLSEARCH=yes | |
74 | +LOOKUP_WILDLSEARCH=yes | |
75 | ||
76 | ||
77 | #------------------------------------------------------------------------------ | |
02568c72 | 78 | @@ -310,9 +311,9 @@ |
a59efb33 AM |
79 | # included in the Exim binary. You will then need to set up the run time |
80 | # configuration to make use of the mechanism(s) selected. | |
81 | ||
82 | -# AUTH_CRAM_MD5=yes | |
83 | -# AUTH_PLAINTEXT=yes | |
02568c72 | 84 | -# AUTH_SPA=yes |
a59efb33 AM |
85 | +AUTH_CRAM_MD5=yes |
86 | +AUTH_PLAINTEXT=yes | |
02568c72 | 87 | +AUTH_SPA=yes |
a59efb33 AM |
88 | |
89 | ||
02568c72 | 90 | #------------------------------------------------------------------------------ |
2d19282f | 91 | @@ -390,10 +391,10 @@ |
49288260 | 92 | # leave these settings commented out. |
a59efb33 | 93 | |
49288260 | 94 | # This setting is required for any TLS support (either OpenSSL or GnuTLS) |
a59efb33 | 95 | -# SUPPORT_TLS=yes |
a59efb33 | 96 | +SUPPORT_TLS=yes |
49288260 | 97 | |
98 | # Uncomment this setting if you are using OpenSSL | |
99 | -# TLS_LIBS=-lssl -lcrypto | |
a59efb33 AM |
100 | +TLS_LIBS=-lssl -lcrypto |
101 | ||
49288260 | 102 | # Uncomment these settings if you are using GnuTLS |
103 | # USE_GNUTLS=yes | |
2d19282f | 104 | @@ -444,7 +445,7 @@ |
a59efb33 AM |
105 | # Once you have done this, "make install" will build the info files and |
106 | # install them in the directory you have defined. | |
107 | ||
108 | -# INFO_DIRECTORY=/usr/share/info | |
109 | +INFO_DIRECTORY=/usr/share/info | |
110 | ||
111 | ||
112 | #------------------------------------------------------------------------------ | |
2d19282f | 113 | @@ -457,7 +458,7 @@ |
a59efb33 AM |
114 | # %s. This will be replaced by one of the strings "main", "panic", or "reject" |
115 | # to form the final file names. Some installations may want something like this: | |
116 | ||
117 | -# LOG_FILE_PATH=/var/log/exim_%slog | |
118 | +LOG_FILE_PATH=/var/log/exim/%s.log | |
119 | ||
120 | # which results in files with names /var/log/exim_mainlog, etc. The directory | |
121 | # in which the log files are placed must exist; Exim does not try to create | |
2d19282f | 122 | @@ -506,7 +507,7 @@ |
a59efb33 AM |
123 | # files. Both the name of the command and the suffix that it adds to files |
124 | # need to be defined here. See also the EXICYCLOG_MAX configuration. | |
125 | ||
126 | -COMPRESS_COMMAND=/usr/bin/gzip | |
127 | +COMPRESS_COMMAND=/bin/gzip | |
128 | COMPRESS_SUFFIX=gz | |
129 | ||
130 | ||
2d19282f | 131 | @@ -514,7 +515,7 @@ |
a59efb33 AM |
132 | # If the exigrep utility is fed compressed log files, it tries to uncompress |
133 | # them using this command. | |
134 | ||
135 | -ZCAT_COMMAND=/usr/bin/zcat | |
136 | +ZCAT_COMMAND=/bin/zcat | |
137 | ||
138 | ||
139 | #------------------------------------------------------------------------------ | |
2d19282f | 140 | @@ -523,7 +524,7 @@ |
a59efb33 AM |
141 | # (version 5.004 or later) installed, set EXIM_PERL to perl.o. Using embedded |
142 | # Perl costs quite a lot of resources. Only do this if you really need it. | |
143 | ||
144 | -# EXIM_PERL=perl.o | |
145 | +EXIM_PERL=perl.o | |
146 | ||
147 | ||
148 | #------------------------------------------------------------------------------ | |
2d19282f | 149 | @@ -533,11 +534,12 @@ |
a59efb33 AM |
150 | # support, which is intended for use in conjunction with the SMTP AUTH |
151 | # facilities, is included only when requested by the following setting: | |
152 | ||
153 | -# SUPPORT_PAM=yes | |
154 | +SUPPORT_PAM=yes | |
155 | ||
156 | # You probably need to add -lpam to EXTRALIBS, and in some releases of | |
157 | # GNU/Linux -ldl is also needed. | |
158 | ||
159 | +EXTRALIBS=-lpam -ldl | |
160 | ||
161 | #------------------------------------------------------------------------------ | |
162 | # Support for authentication via Radius is also available. The Exim support, | |
2d19282f | 163 | @@ -562,7 +564,7 @@ |
02568c72 AM |
164 | # /var/pwcheck) and chown it to exim's user and group. Once you have installed |
165 | # pwcheck, you should arrange for it to be started by root at boot time. | |
ecc5bdcd ŁJM |
166 | |
167 | -# CYRUS_PWCHECK_SOCKET=/var/pwcheck/pwcheck | |
168 | +CYRUS_PWCHECK_SOCKET=/var/lib/sasl/mux | |
169 | ||
170 | ||
171 | #------------------------------------------------------------------------------ | |
2d19282f | 172 | @@ -579,7 +581,7 @@ |
02568c72 AM |
173 | # group. Once you have installed saslauthd, you should arrange for it to be |
174 | # started by root at boot time. | |
175 | ||
176 | -# CYRUS_SASLAUTHD_SOCKET=/var/state/saslauthd/mux | |
177 | +CYRUS_SASLAUTHD_SOCKET=/var/lib/sasl2/mux | |
178 | ||
179 | ||
180 | #------------------------------------------------------------------------------ | |
2d19282f | 181 | @@ -691,7 +693,7 @@ |
a59efb33 AM |
182 | # period (for example, /usr/exim/configure.host.in.some.domain). If this file |
183 | # does not exist, then the bare configuration file name is tried. | |
184 | ||
185 | -# CONFIGURE_FILE_USE_NODE=yes | |
186 | +CONFIGURE_FILE_USE_NODE=yes | |
187 | ||
188 | ||
189 | #------------------------------------------------------------------------------ | |
2d19282f | 190 | @@ -841,7 +843,7 @@ |
a59efb33 AM |
191 | # (process id) to a file so that it can easily be identified. The path of the |
192 | # file can be specified here. Some installations may want something like this: | |
193 | ||
194 | -# PID_FILE_PATH=/var/lock/exim.pid | |
195 | +PID_FILE_PATH=/var/run/exim%s.pid | |
196 | ||
197 | # If PID_FILE_PATH is not defined, Exim writes a file in its spool directory | |
198 | # using the name "exim-daemon.pid". | |
2d19282f | 199 | @@ -864,7 +866,7 @@ |
a59efb33 AM |
200 | # be changed here. The default is 0640 so that information from the spool is |
201 | # available to anyone who is a member of the Exim group. | |
202 | ||
203 | -# SPOOL_MODE=0640 | |
204 | +SPOOL_MODE=0640 | |
205 | ||
206 | ||
207 | #------------------------------------------------------------------------------ |