]>
Commit | Line | Data |
---|---|---|
4070b073 AF |
1 | --- postfix-19991231-pl01/global/mail_params.h.wiget Mon Jan 3 17:30:43 2000 |
2 | +++ postfix-19991231-pl01/global/mail_params.h Mon Jan 3 17:30:43 2000 | |
3 | @@ -187,7 +187,7 @@ | |
9e5ab0fc AF |
4 | */ |
5 | #define VAR_CONFIG_DIR "config_directory" | |
6 | #ifndef DEF_CONFIG_DIR | |
7 | -#define DEF_CONFIG_DIR "/etc/postfix" | |
8 | +#define DEF_CONFIG_DIR "/etc/mail" | |
9 | #endif | |
10 | extern char *var_config_dir; | |
11 | ||
4070b073 AF |
12 | --- postfix-19991231-pl01/util/sys_defs.h.wiget Thu Nov 18 03:33:35 1999 |
13 | +++ postfix-19991231-pl01/util/sys_defs.h Mon Jan 3 17:30:43 2000 | |
9e5ab0fc AF |
14 | @@ -31,7 +31,7 @@ |
15 | #define HAS_DB | |
16 | #define HAS_SA_LEN | |
17 | #define DEF_DB_TYPE "hash" | |
18 | -#define ALIAS_DB_MAP "hash:/etc/aliases" | |
19 | +#define ALIAS_DB_MAP "hash:/etc/mail/aliases" | |
20 | #define GETTIMEOFDAY(t) gettimeofday(t,(struct timezone *) 0) | |
21 | #define ROOT_PATH "/bin:/usr/bin:/sbin:/usr/sbin" | |
22 | #define USE_STATFS | |
4070b073 | 23 | @@ -331,7 +331,7 @@ |
9e5ab0fc AF |
24 | #define HAS_FSYNC |
25 | #define HAS_DB | |
26 | #define DEF_DB_TYPE "hash" | |
27 | -#define ALIAS_DB_MAP "hash:/etc/aliases" | |
28 | +#define ALIAS_DB_MAP "hash:/etc/mail/aliases" | |
29 | #define HAS_NIS | |
30 | #define GETTIMEOFDAY(t) gettimeofday(t,(struct timezone *) 0) | |
31 | #define ROOT_PATH "/bin:/usr/bin:/sbin:/usr/sbin" | |
4070b073 AF |
32 | --- postfix-19991231-pl01/conf/main.cf.wiget Sun Jan 2 20:19:11 2000 |
33 | +++ postfix-19991231-pl01/conf/main.cf Mon Jan 3 17:48:19 2000 | |
34 | @@ -24,7 +24,7 @@ | |
320b372d AM |
35 | # default value is $program_directory. This directory must be owned |
36 | # by root. | |
37 | # | |
9e5ab0fc | 38 | -daemon_directory = /usr/libexec/postfix |
320b372d AM |
39 | +daemon_directory = /usr/lib/postfix |
40 | ||
41 | # QUEUE AND PROCESS OWNERSHIP | |
42 | # | |
4070b073 | 43 | @@ -41,7 +41,7 @@ |
a281e397 AM |
44 | # These rights are used in the absence of a recipient user context. |
45 | # DO NOT SPECIFY A PRIVILEGED USER OR THE POSTFIX OWNER. | |
46 | # | |
47 | -#default_privs = nobody | |
48 | +default_privs = nobody | |
49 | ||
50 | # INTERNET HOST AND DOMAIN NAMES | |
51 | # | |
4070b073 | 52 | @@ -69,8 +69,8 @@ |
35e20fbe AM |
53 | # a domain-wide alias database that aliases each user to |
54 | # user@that.users.mailhost. | |
a281e397 | 55 | # |
35e20fbe AM |
56 | -#myorigin = $myhostname |
57 | -#myorigin = $mydomain | |
58 | +myorigin = $myhostname | |
97b21a4a | 59 | +#myorigin = $mydomain |
a281e397 | 60 | |
a281e397 AM |
61 | # RECEIVING MAIL |
62 | ||
4070b073 | 63 | @@ -168,7 +168,7 @@ |
a281e397 AM |
64 | # "postfix reload" to eliminate the delay. |
65 | # | |
66 | #alias_maps = dbm:/etc/aliases | |
67 | -#alias_maps = hash:/etc/aliases | |
68 | +alias_maps = hash:/etc/mail/aliases | |
69 | #alias_maps = hash:/etc/aliases, nis:mail.aliases | |
9e5ab0fc | 70 | #alias_maps = netinfo:/aliases |
a281e397 | 71 | |
4070b073 | 72 | @@ -179,7 +179,7 @@ |
320b372d AM |
73 | # |
74 | #alias_database = dbm:/etc/aliases | |
75 | #alias_database = dbm:/etc/mail/aliases | |
76 | -#alias_database = hash:/etc/aliases | |
77 | +alias_database = hash:/etc/mail/aliases | |
78 | #alias_database = hash:/etc/aliases, hash:/opt/majordomo/aliases | |
79 | ||
4070b073 AF |
80 | # ADDRESS EXTENSIONS (e.g., user+foo) |
81 | @@ -207,7 +207,7 @@ | |
35e20fbe AM |
82 | # UNIX-style mailboxes are kept. The default setting depends on the |
83 | # system type. | |
a281e397 | 84 | # |
35e20fbe AM |
85 | -# mail_spool_directory = /var/mail |
86 | +mail_spool_directory = /var/mail | |
87 | # mail_spool_directory = /var/spool/mail | |
a281e397 | 88 | |
35e20fbe | 89 | # The mailbox_command parameter specifies the optional external |
4070b073 AF |
90 | @@ -229,8 +229,8 @@ |
91 | # IF YOU USE THIS TO DELIVER MAIL SYSTEM-WIDE, YOU MUST SET UP AN | |
92 | # ALIAS THAT FORWARDS MAIL FOR ROOT TO A REAL USER. | |
93 | # | |
94 | -#mailbox_command = /some/where/procmail | |
95 | -#mailbox_command = /some/where/procmail -a "$EXTENSION" | |
96 | +#mailbox_command = /usr/bin/procmail | |
97 | +mailbox_command = /usr/bin/procmail -a "$EXTENSION" | |
98 | ||
99 | # The mailbox_transport specifies the optional transport in master.cf | |
100 | # to use after processing aliases and .forward files. This parameter | |
101 | @@ -381,3 +381,4 @@ | |
320b372d AM |
102 | xxgdb $daemon_directory/$process_name $process_id & sleep 5 |
103 | ||
104 | # Other configurable parameters. | |
105 | +biff = no |