Use $ENV{QMAIL} to override /var/qmail for where to find the

control/ directory.

  Enable "check_earlytalker" in the default plugins config


git-svn-id: https://svn.perl.org/qpsmtpd/trunk@168 958fd67b-6ff1-0310-b445-bb7760255be9

Changes

@@ -1,3 +1,12 @@
+0.27 
+
+  Use $ENV{QMAIL} to override /var/qmail for where to find the
+  control/ directory.
+
+  Enable "check_earlytalker" in the default plugins config
+
+  [.. todo, fill in older changes ..] spf changes etc?
+
 0.26 - 2003/06/11
 
   Add queue/smtp-forward plugin (Matt Sergeant)

README

@@ -94,6 +94,9 @@ Configuration files can go into either /var/qmail/control or into the
 config subdirectory of the qpsmtpd installation.  Configuration should
 be compatible with qmail-smtpd making qpsmtpd a drop-in replacement.
 
+If qmail is installed in a nonstandard location you should set the
+$QMAIL environment variable to that location in your "./run" file.
+
 If there is anything missing, then please send a patch (or just
 information about what's missing) to the mailinglist or to
 ask@develooper.com.

config.sample/plugins

@@ -8,7 +8,7 @@
 
 quit_fortune
 
-#check_earlytalker
+check_earlytalker
 count_unrecognized_commands 4
 
 require_resolvable_fromhost
@@ -19,6 +19,8 @@ check_badmailfrom
 check_badrcptto
 check_spamhelo
 
+# sender_permitted_from
+
 # this plugin needs to run after all other "rcpt" plugins
 check_relay
 

plugins/queue/qmail-queue

@@ -16,7 +16,6 @@ makes it easy to use a qmail-queue replacement.
 
 If set the environment variable QMAILQUEUE overrides this setting.
 
-
 =cut
 
 sub register {
@@ -26,12 +25,12 @@ sub register {
   if (@args > 0) {
     $self->{_queue_exec} = $args[0];
     $self->log(1, "WARNING: Ignoring additional arguments.") if (@args > 1);
-  } else {
-    $self->{_queue_exec} = "/var/qmail/bin/qmail-queue";
+  }
+  else {
+    $self->{_queue_exec} = ($ENV{QMAIL} || '/var/qmail') . "/bin/qmail-queue";
   }
 
   $self->{_queue_exec} = $ENV{QMAILQUEUE} if $ENV{QMAILQUEUE};
-
 }
 
 sub queue_handler {