From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,BAYES_00 shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id BEBD11F66E for ; Tue, 8 Sep 2020 08:29:14 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH] www: make mirror instructions more prominent Date: Tue, 8 Sep 2020 08:29:14 +0000 Message-Id: <20200908082914.452-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: In order to fight the misconception that public-inboxes are centralized, anchor "#mirror" to the clone instructions and place an emphasis on "mirror", not just cloning. While we're at it, better describe multi-epoch -V2 inboxes, since some users do not seem to realize epochs consist of different data. --- lib/PublicInbox/WwwStream.pm | 37 ++++++++++++++++++++++-------------- 1 file changed, 23 insertions(+), 14 deletions(-) diff --git a/lib/PublicInbox/WwwStream.pm b/lib/PublicInbox/WwwStream.pm index e06e3456..f1b5119a 100644 --- a/lib/PublicInbox/WwwStream.pm +++ b/lib/PublicInbox/WwwStream.pm @@ -50,9 +50,10 @@ sub html_top ($) { } elsif ($ctx->{qp}->{t}) { $top = qq($top); } - my $links = "help / ". - "color / ". - "Atom feed"; + my $links = qq(help / ). + qq(color / ). + qq(mirror / ). + q(Atom feed); if ($ibx->search) { my $q_val = delete($ctx->{-q_value_html}) // ''; $q_val = qq(\nvalue="$q_val") if $q_val ne ''; @@ -83,7 +84,11 @@ sub code_footer ($) { sub _html_end { my ($ctx) = @_; - my $urls = 'Archives are clonable:'; + my $urls = <This inbox may be cloned and mirrored by anyone: +EOF + my $ibx = $ctx->{-inbox}; my $desc = ascii_html($ibx->description); @@ -94,12 +99,18 @@ sub _html_end { my %seen = ($http => 1); if (defined($max)) { # v2 for my $i (0..$max) { - # old parts my be deleted: + # old epochs my be deleted: -d "$ibx->{inboxdir}/git/$i.git" or next; my $url = "$http/$i"; $seen{$url} = 1; push @urls, "$url $dir/git/$i.git"; } + my $nr = scalar(@urls); + if ($nr > 1) { + $urls .= "\n\t# this inbox consists of $nr epochs:"; + $urls[0] .= "\t# oldest"; + $urls[-1] .= "\t# newest"; + } } else { # v1 push @urls, $http; } @@ -111,12 +122,7 @@ sub _html_end { push @urls, $u =~ /\Ahttps?:/ ? qq($u) : $u; } - if (defined($max) || scalar(@urls) > 1) { - $urls .= "\n" . - join("\n", map { "\tgit clone --mirror $_" } @urls); - } else { - $urls .= " git clone --mirror $urls[0]"; - } + $urls .= "\n" . join("\n", map { "\tgit clone --mirror $_" } @urls); if (defined $max) { my $addrs = $ibx->{address}; $addrs = join(' ', @$addrs) if ref($addrs) eq 'ARRAY'; @@ -134,16 +140,19 @@ EOF } my $cfg_link = ($ctx->{-upfx} // '').'_/text/config/raw'; - $urls .= qq(\nExample config snippet for mirrors\n); + $urls .= <config snippet for mirrors. +EOF my @nntp = map { qq($_) } @{$ibx->nntp_url}; if (@nntp) { - $urls .= "\n"; $urls .= @nntp == 1 ? 'Newsgroup' : 'Newsgroups are'; $urls .= ' available over NNTP:'; $urls .= "\n\t" . join("\n\t", @nntp) . "\n"; } if ($urls =~ m!\b[^:]+://\w+\.onion/!) { - $urls .= "\n note: .onion URLs require Tor: "; + $urls .= " note: .onion URLs require Tor: "; $urls .= qq[$TOR_URL]; } '
'.join("\n\n",