--- postgrey-1.24/postgrey.orig	2006-02-22 13:43:24 +0500

+++ postgrey-1.24/postgrey	2006-02-22 13:48:57 +0500

@@ -432,8 +432,8 @@

             port             => [ $opt{inet} ? $opt{inet} : $opt{unix}."|unix" ],

             proto            => $opt{inet} ? 'tcp' : 'unix',

             user             => $opt{user} || 'postgrey',

-            group            => $opt{group} || 'nogroup',

-            dbdir            => $opt{dbdir} || '/var/spool/postfix/postgrey',

+            group            => $opt{group} || 'postgrey',

+            dbdir            => $opt{dbdir} || '/var/lib/postgrey',

             setsid           => $opt{daemonize} ? 1 : undef,

             pid_file         => $opt{daemonize} ? $opt{pidfile} : undef,

             log_level        => $opt{verbose} ? 4 : 2,

@@ -444,7 +444,7 @@

         },

         postgrey => {

             delay            => $opt{delay}     || 300,

-            dbdir            => $opt{dbdir}     || '/var/spool/postfix/postgrey',

+            dbdir            => $opt{dbdir}     || '/var/lib/postgrey',

             max_age          => $opt{'max-age'} || 35,

             last_maint       => time,

             last_maint_keys  => 0, # do it on the first night

@@ -456,10 +456,10 @@

             greylist_action  => $opt{'greylist-action'} || 'DEFER_IF_PERMIT',

             greylist_text    => $opt{'greylist-text'} || 'Greylisted for %s seconds (see http://isg.ee.ethz.ch/tools/postgrey/help/%r.html)',

             whitelist_clients_files    => $opt{'whitelist-clients'} ||

-                [ '/etc/postfix/postgrey_whitelist_clients' ,

-                  '/etc/postfix/postgrey_whitelist_clients.local' ],

+                [ '/etc/postgrey/whitelist_clients' ,

+                  '/etc/postgrey/whitelist_clients.local' ],

             whitelist_recipients_files => $opt{'whitelist-recipients'} ||

-                [ '/etc/postfix/postgrey_whitelist_recipients' ],

+                [ '/etc/postgrey/whitelist_recipients' ],

             privacy => defined $opt{'privacy'},

         },

     }, 'postgrey';

@@ -609,8 +609,8 @@

  -d, --daemonize         run in the background

      --pidfile=PATH      put daemon pid into this file

      --user=USER         run as USER (default: postgrey)

-     --group=GROUP       run as group GROUP (default: nogroup)

-     --dbdir=PATH        put db files in PATH (default: /var/spool/postfix/postgrey)

+     --group=GROUP       run as group GROUP (default: postgrey)

+     --dbdir=PATH        put db files in PATH (default: /var/lib/postgrey)

      --delay=N           greylist for N seconds (default: 300)

      --max-age=N         delete entries older than N days since the last time

                          that they have been seen (default: 35)

@@ -621,8 +621,8 @@

                          (default: Greylisted for %s seconds + help url, see below)

      --lookup-by-subnet  strip the last 8 bits from IP addresses (default)

      --lookup-by-host    do not strip the last 8 bits from IP addresses

-     --whitelist-clients=FILE     default: /etc/postfix/postgrey_whitelist_clients

-     --whitelist-recipients=FILE  default: /etc/postfix/postgrey_whitelist_recipients

+     --whitelist-clients=FILE     default: /etc/postgrey/postgrey_whitelist_clients

+     --whitelist-recipients=FILE  default: /etc/postgrey/postgrey_whitelist_recipients

      --auto-whitelist-clients=N   whitelist host after first successful delievery

                                   N is the minimal count of mails before a client is 

                                   whitelisted (turned on by default with value 5)

@@ -630,7 +630,7 @@

      --privacy           store data using one-way hash functions

  Note that the --whitelist-x options can be specified multiple times,

- and that per default /etc/postfix/postgrey_whitelist_clients.local is

+ and that per default /etc/postgrey/whitelist_clients.local is

  also read, so that you can put there local entries.

 =head1 DESCRIPTION

@@ -657,7 +657,7 @@

 =item *

 Create a C<postgrey> user and the directory where to put the database I<dbdir>

-(default: C</var/spool/postfix/postgrey>)

+(default: C</var/lib/postgrey>)

 =item *

@@ -682,7 +682,7 @@

 =item *

-Put in /etc/postfix/postgrey_whitelist_recipients users that do not want

+Put in /etc/postgrey/whitelist_recipients users that do not want

 greylisting.

 =back

@@ -693,9 +693,9 @@

 which no greylisting should be done. Per default postgrey will read the

 following files:

- /etc/postfix/postgrey_whitelist_clients

- /etc/postfix/postgrey_whitelist_clients.local

- /etc/postfix/postgrey_whitelist_recipients

+ /etc/postgrey/whitelist_clients

+ /etc/postgrey/whitelist_clients.local

+ /etc/postgrey/whitelist_recipients

 You can specify alternative paths with the --whitelist-x options.