From: short <> Date: Sun, 19 Oct 2003 13:41:23 +0000 (+0000) Subject: Converted to example form. X-Git-Tag: bp_lace~25 X-Git-Url: http://git.jankratochvil.net/?p=PerlMail.git;a=commitdiff_plain;h=0cf7011ee6c09dfede5c8e55f5f3f795ed8abab4 Converted to example form. --- diff --git a/PerlMail/Config.pm b/PerlMail/Config.pm index 49f6a58..dc9f756 100644 --- a/PerlMail/Config.pm +++ b/PerlMail/Config.pm @@ -52,7 +52,7 @@ BEGIN { # perlmail-accept & perlmail-sendmail # Various configuration files location is derived from it: -our $HOME="/home/lace"; +our $HOME="/home/USERNAME"; # perlmail-accept @@ -60,15 +60,15 @@ our $HOME="/home/lace"; # Mail folder: our $Mail="$HOME/Mail"; # Users respected for the 'idle' state (see $IdleMax): -our @ValidUsers=qw(root lace short kratochvil _local); +our @ValidUsers=qw(root USERNAME _local); # Maximum number of local console idle seconds while still considered as 'active user': our $IdleMax=10; # Maxium number of bytes to pass to Lingua::EN::Squeeze (performance optimization): our $MaxBodySMS=0x1000; # Telephone number to send SMSes by WWW::SMS to: -our @SMSwebRcpt=qw(420 602 431329); +our @SMSwebRcpt=qw(123 456 789123); # Some WWW::SMS modules require username: -our $SMSwebRcpt_username="lace2"; +our $SMSwebRcpt_username="SMSUSERNAME"; # perlmail-submit @@ -76,46 +76,22 @@ our $SMSwebRcpt_username="lace2"; # Global system lock for exclusive $DB_table access: our $Lock_pathname="/tmp/PerlMail.lock"; # 'workstation' hostname and port. Hostname may be dyndns: -our $PeerAddr="exuhome.dyn.jankratochvil.net.:852"; +our $PeerAddr="workstation.hostname.tld.:852"; #our $PeerAddr="127.0.0.1:2852"; # 15sec is NOT enough as the remote peer must complete mail store: our $Socket_timeout=7600; # MySQL table name: our $DB_table="PerlMail_folder"; # MySQL database name: -our $DBI_database="short"; +our $DBI_database="USERNAME"; # MySQL user name: -our $DBI_user="short"; +our $DBI_user="USERNAME"; # MySQL user password: our $DBI_pwd=$ENV{"HOME"}."/priv/mysql.".$DBI_user.".pwd"; # perlmail-sendmail -# Lists where address is generated: -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-cvs@reactos.com - 4cinfo@atrey.karlin.mff.cuni.cz - libtool@gnu.org - libtool-patches@gnu.org - wine-license@winehq.com - wine-devel@winehq.com - wine-patches@winehq.com - gtk-devel-list@gnome.org - gnome-vfs-list@gnome.org - captive-announce-list@jankratochvil.net - captive-list@jankratochvil.net - captive-devel-list@jankratochvil.net - ); - # Pathname of the original sendmail(8) binary: our $sendmail_orig=(-x ($_="/usr/sbin/sendmail-orig") ? $_ : "/usr/sbin/sendmail"); # List of addresses to locally Bcc all mails to: @@ -125,7 +101,6 @@ our @addr_addon=(Mail::Alias->new("/etc/aliases")->exists("sentout") ? ("sentout our $opt_F; # imported our $is_pgp; # imported -my %lists=map(($_=>1),@lists); # Generate new From address for the target $rcpt of type Mail::Address. # $iserror is true for "MAIL FROM" RFC821 address, false for "From:" RFC822 address. # Returns: Mail::Address instance. @@ -133,35 +108,8 @@ sub FromAddress { my($rcpt,$iserror)=@_; - my $phrase=(defined $opt_F ? $opt_F : "Jan Kratochvil"); - { - last if !$is_pgp; - last if $iserror; - local *F; - local $_; - my $filename="$HOME/.gnupg/options"; - open F,$filename or do { warn "Open \"$filename\": $!"; last; }; - local $/="\n"; - my @keys=map((/^\s*default-key\s+(\S+)\s*$/),); - @keys==1 or do { warn "Found ".scalar(@keys)." 'default-key's in your \"$filename\", ignoring"; last; }; - close F or warn "Close \"$filename\": $!"; - my $default_key=$keys[0]; - $default_key=~/^[[:xdigit:]]{8}$/ or do { warn "Invalid 'default-key', ignoring: $default_key"; last; }; - return Mail::Address->new( - $phrase, - 'pgp-'.uc($default_key).'@jankratochvil.net', - ); - } - return Mail::Address->new($phrase,'lace@jankratochvil.net') if !$lists{$rcpt->address()}; - return Mail::Address->new( - $phrase, - 'rcpt' - .'-' - .(defined($rcpt->user()) ? $rcpt->user() : "NOUSER") - .".AT." - .(defined($rcpt->host()) ? $rcpt->host() : "LOCAL") - .'@jankratochvil.net', - ); + my $phrase=(defined $opt_F ? $opt_F : "FULL NAME"); + return Mail::Address->new($phrase,'USER@DOMAIN.TLD'); } # RedHat sendmail-8.9.3-20/src/conf.c/HdrInfo[]/\Q/* destination fields */\E @@ -206,23 +154,17 @@ our @sms_squeezes=( { "SqueezeControl"=>"max" ,"SQZ_OPTIMIZE_LEVEL"=>0 }, { "SqueezeControl"=>"max" ,"SQZ_OPTIMIZE_LEVEL"=>1 }, ); -# Hostnames where we had alternate e-mail addresses: +# Hostnames where we had old/alternate e-mail addresses: our @alternates_host=( - "jabberwock.ucw.cz", # short@ucw.cz - "atrey.karlin.mff.cuni.cz", # short@atrey.karlin.mff.cuni.cz - "k332.feld.cvut.cz", # short@k332.feld.cvut.cz ); # Override DNS blacklists: our @dnsbl_whitelist=( - "195.250.128.83", # smtp3.vol.cz; vol.cz.multistage.blackholes.five-ten-sg.com. "64.49.222.22", # mail.pm.org: rackspace.com.spam-support.blackholes.five-ten-sg.com. "208.147.243.5", # gambit.liquidcomm.net: cw.net.spam-support.blackholes.five-ten-sg.com. - "213.235.135.70", # smtp.tiscali.cz: tiscali.cz.multistage.blackholes.five-ten-sg.com. "205.139.198.11", # eniac.disaster.com: cw.net.spam-support.blackholes.five-ten-sg.com. "127.0.0.2", # 2.0.0.127.relays.ordb.org. "65.113.40.131", # bozo.vmware.com: qwest.net.spam-support.blackholes.five-ten-sg.com. "66.218.85.33", # mta2.wss.scd.yahoo.com: yahoo.com.spam.blackholes.five-ten-sg.com. - "212.80.76.42", # mx2.seznam.cz: seznam.cz.free.blackholes.five-ten-sg.com. ); our $Audit; # imported @@ -233,7 +175,6 @@ our $store_ignore; # imported sub audit { $store_profile=undef(); - # TODO: storage? # never spawn new mail if FROM_MAILER # $isFROM_MAILER postponed after maillists as they may look as FROM_MAILER @@ -249,15 +190,8 @@ sub audit local $_; # Do not local $store_file as it is our-imported $store_profile="silent"; - store "=spam" if grep /^\Qshort\@k332.feld.cvut.cz\E/i,Received_for(); - # TODO: foreign violation of RFC 822 section 4.4.4, Subject:.*Automatick.+odpov.+v.+nep.+tomnosti store "=spam" if headeris "From",''; - store "=spam" if headeris "From",''; - store "=spam" if headeris "From",''; - store "=spam" if headeris "From",''; - store "=spam" if headeris "From",''; store "=spam" if headeris "From",''; - store "=spam" if headeris "From",''; { # weak detection: files with text/html w/o text/plain are usually a spam my @types_linear=map({ mime_type($_); } parts_linear()); @@ -288,19 +222,10 @@ sub audit }; $store_profile=undef(); - # special delivery - store "=err","bell" and return if headerhas \&Received_for,''; - # ppl-wished foreign remapping, Reply-To is left untouched! # FIXME: modifications are now being dropped by &write_message! header_remap("From",{ - 'kerere@post.cz' =>'kamzik@k332.feld.cvut.cz', - 'profes@mbox.vol.cz' =>'kratochvilova@egp.cz', - 'jkrouzek@mbox.vol.cz' =>'krouzek@mbox.fsv.cuni.cz', - 'jakub.gorner@lidovky.cz' =>'tonda@disnet.cz', - 'jan.kolar@videoprogress.cz' =>'jenda.kolar@volny.cz', - 'daniel.rulicek@cponline.cz' =>'daniel.rulicek@cpress.cz', - 'pavel@suse.cz' =>'pavel@ucw.cz', + 'RECEIVED@ADDRESS.TLD'=>'MAP_TO@ADDRESS.TLD', }); # My obsolete e-mail addresses @@ -312,82 +237,16 @@ sub audit $store_profile="log"; local $store_ignore; $store_ignore="smsmail" if 1==$Audit->body() && length(join "",$Audit->body())<180; # SMS mail - $store_ignore="sms OS" if $Audit->subject()=~/^Email pro: /; # "^Email pro: gsm@sh\.cvut\.cz$"; $store_ignore="list-moron" if grep { headeris "From",$_; } qw( - - - - - <@mujoskar.cz> - - - - - + ); - store "=gsm" if headeris "Sender" ,''; - store "=gsmpand" if headeris "List-Post",''; - store "=9kc","log" if headeris "List-Post",''; - store "=9kcd","log" if headeris "List-Post",''; + store "=LOCALNAME" if headeris "Sender" ,''; } $store_profile=undef(); # lists - store "=mozillabug","log" if headeris "From" ,''; - store "=9ku","log" if headeris "List-Id" ,'<9000.listman.net>'; - store "=9kd","log" if headeris "Sender" ,''; - store "=spong","log" if headeris "List-Id" ,''; - store "=gtkd","silent" if headeris "List-Id" ,''; - store "=gnomevfs","log" if headeris "List-Id" ,''; - 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","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 "=ros","log" if headeris "List-Id" ,''; - store "=roskernel","log" if headeris "List-Id" ,''; - store "=roscvs","silent" if headeris "List-Id" ,''; - store "=rosbug","log" if headeris "Reply-To" ,''; - store "=fsd","silent" if headeris "X-Mailing-List",''; - store "=kerneld","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 "=pm","sms" if headeris "Sender" ,''; - store "=radary","log" if headeris "Reply-To" ,''; - store "=dnet","log" if headeris "Sender" ,'<@lists.distributed.net>'; - store "=linux-input","log" if headeris "List-Post",''; - store "=strom","bell" if headeris "List-Post",''; - store "=netinfo","log" if headeris "Sender" ,''; - store "=saintmj","log" if headeris "From" ,''; - store "=saintmj","log" if headeris "From" ,''; - store "=4cerr","bell" if headeris "From" ,''; - store "=4c","sms" if headeris "List-Post",'<4cinfo@atrey.karlin.mff.cuni.cz>'; - store "=slashdot","bell" if headeris "From" ,''; - store "=freshmeat","bell" if headeris "From" ,''; - 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 "=cap","bell" if headeris "List-Id" ,''; - store "=capd","bell" if headeris "List-Id" ,''; - store "=capann","bell" 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" ,''; - - # Petr Koutecky does not mark his Stuff - store "=koutecky","log" if headeris "From" ,''; + store "=LIST","log" if headeris "List-Id" ,''; store "=errm","bell" if $isFROM_MAILER && !did();