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