diff options
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rwxr-xr-x | debian/echolot.config | 5 | ||||
| -rwxr-xr-x | debian/echolot.postinst.in | 10 | ||||
| -rw-r--r-- | debian/echolot.templates | 16 |
4 files changed, 24 insertions, 14 deletions
diff --git a/debian/changelog b/debian/changelog index 54f96f7..3808bdd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +echolot (2.0.5-1) unstable; urgency=low + + * New upstream version (supports use without user defined mailboxes). + * Make recipient delimiter configured by debconf. + + -- Peter Palfrader <weasel@debian.org> Fri, 25 Oct 2002 12:54:44 +0200 + echolot (2.0.4-3) unstable; urgency=low * Add a debconf note about user defined mailboxes being required diff --git a/debian/echolot.config b/debian/echolot.config index 576fc44..5d348d3 100755 --- a/debian/echolot.config +++ b/debian/echolot.config @@ -26,6 +26,7 @@ if ( -e '/etc/echolot/pingd.conf' ) { $address = $CONFIG->{'my_localpart'}.'@'.$CONFIG->{'my_domain'} if (defined $CONFIG->{'my_localpart'} && defined $CONFIG->{'my_domain'}); $operator = $CONFIG->{'operator_address'} if (defined $CONFIG->{'operator_address'}); $sitename = $CONFIG->{'sitename'} if (defined $CONFIG->{'sitename'}); + $recipient_delimiter = $CONFIG->{'recipient_delimiter'} if (defined $CONFIG->{'recipient_delimiter'}); }; my $mailname; @@ -37,10 +38,12 @@ chomp $mailname; $address = 'echolot@'.$mailname unless defined $address; $operator = 'abuse@'.$mailname unless defined $operator; $sitename = $mailname unless defined $sitename; +$recipient_delimiter = '' unless defined $recipient_delimiter; Debconf::Client::ConfModule::set('echolot/address', $address); Debconf::Client::ConfModule::set('echolot/operator', $operator); Debconf::Client::ConfModule::set('echolot/sitename', $sitename); +Debconf::Client::ConfModule::set('echolot/recipient_delimiter', $recipient_delimiter); my $state = 1; @@ -74,7 +77,7 @@ while (1) { } elsif ($state == 2) { Debconf::Client::ConfModule::input('high', 'echolot/operator'); Debconf::Client::ConfModule::input('high', 'echolot/sitename'); - Debconf::Client::ConfModule::input('high', 'echolot/userdefinedmailbox'); + Debconf::Client::ConfModule::input('high', 'echolot/recipient_delimiter'); Debconf::Client::ConfModule::input('medium', 'echolot/addnow'); } elsif ($state == 3) { last; diff --git a/debian/echolot.postinst.in b/debian/echolot.postinst.in index fac7a1c..912a69b 100755 --- a/debian/echolot.postinst.in +++ b/debian/echolot.postinst.in @@ -66,13 +66,15 @@ cat > $filename << 'EOF' my $address = Debconf::Client::ConfModule::get("echolot/address"); my $operator = Debconf::Client::ConfModule::get("echolot/operator"); my $sitename = Debconf::Client::ConfModule::get("echolot/sitename"); + my $recipient_delimiter = Debconf::Client::ConfModule::get("echolot/recipient_delimiter"); my ($local, $domain) = split (/@/, $address, 2); - my $debconf = sprintf("\$CONFIG->{q{my_localpart} } = q{%s};\n", $local); - $debconf .= sprintf("\$CONFIG->{q{my_domain} } = q{%s};\n", $domain); - $debconf .= sprintf("\$CONFIG->{q{operator_address}} = q{%s};\n", $operator); - $debconf .= sprintf("\$CONFIG->{q{sitename} } = q{%s};\n", $sitename); + my $debconf = sprintf("\$CONFIG->{q{my_localpart} } = q{%s};\n", $local); + $debconf .= sprintf("\$CONFIG->{q{my_domain} } = q{%s};\n", $domain); + $debconf .= sprintf("\$CONFIG->{q{operator_address} } = q{%s};\n", $operator); + $debconf .= sprintf("\$CONFIG->{q{sitename} } = q{%s};\n", $sitename); + $debconf .= sprintf("\$CONFIG->{q{recipient_delimiter} } = q{%s};\n", $recipient_delimiter); my $fh = new IO::File; $fh->open(">/etc/echolot/pingd.conf") or diff --git a/debian/echolot.templates b/debian/echolot.templates index d99d937..e80a4b6 100644 --- a/debian/echolot.templates +++ b/debian/echolot.templates @@ -27,18 +27,16 @@ Description: Add known remailers? If you choose to add them Echolot will also fetch keys and configuration data immediatly. -Template: echolot/userdefinedmailbox -Type: note -Description: Make sure you allow foo+bar@example.org addresses. - Echolot requires user defined mailboxes to work, i.e. mail sent to - echolot+<somerandomstring>@yourdomain needs to reach echolot in addition - to mail to echolot@yourdomain (or whatever local part you specified instead of - echolot). +Template: echolot/recipient_delimiter +Type: string +Default: +Description: What is your recipient delimiter? + Echolot strongly recommends using user defined mailboxes, i.e. mail sent to + echolot+<somerandomstring>@yourdomain should reach echolot too. . In postfix this can be done by adding recipient_delimiter = + to your main.cf file. (If you know the procedure for other MTAs, please file a wishlist bug) . - If you want to use another character instead of the plus sign (+), please set it - in /etc/echolot/pingd.conf. + If you cannot or do not want to enable this please use an empty string. |