- removed all Group fields translations (oure rpm now can handle translating

[packages/postfix.git] / postfix-config.patch

diff -urN snapshot-20011127/conf/main.cf snapshot-20011127.dzikus/conf/main.cf
--- snapshot-20011127/conf/main.cf	Tue Nov 27 18:54:35 2001
+++ snapshot-20011127.dzikus/conf/main.cf	Thu Nov 29 07:13:51 2001
@@ -38,7 +38,7 @@
 # default value is $program_directory. This directory must be owned
 # by root.
 #
-daemon_directory = /usr/libexec/postfix
+daemon_directory = /usr/lib/postfix
 
 # QUEUE AND PROCESS OWNERSHIP
 #
@@ -56,7 +56,7 @@
 # These rights are used in the absence of a recipient user context.
 # DO NOT SPECIFY A PRIVILEGED USER OR THE POSTFIX OWNER.
 #
-#default_privs = nobody
+default_privs = nobody
 
 # INTERNET HOST AND DOMAIN NAMES
 # 
@@ -84,7 +84,7 @@
 # a domain-wide alias database that aliases each user to
 # user@that.users.mailhost.
 #
-#myorigin = $myhostname
+myorigin = $myhostname
 #myorigin = $mydomain
 
 # RECEIVING MAIL
@@ -296,7 +296,7 @@
 # "postfix reload" to eliminate the delay.
 #
 #alias_maps = dbm:/etc/aliases
-#alias_maps = hash:/etc/aliases
+alias_maps = hash:/etc/mail/aliases
 #alias_maps = hash:/etc/aliases, nis:mail.aliases
 #alias_maps = netinfo:/aliases
 
@@ -307,7 +307,7 @@
 #
 #alias_database = dbm:/etc/aliases
 #alias_database = dbm:/etc/mail/aliases
-#alias_database = hash:/etc/aliases
+alias_database = hash:/etc/mail/aliases
 #alias_database = hash:/etc/aliases, hash:/opt/majordomo/aliases
 
 # ADDRESS EXTENSIONS (e.g., user+foo)
@@ -335,7 +335,7 @@
 # UNIX-style mailboxes are kept. The default setting depends on the
 # system type.
 #
-#mail_spool_directory = /var/mail
+mail_spool_directory = /var/mail
 #mail_spool_directory = /var/spool/mail
 
 # The mailbox_command parameter specifies the optional external
@@ -357,8 +357,8 @@
 # IF YOU USE THIS TO DELIVER MAIL SYSTEM-WIDE, YOU MUST SET UP AN
 # ALIAS THAT FORWARDS MAIL FOR ROOT TO A REAL USER.
 #
-#mailbox_command = /some/where/procmail
-#mailbox_command = /some/where/procmail -a "$EXTENSION"
+#mailbox_command = /usr/bin/procmail
+mailbox_command = /usr/bin/procmail -a "$EXTENSION"
 
 # The mailbox_transport specifies the optional transport in master.cf
 # to use after processing aliases and .forward files. This parameter
@@ -503,3 +503,4 @@
 	 xxgdb $daemon_directory/$process_name $process_id & sleep 5
 
 # Other configurable parameters.
+biff = no
diff -urN snapshot-20011127/src/global/mail_params.h snapshot-20011127.dzikus/src/global/mail_params.h
--- snapshot-20011127/src/global/mail_params.h	Wed Nov 28 01:04:35 2001
+++ snapshot-20011127.dzikus/src/global/mail_params.h	Thu Nov 29 07:11:39 2001
@@ -198,7 +198,7 @@
   */
 #define VAR_CONFIG_DIR		"config_directory"
 #ifndef DEF_CONFIG_DIR
-#define DEF_CONFIG_DIR		"/etc/postfix"
+#define DEF_CONFIG_DIR		"/etc/mail"
 #endif
 extern char *var_config_dir;
 
diff -urN snapshot-20011127/src/util/sys_defs.h snapshot-20011127.dzikus/src/util/sys_defs.h
--- snapshot-20011127/src/util/sys_defs.h	Wed Nov 21 22:42:11 2001
+++ snapshot-20011127.dzikus/src/util/sys_defs.h	Thu Nov 29 07:11:39 2001
@@ -450,7 +450,7 @@
 #define HAS_FSYNC
 #define HAS_DB
 #define DEF_DB_TYPE	"hash"
-#define ALIAS_DB_MAP	"hash:/etc/aliases"
+#define ALIAS_DB_MAP	"hash:/etc/mail/aliases"
 #define HAS_NIS
 #define GETTIMEOFDAY(t)	gettimeofday(t,(struct timezone *) 0)
 #define ROOT_PATH	"/bin:/usr/bin:/sbin:/usr/sbin"