diff options
| author | fukachan <fukachan> | 2001-02-12 16:29:20 +0000 |
|---|---|---|
| committer | fukachan <fukachan> | 2001-02-12 16:29:20 +0000 |
| commit | 4d7953053ce91b9dd7bf805a334a72f653b9568c (patch) | |
| tree | 80fc6327566f5094d4e82b9f876c5befc1648db8 /fml | |
| parent | 28cf7e030d92fda176fc7a03d420d2336a478932 (diff) | |
| download | fml8-4d7953053ce91b9dd7bf805a334a72f653b9568c.tar.gz fml8-4d7953053ce91b9dd7bf805a334a72f653b9568c.tar.bz2 fml8-4d7953053ce91b9dd7bf805a334a72f653b9568c.zip | |
s/mta/smtp_servers/
Diffstat (limited to 'fml')
| -rw-r--r-- | fml/etc/default_config.cf.ja | 2 | ||||
| -rw-r--r-- | fml/etc/defaults/mta.cf.ja | 2 | ||||
| -rw-r--r-- | fml/lib/FML/Process/Distribute.pm | 2 | ||||
| -rw-r--r-- | fml/lib/MailingList/Delivery.pm | 2 | ||||
| -rw-r--r-- | fml/lib/MailingList/SMTP.pm | 10 |
5 files changed, 9 insertions, 9 deletions
diff --git a/fml/etc/default_config.cf.ja b/fml/etc/default_config.cf.ja index 25bb1894..b4724450 100644 --- a/fml/etc/default_config.cf.ja +++ b/fml/etc/default_config.cf.ja @@ -79,7 +79,7 @@ system_accounts = root recipient_limit = 1000 # デフォールトの MTA は自分自身( localhost ) -mta = [::1]:25 +smtp_servers = [::1]:25 127.0.0.1:25 diff --git a/fml/etc/defaults/mta.cf.ja b/fml/etc/defaults/mta.cf.ja index 60c15db5..083386cd 100644 --- a/fml/etc/defaults/mta.cf.ja +++ b/fml/etc/defaults/mta.cf.ja @@ -5,6 +5,6 @@ recipient_limit = 1000 # デフォールトの MTA は自分自身( localhost ) -mta = [::1]:25 +smtp_servers = [::1]:25 127.0.0.1:25 diff --git a/fml/lib/FML/Process/Distribute.pm b/fml/lib/FML/Process/Distribute.pm index 5b06b50e..6cc9ad2b 100644 --- a/fml/lib/FML/Process/Distribute.pm +++ b/fml/lib/FML/Process/Distribute.pm @@ -228,7 +228,7 @@ sub _deliver_article $service->deliver( { - 'mta' => $config->{'mta'}, + 'smtp_servers' => $config->{'smtp_servers'}, 'smtp_sender' => 'rudo', 'recipient_maps' => $config->{recipient_maps}, diff --git a/fml/lib/MailingList/Delivery.pm b/fml/lib/MailingList/Delivery.pm index 15796b8f..45e88dba 100644 --- a/fml/lib/MailingList/Delivery.pm +++ b/fml/lib/MailingList/Delivery.pm @@ -66,7 +66,7 @@ MailingList::Delivery - mail delivery system interface $service->deliver( { - mta => '[::1]:25 127.0.0.1:25', + smtp_servers => '[::1]:25 127.0.0.1:25', smtp_sender => 'rudo@nuinui.net', recipient_maps => $recipient_maps, diff --git a/fml/lib/MailingList/SMTP.pm b/fml/lib/MailingList/SMTP.pm index 7150a7f6..a3e40db3 100644 --- a/fml/lib/MailingList/SMTP.pm +++ b/fml/lib/MailingList/SMTP.pm @@ -48,7 +48,7 @@ To start delivery, use deliver() method in this way. $service->deliver( { - mta => '127.0.0.1:25', + smtp_servers => '127.0.0.1:25', smtp_sender => 'rudo@nuinui.net', recipient_maps => $recipient_maps, @@ -65,7 +65,7 @@ You can use ARRAY REFERENCE. $service->deliver( { - mta => '127.0.0.1:25', + smtp_servers => '127.0.0.1:25', smtp_sender => 'rudo@nuinui.net', recipient_array_reference => $rarray, @@ -298,14 +298,14 @@ start delivery process. hash key value -------------------------------------------- - mta 127.0.0.1:25 [::1]:25 + smtp_servers 127.0.0.1:25 [::1]:25 smtp_sender sender's mail address recipient_maps $recipient_maps recipient_limit recipients in one SMTP transactions header FML::Header object body MailingList::Messages object -C<mta> is a list of MTA's. +C<smtp_servers> is a list of MTA's. The syntax of each MTA is address:port style. If you use a raw IPv6 address, use [address]:port syntax. For example, [::1]:25 (v6 loopback). @@ -363,7 +363,7 @@ sub deliver my %used_map = (); # prepare loop for each mta and map - my @mta = split(/\s+/, $args->{ mta } || '127.0.0.1:25'); + my @mta = split(/\s+/, $args->{ smtp_servers } || '127.0.0.1:25'); my @maps = (); if ( $args->{ recipient_maps } ) { @maps = split(/\s+/, $args->{ recipient_maps }); |