Documentation/dc-dlvr-spam-flow.txt | 2 +- README | 2 +- examples/public-inbox.psgi | 4 +++- lib/PublicInbox/GitHTTPBackend.pm | 2 +- lib/PublicInbox/WwwStream.pm | 4 ++-- diff --git a/Documentation/dc-dlvr-spam-flow.txt b/Documentation/dc-dlvr-spam-flow.txt index d151d272d0aea390d6f08260ef06fe7a8ce738b6..81aba766ce8ffebc78369535ec73ed13bdfff487 100644 --- a/Documentation/dc-dlvr-spam-flow.txt +++ b/Documentation/dc-dlvr-spam-flow.txt @@ -45,4 +45,4 @@ * spamc / spamd - SpamAssassin: http://spamassassin.apache.org/ * report-spam / dc-dlvr - distributed with public-inbox in the scripts/ - directory: git clone https://public-inbox.org/public-inbox.git + directory: git clone https://public-inbox.org/ public-inbox diff --git a/README b/README index ca4e2a86ed35b0f690d50c5e222d6c7b2af8ee47..f56d68d2307d284e5b17e5c4db59d3a2838d1767 100644 --- a/README +++ b/README @@ -87,7 +87,7 @@ ------- Source code is available via git: - git clone https://public-inbox.org/public-inbox.git + git clone https://public-inbox.org/ public-inbox See below for contact info. diff --git a/examples/public-inbox.psgi b/examples/public-inbox.psgi index a90a2bc3ae7544ebedcc5eb04d64b52750989231..11e2a6e73a51115db0442600bd96650804cdc176 100644 --- a/examples/public-inbox.psgi +++ b/examples/public-inbox.psgi @@ -47,7 +47,9 @@ enable 'Head'; sub { my ($env) = @_; # share public-inbox.git code! - if ($src && $env->{PATH_INFO} =~ m!\A/public-inbox\.git/(.*)!) { + if ($src && $env->{PATH_INFO} =~ + m!\A/(?:public-inbox(?:\.git)?/)? + ($PublicInbox::GitHTTPBackend::ANY)\z!xo) { PublicInbox::GitHTTPBackend::serve($env, $src, $1); } else { $www->call($env); diff --git a/lib/PublicInbox/GitHTTPBackend.pm b/lib/PublicInbox/GitHTTPBackend.pm index 4f58c6bbcb82a3e392793c3d765f11d8324fe0cf..b4851920fe04f55b51ede42fa6770b70982cf17e 100644 --- a/lib/PublicInbox/GitHTTPBackend.pm +++ b/lib/PublicInbox/GitHTTPBackend.pm @@ -23,7 +23,7 @@ objects/[a-f0-9]{2}/[a-f0-9]{38} objects/pack/pack-[a-f0-9]{40}\.(?:pack|idx) !; -our $ANY = join('|', @binary, @text); +our $ANY = join('|', @binary, @text, 'git-upload-pack'); my $BIN = join('|', @binary); my $TEXT = join('|', @text); diff --git a/lib/PublicInbox/WwwStream.pm b/lib/PublicInbox/WwwStream.pm index 97a6dc78815b1e5e4734a855303c1cf9c00948bf..87a461e18b831744535f93f5e4e2b8ce2bc2f4ae 100644 --- a/lib/PublicInbox/WwwStream.pm +++ b/lib/PublicInbox/WwwStream.pm @@ -7,7 +7,7 @@ use strict; use warnings; use PublicInbox::Hval qw(ascii_html); use URI; -use constant PI_URL => 'https://public-inbox.org/public-inbox.git'; +use constant PI_URL => 'https://public-inbox.org/'; sub new { my ($class, $ctx, $cb) = @_; @@ -87,7 +87,7 @@ '
'.join("\n",
'- ' . $desc,
$urls,
'Archived served using code from public-inbox:',
- "\tgit clone $url",
+ "\tgit clone $url public-inbox",
).'