config: allow per-inbox nntpserver

[public-inbox.git] / lib / PublicInbox / Config.pm

diff --git a/lib/PublicInbox/Config.pm b/lib/PublicInbox/Config.pm
index 6e31df7267fe0c64be3c8dc95db8e8f66819a9df..28b5bdb5f895547909694f4c4916b9d7297f439e 100644 (file)
--- a/lib/PublicInbox/Config.pm
+++ b/lib/PublicInbox/Config.pm
@@ -90,21 +90,11 @@ sub limiter {
        my ($self, $name) = @_;
        $self->{-limiters}->{$name} ||= do {
                require PublicInbox::Qspawn;
-               my $max;
-               # XXX "limiter.<name>.max" was a historical mistake
-               foreach my $pfx (qw(publicinboxlimiter limiter)) {
-                       $max ||= $self->{"$pfx.$name.max"};
-               }
+               my $max = $self->{"publicinboxlimiter.$name.max"};
                PublicInbox::Qspawn::Limiter->new($max);
        };
 }
 
-sub get {
-       my ($self, $inbox, $key) = @_;
-
-       $self->{"publicinbox.$inbox.$key"};
-}
-
 sub config_dir { $ENV{PI_DIR} || "$ENV{HOME}/.public-inbox" }
 
 sub default_file {
@@ -146,7 +136,7 @@ sub _fill {
 
        foreach my $k (qw(mainrepo address filter url newsgroup
                        infourl watch watchheader httpbackendmax
-                       feedmax)) {
+                       feedmax nntpserver)) {
                my $v = $self->{"$pfx.$k"};
                $rv->{$k} = $v if defined $v;
        }