]> Sergey Matveev's repositories - public-inbox.git/commitdiff
config: allow per-inbox nntpserver
authorEric Wong <e@80x24.org>
Sat, 7 Jan 2017 01:44:49 +0000 (01:44 +0000)
committerEric Wong <e@80x24.org>
Sat, 7 Jan 2017 01:45:44 +0000 (01:45 +0000)
This allows certain inboxes to override the global nntpserver
(perhaps under a different domain).

lib/PublicInbox/Config.pm
t/config.t

index 55019e9f407d1b60f5cb0d3be19867a1d062111e..28b5bdb5f895547909694f4c4916b9d7297f439e 100644 (file)
@@ -136,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;
        }
index 040e9fb2dee6a8ab133bad648a88c8c938845026..3ba61119728fbad52c80c036d23007aae5359027 100644 (file)
@@ -78,6 +78,12 @@ my $tmpdir = tempdir('pi-config-XXXXXX', TMPDIR => 1, CLEANUP => 1);
        my $cfg = PublicInbox::Config->new(\%tmp);
        my $ibx = $cfg->lookup_name('test');
        is($ibx->{nntpserver}, 'news.example.com', 'global NNTP server');
+
+       delete $h{'publicinbox.nntpserver'};
+       $h{"$pfx.nntpserver"} = 'news.alt.example.com';
+       $cfg = PublicInbox::Config->new(\%h);
+       $ibx = $cfg->lookup_name('test');
+       is($ibx->{nntpserver}, 'news.alt.example.com','per-inbox NNTP server');
 }
 
 done_testing();