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