X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FWwwStream.pm;h=0f4f55d0f7246a68ee737ecb7b445cc7d8ddee31;hb=fece7fca6aeac74410a813cffcb0da338017d0ed;hp=082e5ec9caf3b3466efe96ae0439d81a05a4a4db;hpb=c477bdd8a80eecc319b680764edfb24bd12cb7b2;p=public-inbox.git
diff --git a/lib/PublicInbox/WwwStream.pm b/lib/PublicInbox/WwwStream.pm
index 082e5ec9..0f4f55d0 100644
--- a/lib/PublicInbox/WwwStream.pm
+++ b/lib/PublicInbox/WwwStream.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2016-2018 all contributors
+# Copyright (C) 2016-2019 all contributors
# License: AGPL-3.0+
#
# HTML body stream for which yields getline+close methods
@@ -11,15 +11,22 @@ use strict;
use warnings;
use PublicInbox::Hval qw(ascii_html);
our $TOR_URL = 'https://www.torproject.org/';
-our $CODE_URL = 'https://public-inbox.org/';
-our $PROJECT = 'public-inbox';
+our $CODE_URL = 'https://public-inbox.org/public-inbox.git';
# noop for HTTP.pm (and any other PSGI servers)
sub close {}
sub new {
my ($class, $ctx, $cb) = @_;
- bless { nr => 0, cb => $cb || *close, ctx => $ctx }, $class;
+
+ my $base_url = $ctx->{-inbox}->base_url($ctx->{env});
+ chop $base_url; # no trailing slash for clone
+ bless {
+ nr => 0,
+ cb => $cb || *close,
+ ctx => $ctx,
+ base_url => $base_url,
+ }, $class;
}
sub response {
@@ -72,7 +79,7 @@ sub _html_top ($) {
sub code_footer ($) {
my ($env) = @_;
my $u = PublicInbox::Hval::prurl($env, $CODE_URL);
- qq(AGPL code for this site: git clone $u $PROJECT)
+ qq(AGPL code for this site: git clone $u)
}
sub _html_end {
@@ -83,15 +90,14 @@ sub _html_end {
my $desc = ascii_html($ibx->description);
my (%seen, @urls);
- my $http = $ibx->base_url($ctx->{env});
- chop $http; # no trailing slash for clone
+ my $http = $self->{base_url};
my $max = $ibx->max_git_epoch;
my $dir = (split(m!/!, $http))[-1];
if (defined($max)) { # v2
$seen{$http} = 1;
for my $i (0..$max) {
# old parts my be deleted:
- -d "$ibx->{mainrepo}/git/$i.git" or next;
+ -d "$ibx->{inboxdir}/git/$i.git" or next;
my $url = "$http/$i";
$seen{$url} = 1;
push @urls, "$url $dir/git/$i.git";
@@ -127,10 +133,15 @@ sub _html_end {
$addrs
public-inbox-index $dir
EOF
+ } else { # v1
+ $urls .= "\n";
}
+
+ my $cfg_link = ($ctx->{-upfx} // '').'_/text/config/raw';
+ $urls .= qq(\nExample config snippet for mirrors\n);
my @nntp = map { qq($_) } @{$ibx->nntp_url};
if (@nntp) {
- $urls .= "\n\n";
+ $urls .= "\n";
$urls .= @nntp == 1 ? 'Newsgroup' : 'Newsgroups are';
$urls .= ' available over NNTP:';
$urls .= "\n\t" . join("\n\t", @nntp) . "\n";