X-Git-Url: http://git.jankratochvil.net/?a=blobdiff_plain;f=PerlMail%2FConfig.pm;h=4179565e4da755b679e9f61779770a8f38ccbe7b;hb=44259a1fa77c88cfa12ead6567f50e4eb102b6f6;hp=9416b0f406cc576e9a6617541c1ca940cd8e68d7;hpb=5b818e1f034dab558725cf034fab6296216118fc;p=PerlMail.git diff --git a/PerlMail/Config.pm b/PerlMail/Config.pm index 9416b0f..4179565 100644 --- a/PerlMail/Config.pm +++ b/PerlMail/Config.pm @@ -43,7 +43,7 @@ require Mail::Alias; BEGIN { for (qw(headerhas store headeris did dnsbl store_muttrc_alternates Received_for parts_linear mime_type - body_first mimehead spamassassin header_remap)) { + body_first mimehead spamassassin header_remap lmtp_deliver)) { eval 'sub '.$_.' { return ::'.$_.'(@_); }'; } } @@ -69,6 +69,17 @@ our $MaxBodySMS=0x1000; our @SMSwebRcpt=qw(420 602 431329); # Some WWW::SMS modules require username: our $SMSwebRcpt_username="lace2"; +our $lmtp_admin="cyrus"; +our $lmtp_pwd; +{ + local *F; + open F,"$HOME/priv/lmtp.${lmtp_admin}.pwd" or die; + $lmtp_pwd=; + chomp $lmtp_pwd; + close F or die; + } +our $lmtp_user_from="lace"; +our $lmtp_user_to="lacemail"; # perlmail-submit @@ -87,7 +98,7 @@ our $DBI_database="short"; # MySQL user name: our $DBI_user="short"; # MySQL user password: -our $DBI_pwd=$ENV{"HOME"}."/priv/mysql.".$DBI_user.".pwd"; +our $DBI_pwd=$HOME."/priv/mysql.".$DBI_user.".pwd"; # perlmail-sendmail @@ -96,19 +107,17 @@ our $DBI_pwd=$ENV{"HOME"}."/priv/mysql.".$DBI_user.".pwd"; my @lists=qw( tacplus-l@disaster.com gsm@sh.cvut.cz - linux-fsdevel@vger.kernel.org n9k@pandora.cz dev9k@pandora.cz gsm@pandora.cz ros-general@reactos.com ros-kernel@reactos.com + ros-dev@reactos.com ros-cvs@reactos.com 4cinfo@atrey.karlin.mff.cuni.cz libtool@gnu.org libtool-patches@gnu.org wine-license@winehq.org - wine-devel@winehq.org - wine-patches@winehq.org gtk-devel-list@gnome.org gnome-vfs-list@gnome.org captive-announce-list@jankratochvil.net @@ -123,9 +132,13 @@ my @lists=qw( autoconf-patches@gnu.org wget-patches@sunsite.dk wget@sunsite.dk - mailman-developers@python.org wineconf@winehq.org prague-pm@pm.org + dev@httpd.apache.org + asterisk-perl@lists.gnuinter.net + isdn4linux@listserv.isdn4linux.de + libc-alpha@sources.redhat.com + squid-dev@squid-cache.org ); #4c-list@vellum.cz @@ -361,23 +374,31 @@ sub audit store "=mffstatnice","bell" if headeris "List-Post",''; store "=hw","log" if headeris "List-Post",''; store "=gnokii","log" if headeris "List-Id" ,''; - store "=winelic","log" if headeris "List-Id" ,''; - store "=wined","log" if headeris "List-Id" ,''; + store "=winelic","silent" if headeris "List-Id" ,''; + store "=wined","silent" if headeris "List-Id" ,''; store "=winepat","silent" if headeris "List-Id" ,''; store "=winecvs","silent" if headeris "List-Id" ,''; - store "=wineann","log" if headeris "List-Id" ,''; - store "=wineconf","log" if headeris "List-Id" ,''; - store "=ros","log" if headeris "List-Id" ,''; - store "=roskernel","log" if headeris "List-Id" ,''; + store "=wineann","silent" if headeris "List-Id" ,''; + store "=wineconf","silent" if headeris "List-Id" ,''; + store "=ros","silent" if headeris "List-Id" ,''; + store "=roskernel","silent" if headeris "List-Id" ,''; + store "=rosd","silent" if headeris "List-Id" ,''; store "=roscvs","silent" if headeris "List-Id" ,''; - store "=rosbug","log" if headeris "Reply-To" ,''; + store "=rossvn","silent" if headeris "List-Id" ,''; + store "=rosbug","silent" if headeris "Reply-To" ,''; store "=fsd","silent" if headeris "X-Mailing-List",''; - store "=kerneld","silent" if headeris "X-Mailing-List",''; + store "=kernel","silent" if headeris "X-Mailing-List",''; + store "=kernelnet","silent" if headeris "X-Mailing-List",''; + store "=ia64","silent" if headeris "X-Mailing-List",''; + store "=linuxjap","silent" if headeris "X-Mailing-List",''; + store "=kernelann","silent" if headeris "X-Mailing-List",''; + store "=sparse","silent" if headeris "X-Mailing-List",''; + store "=smp","silent" if headeris "X-Mailing-List",''; store "=surprise","sms" if headeris "List-Post",''; store "=surprisesuse","sms" if headeris "Sender" ,''; - store "=tacacs","log" if headeris "Sender" ,''; - store "=tacacs","log" if headeris "Sender" ,''; - store "=tacacs","log" if headeris "List-Id" ,''; + store "=tacacs","silent" if headeris "Sender" ,''; + store "=tacacs","silent" if headeris "Sender" ,''; + store "=tacacs","silent" if headeris "List-Id" ,''; store "=pm","log" if headeris "Sender" ,''; store "=radary","log" if headeris "Reply-To" ,''; store "=dnet","log" if headeris "Sender" ,'<@lists.distributed.net>'; @@ -393,11 +414,12 @@ sub audit store "=sourceforge","bell" if headeris "From" ,''; store "=gsmperlcvs","silent" if headeris("From" ,'') && $Audit->subject()=~/^'.*' has been updated!$/; - store "=libtoold","log" if headeris "List-Id" ,''; - store "=libtoolpat","log" if headeris "List-Id" ,''; - store "=automake","log" if headeris "List-Id" ,''; + store "=libtoold","silent" if headeris "List-Id" ,''; + store "=libtoolpat","silent" if headeris "List-Id" ,''; + store "=automake","silent" if headeris "List-Id" ,''; store "=autoconf","log" if headeris "List-Id" ,''; store "=autoconfpat","log" if headeris "List-Id" ,''; + store "=hurd","log" if headeris "List-Id" ,''; my %mailman=( ''=>"=caperr", ''=>"=caperr", @@ -418,25 +440,42 @@ sub audit store "=capann","bell" if headeris "List-Id" ,''; store "=4c","bell" if headeris "List-Id" ,'<4c-list.vellum.cz>'; } - store "=ntfsann","log" if headeris "List-Id" ,''; - store "=ntfsd","log" if headeris "List-Id" ,''; - store "=orbit","log" if headeris "List-Id" ,''; + store "=ntfsann","silent" if headeris "List-Id" ,''; + store "=ntfsd","silent" if headeris "List-Id" ,''; + store "=orbit","silent" if headeris "List-Id" ,''; store "=kand","log" if headeris "List-Id" ,''; - store "=mailmand","log" if headeris "List-Id" ,''; + store "=mailmand","silent" if headeris "List-Id" ,''; + store "=asterisk-perl","log" if headeris "List-Post",''; + store "=i4l","silent" if headeris "List-Id" ,''; + store "=glibc","silent" if headeris "Mailing-List",qr/\b\Qlibc-alpha-help\E@\Qsources.redhat.com\E\b/; + store "=fedann","bell" if headeris "List-Id" ,''; + store "=fedtools","log" if headeris "List-Id" ,''; + store "=bashbug","log" if headeris "List-Id" ,''; # own webs store "=energie","bell" if headeris "From" ,qr/^EnergieWeb/; store "=ats","log" if headeris("From" ,'') || (headeris("From",'') && headerhas("To",'')); store "=atscasablanca","log" if headeris "From" ,''; store "=www-sms","log" if headeris "List-Id" ,''; + store "=httpdd","log" if headeris "list-post",''; + store "=mms2log","log" if headeris "Return-Path",''; + store "=hotelgatelog","log" if headeris "Return-Path",''; # Petr Koutecky does not mark his Stuff store "=koutecky","log" if headeris "Return-Path",''; store "=koutecky","log" if headeris "Return-Path",''; + store "=koutecky","log" if headeris "Return-Path",''; + + if (($isFROM_MAILER && !did) || !did) { + lmtp_deliver $lmtp_admin,$lmtp_pwd,$lmtp_user_from,$lmtp_user_to; + } store "=errm","bell" if $isFROM_MAILER && !did(); - store "==","sms" if !did; + if (!did) { + store "==","sms"; + spamassassin "$HOME/bin/sa-learn --ham"; + } } sub audit_sms_address