]>
Commit | Line | Data |
---|---|---|
9e6e8b07 | 1 | --- exim-4.30/src/EDITME.orig 2003-12-01 10:15:41.000000000 +0000 |
2 | +++ exim-4.30/src/EDITME 2003-12-02 12:14:36.000000000 +0000 | |
32f9109c AM |
3 | @@ -98,7 +98,7 @@ |
4 | # /usr/local/sbin. The installation script will try to create this directory, | |
5 | # and any superior directories, if they do not exist. | |
6 | ||
7 | -BIN_DIRECTORY=/usr/exim/bin | |
8 | +BIN_DIRECTORY=/usr/bin | |
9 | ||
10 | ||
11 | #------------------------------------------------------------------------------ | |
d53e0fbb AM |
12 | @@ -114,7 +114,7 @@ |
13 | # don't exist. It will also install a default runtime configuration if this | |
14 | # file does not exist. | |
32f9109c AM |
15 | |
16 | -CONFIGURE_FILE=/usr/exim/configure | |
17 | +CONFIGURE_FILE=/etc/mail/exim.conf | |
18 | ||
9a8356f9 | 19 | # It is possible to specify a colon-separated list of files for CONFIGURE_FILE. |
20 | # In this case, Exim will use the first of them that exists when it is run. | |
d53e0fbb | 21 | @@ -132,7 +132,8 @@ |
32f9109c | 22 | # owner of a local mailbox.) Specifying these values as root is very strongly |
9e6e8b07 | 23 | # discouraged. |
32f9109c AM |
24 | |
25 | -EXIM_USER= | |
26 | +EXIM_UID=79 | |
27 | +EXIM_GID=79 | |
28 | ||
9e6e8b07 | 29 | # If you specify EXIM_USER as a name, this is looked up at build time, and the |
30 | # uid number is built into the binary. However, you can specify that this | |
31 | @@ -227,7 +228,7 @@ | |
32f9109c AM |
32 | # This one is special-purpose, and commonly not required, so it is not |
33 | # included by default. | |
34 | ||
35 | -# TRANSPORT_LMTP=yes | |
36 | +TRANSPORT_LMTP=yes | |
37 | ||
38 | ||
39 | #------------------------------------------------------------------------------ | |
9e6e8b07 | 40 | @@ -236,9 +237,9 @@ |
32f9109c AM |
41 | # MBX, is included only when requested. If you do not know what this is about, |
42 | # leave these settings commented out. | |
43 | ||
44 | -# SUPPORT_MAILDIR=yes | |
45 | -# SUPPORT_MAILSTORE=yes | |
46 | -# SUPPORT_MBX=yes | |
47 | +SUPPORT_MAILDIR=yes | |
48 | +SUPPORT_MAILSTORE=yes | |
49 | +SUPPORT_MBX=yes | |
50 | ||
51 | ||
52 | #------------------------------------------------------------------------------ | |
9e6e8b07 | 53 | @@ -253,16 +254,16 @@ |
32f9109c AM |
54 | LOOKUP_DBM=yes |
55 | LOOKUP_LSEARCH=yes | |
56 | ||
57 | -# LOOKUP_CDB=yes | |
37c3e2fc | 58 | -# LOOKUP_DNSDB=yes |
d53e0fbb | 59 | -# LOOKUP_DSEARCH=yes |
37c3e2fc AM |
60 | +LOOKUP_CDB=yes |
61 | +LOOKUP_DNSDB=yes | |
d53e0fbb | 62 | +LOOKUP_DSEARCH=yes |
b19ec081 | 63 | # LOOKUP_IBASE=yes |
32f9109c | 64 | # LOOKUP_LDAP=yes |
d53e0fbb AM |
65 | # LOOKUP_MYSQL=yes |
66 | # LOOKUP_NIS=yes | |
37c3e2fc 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 | |
37c3e2fc | 73 | |
9e6e8b07 | 74 | @@ -386,9 +387,9 @@ |
32f9109c AM |
75 | # included in the Exim binary. You will then need to set up the run time |
76 | # configuration to make use of the mechanism(s) selected. | |
77 | ||
78 | -# AUTH_CRAM_MD5=yes | |
79 | -# AUTH_PLAINTEXT=yes | |
d53e0fbb | 80 | -# AUTH_SPA=yes |
32f9109c AM |
81 | +AUTH_CRAM_MD5=yes |
82 | +AUTH_PLAINTEXT=yes | |
d53e0fbb | 83 | +AUTH_SPA=yes |
32f9109c AM |
84 | |
85 | ||
d53e0fbb | 86 | #------------------------------------------------------------------------------ |
9e6e8b07 | 87 | @@ -466,10 +467,10 @@ |
9a8356f9 | 88 | # leave these settings commented out. |
32f9109c | 89 | |
9a8356f9 | 90 | # This setting is required for any TLS support (either OpenSSL or GnuTLS) |
32f9109c | 91 | -# SUPPORT_TLS=yes |
32f9109c | 92 | +SUPPORT_TLS=yes |
9a8356f9 | 93 | |
94 | # Uncomment this setting if you are using OpenSSL | |
95 | -# TLS_LIBS=-lssl -lcrypto | |
32f9109c AM |
96 | +TLS_LIBS=-lssl -lcrypto |
97 | ||
9a8356f9 | 98 | # Uncomment these settings if you are using GnuTLS |
99 | # USE_GNUTLS=yes | |
9e6e8b07 | 100 | @@ -520,7 +521,7 @@ |
32f9109c AM |
101 | # Once you have done this, "make install" will build the info files and |
102 | # install them in the directory you have defined. | |
103 | ||
104 | -# INFO_DIRECTORY=/usr/share/info | |
105 | +INFO_DIRECTORY=/usr/share/info | |
106 | ||
107 | ||
108 | #------------------------------------------------------------------------------ | |
9e6e8b07 | 109 | @@ -533,7 +534,7 @@ |
32f9109c AM |
110 | # %s. This will be replaced by one of the strings "main", "panic", or "reject" |
111 | # to form the final file names. Some installations may want something like this: | |
112 | ||
113 | -# LOG_FILE_PATH=/var/log/exim_%slog | |
114 | +LOG_FILE_PATH=/var/log/exim/%s.log | |
115 | ||
116 | # which results in files with names /var/log/exim_mainlog, etc. The directory | |
117 | # in which the log files are placed must exist; Exim does not try to create | |
9e6e8b07 | 118 | @@ -582,7 +583,7 @@ |
32f9109c AM |
119 | # files. Both the name of the command and the suffix that it adds to files |
120 | # need to be defined here. See also the EXICYCLOG_MAX configuration. | |
121 | ||
122 | -COMPRESS_COMMAND=/usr/bin/gzip | |
123 | +COMPRESS_COMMAND=/bin/gzip | |
124 | COMPRESS_SUFFIX=gz | |
125 | ||
126 | ||
9e6e8b07 | 127 | @@ -590,7 +591,7 @@ |
32f9109c AM |
128 | # If the exigrep utility is fed compressed log files, it tries to uncompress |
129 | # them using this command. | |
130 | ||
131 | -ZCAT_COMMAND=/usr/bin/zcat | |
132 | +ZCAT_COMMAND=/bin/zcat | |
133 | ||
134 | ||
135 | #------------------------------------------------------------------------------ | |
9e6e8b07 | 136 | @@ -599,7 +600,7 @@ |
32f9109c AM |
137 | # (version 5.004 or later) installed, set EXIM_PERL to perl.o. Using embedded |
138 | # Perl costs quite a lot of resources. Only do this if you really need it. | |
139 | ||
140 | -# EXIM_PERL=perl.o | |
141 | +EXIM_PERL=perl.o | |
142 | ||
143 | ||
144 | #------------------------------------------------------------------------------ | |
9e6e8b07 | 145 | @@ -609,11 +610,12 @@ |
32f9109c AM |
146 | # support, which is intended for use in conjunction with the SMTP AUTH |
147 | # facilities, is included only when requested by the following setting: | |
148 | ||
149 | -# SUPPORT_PAM=yes | |
150 | +SUPPORT_PAM=yes | |
151 | ||
152 | # You probably need to add -lpam to EXTRALIBS, and in some releases of | |
153 | # GNU/Linux -ldl is also needed. | |
154 | ||
155 | +EXTRALIBS=-lpam -ldl | |
156 | ||
157 | #------------------------------------------------------------------------------ | |
158 | # Support for authentication via Radius is also available. The Exim support, | |
9e6e8b07 | 159 | @@ -638,7 +640,7 @@ |
d53e0fbb AM |
160 | # /var/pwcheck) and chown it to exim's user and group. Once you have installed |
161 | # pwcheck, you should arrange for it to be started by root at boot time. | |
13278cdd ŁJM |
162 | |
163 | -# CYRUS_PWCHECK_SOCKET=/var/pwcheck/pwcheck | |
164 | +CYRUS_PWCHECK_SOCKET=/var/lib/sasl/mux | |
165 | ||
166 | ||
167 | #------------------------------------------------------------------------------ | |
9e6e8b07 | 168 | @@ -655,7 +657,7 @@ |
d53e0fbb AM |
169 | # group. Once you have installed saslauthd, you should arrange for it to be |
170 | # started by root at boot time. | |
171 | ||
172 | -# CYRUS_SASLAUTHD_SOCKET=/var/state/saslauthd/mux | |
173 | +CYRUS_SASLAUTHD_SOCKET=/var/lib/sasl2/mux | |
174 | ||
175 | ||
176 | #------------------------------------------------------------------------------ | |
9e6e8b07 | 177 | @@ -767,7 +769,7 @@ |
32f9109c AM |
178 | # period (for example, /usr/exim/configure.host.in.some.domain). If this file |
179 | # does not exist, then the bare configuration file name is tried. | |
180 | ||
181 | -# CONFIGURE_FILE_USE_NODE=yes | |
182 | +CONFIGURE_FILE_USE_NODE=yes | |
183 | ||
184 | ||
185 | #------------------------------------------------------------------------------ | |
9e6e8b07 | 186 | @@ -917,7 +919,7 @@ |
32f9109c AM |
187 | # (process id) to a file so that it can easily be identified. The path of the |
188 | # file can be specified here. Some installations may want something like this: | |
189 | ||
190 | -# PID_FILE_PATH=/var/lock/exim.pid | |
191 | +PID_FILE_PATH=/var/run/exim%s.pid | |
192 | ||
193 | # If PID_FILE_PATH is not defined, Exim writes a file in its spool directory | |
194 | # using the name "exim-daemon.pid". | |
9e6e8b07 | 195 | @@ -940,7 +942,7 @@ |
32f9109c AM |
196 | # be changed here. The default is 0640 so that information from the spool is |
197 | # available to anyone who is a member of the Exim group. | |
198 | ||
199 | -# SPOOL_MODE=0640 | |
200 | +SPOOL_MODE=0640 | |
201 | ||
202 | ||
203 | #------------------------------------------------------------------------------ |