From: Eric Wong <e@80x24.org>
Date: Sun, 5 May 2019 23:28:02 +0000 (+0000)
Subject: Merge remote-tracking branch 'origin/wwwlisting'
X-Git-Tag: v1.2.0~301
X-Git-Url: http://www.git.stargrave.org/?p=public-inbox.git;a=commitdiff_plain;h=e1ed79d1e99e2c58b3edb370e60904cf656dd823

Merge remote-tracking branch 'origin/wwwlisting'

* origin/wwwlisting:
  www: support listing of inboxes
  start depending on Perl 5.10.1+
---

e1ed79d1e99e2c58b3edb370e60904cf656dd823
diff --cc Documentation/public-inbox-config.pod
index 29150220,17b8bac7..d44c8f30
--- a/Documentation/public-inbox-config.pod
+++ b/Documentation/public-inbox-config.pod
@@@ -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 lib/PublicInbox/WwwStream.pm
index ea7aaad0,c708c21f..2893138d
--- a/lib/PublicInbox/WwwStream.pm
+++ b/lib/PublicInbox/WwwStream.pm
@@@ -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,