LogoopenSUSE Build Service > Projects
Sign Up | Log In

View File postgrey-1.33-config.patch of Package postgrey (Project openSUSE:12.1)

Index: contrib/postgreyreport
===================================================================
--- contrib/postgreyreport.orig	2007-08-29 15:26:01.000000000 +0200
+++ contrib/postgreyreport	2009-11-30 19:14:24.922405000 +0100
@@ -24,7 +24,7 @@ select((select(STDOUT), $| = 1)[0]); 	#
 # default options, override via command line
 my %opt = ( 	
 	user 			=> 'postgrey',
-	dbdir 			=> '/var/spool/postfix/postgrey',
+	dbdir 			=> '/var/lib/postgrey',
 	delay			=> 300,
 	return_string		=> 'Greylisted',	# match on this string
 
@@ -583,7 +583,7 @@ B<postgreyreport> [I<options>...]
      --version		      display version and exit
 
      --user=USER              run as USER (default: postgrey)
-     --dbdir=PATH             find db files in PATH (default: /var/spool/postfix/postgrey)
+     --dbdir=PATH             find db files in PATH (default: /var/lib/postgrey)
      --delay=N                report triplets that did not try again after N seconds (default: 300)
      --greylist-text=TXT      text to match on for greylist maillog lines
 
Index: postgrey_whitelist_recipients
===================================================================
--- postgrey_whitelist_recipients.orig	2007-08-29 15:25:08.000000000 +0200
+++ postgrey_whitelist_recipients	2009-11-30 19:14:24.925407000 +0100
@@ -1,6 +1,6 @@
 # postgrey whitelist for mail recipients
 # --------------------------------------
-# put this file in /etc/postfix or specify its path
+# put this file in /etc/postgrey or specify its path
 # with --whitelist-recipients=xxx
 
 postmaster@
Index: README
===================================================================
--- README.orig	2007-08-29 15:27:04.000000000 +0200
+++ README	2009-11-30 19:14:24.929409000 +0100
@@ -19,7 +19,7 @@ Documentation
 
 See POD documentation in postgrey. Execute:
 
-  perldoc postgrey
+  man postgrey
 
 See also Postgrey's homepage:
 
Index: postgrey_whitelist_clients
===================================================================
--- postgrey_whitelist_clients.orig	2008-07-22 22:17:50.000000000 +0200
+++ postgrey_whitelist_clients	2009-11-30 19:14:24.934405000 +0100
@@ -1,6 +1,6 @@
 # postgrey whitelist for mail client hostnames
 # --------------------------------------------
-# put this file in /etc/postfix or specify its path
+# put this file in /etc/postgrey or specify its path
 # with --whitelist-clients=xxx
 
 # greylisting.org: Southwest Airlines (unique sender, no retry)
@@ -17,8 +17,6 @@ vger.kernel.org
 karger.ch
 # 2004-06-02: lilys.ch, (slow: 4 hours)
 server-x001.hostpoint.ch
-# 2004-06-09: roche.com (no retry)
-gw.bas.roche.com
 # 2004-06-09: newsletter (no retry)
 mail.hhlaw.com
 # 2004-06-09: no retry (reported by Ralph Hildebrandt)
Index: postgrey
===================================================================
--- postgrey.orig	2010-05-04 22:51:52.000000000 +0200
+++ postgrey	2010-08-28 23:09:56.958706690 +0200
@@ -23,8 +23,8 @@ use vars qw(@ISA);
 @ISA = qw(Net::Server::Multiplex);
 
 my $VERSION = '1.33';
-my $DEFAULT_DBDIR = '/var/spool/postfix/postgrey';
-my $CONFIG_DIR = '/etc/postfix';
+my $DEFAULT_DBDIR = '/var/lib/postgrey';
+my $CONFIG_DIR = '/etc/postgrey';
 
 sub cidr_parse($)
 {
@@ -605,10 +605,10 @@ sub main()
             greylist_action  => $opt{'greylist-action'} || 'DEFER_IF_PERMIT',
             greylist_text    => $opt{'greylist-text'} || 'Greylisted, see http://postgrey.schweikert.ch/help/%r.html',
             whitelist_clients_files    => $opt{'whitelist-clients'} ||
-                [ "$CONFIG_DIR/postgrey_whitelist_clients" ,
-                  "$CONFIG_DIR/postgrey_whitelist_clients.local" ],
+                [ "$CONFIG_DIR/whitelist_clients" ,
+                  "$CONFIG_DIR/whitelist_clients.local" ],
             whitelist_recipients_files => $opt{'whitelist-recipients'} ||
-                [ "$CONFIG_DIR/postgrey_whitelist_recipients" ],
+                [ "$CONFIG_DIR/whitelist_recipients" ],
             privacy => defined $opt{'privacy'},
             hostname => defined $opt{hostname} ? $opt{hostname} : hostname,
             exim => defined $opt{'exim'},
@@ -791,7 +791,7 @@ B<postgrey> [I<options>...]
      --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)
+     --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)
@@ -805,8 +805,8 @@ B<postgrey> [I<options>...]
      --privacy           store data using one-way hash functions
      --hostname=NAME     set the hostname (default: `hostname`)
      --exim              don't reuse a socket for more than one query (exim compatible)
-     --whitelist-clients=FILE     default: /etc/postfix/postgrey_whitelist_clients
-     --whitelist-recipients=FILE  default: /etc/postfix/postgrey_whitelist_recipients
+     --whitelist-clients=FILE     default: /etc/postgrey/whitelist_clients
+     --whitelist-recipients=FILE  default: /etc/postgrey/whitelist_recipients
      --auto-whitelist-clients=N   whitelist host after first successful delivery
                                   N is the minimal count of mails before a client is 
                                   whitelisted (turned on by default with value 5)
@@ -816,7 +816,7 @@ B<postgrey> [I<options>...]
                                   default: X-Greylist: delayed <seconds> seconds by postgrey-<version> at <server>; <date>
 
  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
@@ -842,11 +842,6 @@ doing lookups in the database.
 
 =item *
 
-Create a C<postgrey> user and the directory where to put the database I<dbdir>
-(default: C</var/spool/postfix/postgrey>)
-
-=item *
-
 Write an init script to start postgrey at boot and start it. Like this for example:
 
  postgrey --inet=10023 -d
@@ -866,12 +861,12 @@ Put something like this in /etc/main.cf:
 
 =item *
 
-Install the provided postgrey_whitelist_clients and
-postgrey_whitelist_recipients in /etc/postfix.
+Install the provided whitelist_clients and
+whitelist_recipients in /etc/postgrey.
 
 =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
@@ -882,9 +877,9 @@ Whitelists allow you to specify client a
 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.