]> Sergey Matveev's repositories - public-inbox.git/commitdiff
Merge remote-tracking branch 'origin/wwwlisting'
authorEric Wong <e@80x24.org>
Sun, 5 May 2019 23:28:02 +0000 (23:28 +0000)
committerEric Wong <e@80x24.org>
Sun, 5 May 2019 23:28:02 +0000 (23:28 +0000)
* origin/wwwlisting:
  www: support listing of inboxes
  start depending on Perl 5.10.1+

1  2 
Documentation/public-inbox-config.pod
MANIFEST
lib/PublicInbox/WwwStream.pm

index 291502205e0618c974d2e04732a92d7b05fe27f0,17b8bac70987dab9ede2fef3e6d29bae4f2eb79d..d44c8f30777adb03c04f63e4fab121938a2da0d6
@@@ -217,15 -225,35 +225,44 @@@ directive is configured
  
  Default: /var/www/htdocs/cgit/cgit.cgi or /usr/lib/cgit/cgit.cgi
  
 +=item publicinbox.cgitdata
 +
 +A path to the data directory used by cgit for storing static files.
 +Typically guessed based the location of C<cgit.cgi> (from
 +C<publicinbox.cgitbin>, but may be overridden.
 +
 +Default: basename of C<publicinbox.cgitbin>, /var/www/htdocs/cgit/
 +or /usr/share/cgit/
 +
+ =item publicinbox.wwwlisting
+ Enable a HTML listing style when the root path of the URL '/' is accessed.
+ Valid values are:
+ =over 8
+ =item all
+ Show all inboxes
+ =item 404
+ Return a 404 page.  This is useful to allow customization with
+ L<Plack::App::Cascade(3pm)>
+ =item match=domain
+ Only show inboxes with URLs which belong to the domain of the HTTP
+ request
+ =for TODO comment
+ support showing cgit listing
+ =back
+ Default: 404
  =back
  
  =head2 NAMED LIMITER (PSGI)
diff --cc MANIFEST
Simple merge
index ea7aaad0a76024ec7a04adb75a84c9b913d15810,c708c21f21741b43f04b51caab59e6d63f6cd966..2893138d563abafa4ffbf4a8bfe612e801413621
@@@ -133,8 -140,11 +139,7 @@@ EO
        if ($urls =~ m!\b[^:]+://\w+\.onion/!) {
                $urls .= "\n note: .onion URLs require Tor: ";
                $urls .= qq[<a\nhref="$TOR_URL">$TOR_URL</a>];
 -              if ($TOR2WEB_URL) {
 -                      $urls .= "\n       or Tor2web: ";
 -                      $urls .= qq[<a\nhref="$TOR2WEB_URL">$TOR2WEB_URL</a>];
 -              }
        }
-       my $url = PublicInbox::Hval::prurl($ctx->{env}, $CODE_URL);
        '<hr><pre>'.join("\n\n",
                $desc,
                $urls,