]>
Commit | Line | Data |
---|---|---|
13278cdd ŁJM |
1 | diff -urP exim-4.12.orig/src/EDITME exim-4.12/src/EDITME |
2 | --- exim-4.12.orig/src/EDITME Wed Dec 18 11:28:00 2002 | |
3 | +++ exim-4.12/src/EDITME Mon Dec 23 03:50:04 2002 | |
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 | #------------------------------------------------------------------------------ | |
13 | @@ -113,7 +113,7 @@ | |
9a8356f9 | 14 | # directories if they don't exist. It will also install a default runtime |
32f9109c AM |
15 | # configuration if this file does not exist. |
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. | |
22 | @@ -131,7 +131,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 | |
9a8356f9 | 32 | @@ -212,7 +213,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 | #------------------------------------------------------------------------------ | |
9a8356f9 | 41 | @@ -221,9 +222,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 | #------------------------------------------------------------------------------ | |
9a8356f9 | 54 | @@ -238,7 +239,7 @@ |
32f9109c AM |
55 | LOOKUP_DBM=yes |
56 | LOOKUP_LSEARCH=yes | |
57 | ||
58 | -# LOOKUP_CDB=yes | |
59 | +LOOKUP_CDB=yes | |
60 | # LOOKUP_DNSDB=yes | |
61 | # LOOKUP_DSEARCH=yes | |
62 | # LOOKUP_LDAP=yes | |
9a8356f9 | 63 | @@ -309,8 +310,8 @@ |
32f9109c AM |
64 | # included in the Exim binary. You will then need to set up the run time |
65 | # configuration to make use of the mechanism(s) selected. | |
66 | ||
67 | -# AUTH_CRAM_MD5=yes | |
68 | -# AUTH_PLAINTEXT=yes | |
69 | +AUTH_CRAM_MD5=yes | |
70 | +AUTH_PLAINTEXT=yes | |
71 | # AUTH_SPA=yes | |
72 | ||
73 | ||
9a8356f9 | 74 | @@ -323,10 +324,10 @@ |
75 | # leave these settings commented out. | |
32f9109c | 76 | |
9a8356f9 | 77 | # This setting is required for any TLS support (either OpenSSL or GnuTLS) |
32f9109c | 78 | -# SUPPORT_TLS=yes |
32f9109c | 79 | +SUPPORT_TLS=yes |
9a8356f9 | 80 | |
81 | # Uncomment this setting if you are using OpenSSL | |
82 | -# TLS_LIBS=-lssl -lcrypto | |
32f9109c AM |
83 | +TLS_LIBS=-lssl -lcrypto |
84 | ||
9a8356f9 | 85 | # Uncomment these settings if you are using GnuTLS |
86 | # USE_GNUTLS=yes | |
87 | @@ -377,7 +378,7 @@ | |
32f9109c AM |
88 | # Once you have done this, "make install" will build the info files and |
89 | # install them in the directory you have defined. | |
90 | ||
91 | -# INFO_DIRECTORY=/usr/share/info | |
92 | +INFO_DIRECTORY=/usr/share/info | |
93 | ||
94 | ||
95 | #------------------------------------------------------------------------------ | |
9a8356f9 | 96 | @@ -390,7 +391,7 @@ |
32f9109c AM |
97 | # %s. This will be replaced by one of the strings "main", "panic", or "reject" |
98 | # to form the final file names. Some installations may want something like this: | |
99 | ||
100 | -# LOG_FILE_PATH=/var/log/exim_%slog | |
101 | +LOG_FILE_PATH=/var/log/exim/%s.log | |
102 | ||
103 | # which results in files with names /var/log/exim_mainlog, etc. The directory | |
104 | # in which the log files are placed must exist; Exim does not try to create | |
9a8356f9 | 105 | @@ -424,7 +425,7 @@ |
32f9109c AM |
106 | # files. Both the name of the command and the suffix that it adds to files |
107 | # need to be defined here. See also the EXICYCLOG_MAX configuration. | |
108 | ||
109 | -COMPRESS_COMMAND=/usr/bin/gzip | |
110 | +COMPRESS_COMMAND=/bin/gzip | |
111 | COMPRESS_SUFFIX=gz | |
112 | ||
113 | ||
9a8356f9 | 114 | @@ -432,7 +433,7 @@ |
32f9109c AM |
115 | # If the exigrep utility is fed compressed log files, it tries to uncompress |
116 | # them using this command. | |
117 | ||
118 | -ZCAT_COMMAND=/usr/bin/zcat | |
119 | +ZCAT_COMMAND=/bin/zcat | |
120 | ||
121 | ||
122 | #------------------------------------------------------------------------------ | |
9a8356f9 | 123 | @@ -441,7 +442,7 @@ |
32f9109c AM |
124 | # (version 5.004 or later) installed, set EXIM_PERL to perl.o. Using embedded |
125 | # Perl costs quite a lot of resources. Only do this if you really need it. | |
126 | ||
127 | -# EXIM_PERL=perl.o | |
128 | +EXIM_PERL=perl.o | |
129 | ||
130 | ||
131 | #------------------------------------------------------------------------------ | |
9a8356f9 | 132 | @@ -451,11 +452,12 @@ |
32f9109c AM |
133 | # support, which is intended for use in conjunction with the SMTP AUTH |
134 | # facilities, is included only when requested by the following setting: | |
135 | ||
136 | -# SUPPORT_PAM=yes | |
137 | +SUPPORT_PAM=yes | |
138 | ||
139 | # You probably need to add -lpam to EXTRALIBS, and in some releases of | |
140 | # GNU/Linux -ldl is also needed. | |
141 | ||
142 | +EXTRALIBS=-lpam -ldl | |
143 | ||
144 | #------------------------------------------------------------------------------ | |
145 | # Support for authentication via Radius is also available. The Exim support, | |
13278cdd ŁJM |
146 | @@ -478,7 +480,7 @@ |
147 | # and chown it to exim's user and group. Once you have installed pwcheck, you | |
148 | # should arrange for it to be started by root at boot time. | |
149 | ||
150 | -# CYRUS_PWCHECK_SOCKET=/var/pwcheck/pwcheck | |
151 | +CYRUS_PWCHECK_SOCKET=/var/lib/sasl/mux | |
152 | ||
153 | ||
154 | #------------------------------------------------------------------------------ | |
9a8356f9 | 155 | @@ -577,7 +579,7 @@ |
32f9109c AM |
156 | # period (for example, /usr/exim/configure.host.in.some.domain). If this file |
157 | # does not exist, then the bare configuration file name is tried. | |
158 | ||
159 | -# CONFIGURE_FILE_USE_NODE=yes | |
160 | +CONFIGURE_FILE_USE_NODE=yes | |
161 | ||
162 | ||
163 | #------------------------------------------------------------------------------ | |
9a8356f9 | 164 | @@ -726,7 +728,7 @@ |
32f9109c AM |
165 | # (process id) to a file so that it can easily be identified. The path of the |
166 | # file can be specified here. Some installations may want something like this: | |
167 | ||
168 | -# PID_FILE_PATH=/var/lock/exim.pid | |
169 | +PID_FILE_PATH=/var/run/exim%s.pid | |
170 | ||
171 | # If PID_FILE_PATH is not defined, Exim writes a file in its spool directory | |
172 | # using the name "exim-daemon.pid". | |
9a8356f9 | 173 | @@ -749,7 +751,7 @@ |
32f9109c AM |
174 | # be changed here. The default is 0640 so that information from the spool is |
175 | # available to anyone who is a member of the Exim group. | |
176 | ||
177 | -# SPOOL_MODE=0640 | |
178 | +SPOOL_MODE=0640 | |
179 | ||
180 | ||
181 | #------------------------------------------------------------------------------ |