watchmaildir: support multiple watchheader values

[public-inbox.git] / lib / PublicInbox / WwwText.pm

diff --git a/lib/PublicInbox/WwwText.pm b/lib/PublicInbox/WwwText.pm
index 2e4aeec0c19e6f85fe8782454d84f33e2aa25f8d..b23a415e47c32be3391d5950054c36c7af185cb5 100644 (file)
--- a/lib/PublicInbox/WwwText.pm
+++ b/lib/PublicInbox/WwwText.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2016-2019 all contributors <meta@public-inbox.org>
+# Copyright (C) 2016-2020 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 
 # used for displaying help texts and other non-mail content
@@ -138,22 +138,40 @@ sub inbox_config ($$$) {
        my $ibx = $ctx->{-inbox};
        push @$hdr, 'Content-Disposition', 'inline; filename=inbox.config';
        my $name = dq_escape($ibx->{name});
+       my $inboxdir = '/path/to/top-level-inbox';
        $$txt .= <<EOS;
 ; example public-inbox config snippet for "$name"
 ; see public-inbox-config(5) manpage for more details:
 ; https://public-inbox.org/public-inbox-config.html
 [publicinbox "$name"]
-       inboxdir = /path/to/top-level-inbox
+       inboxdir = $inboxdir
        ; note: public-inbox before v1.2.0 used "mainrepo"
        ; instead of "inboxdir", both remain supported after 1.2
-       mainrepo = /path/to/top-level-inbox
+       mainrepo = $inboxdir
+       url = https://example.com/$name/
+       url = http://example.onion/$name/
 EOS
-       for my $k (qw(address listid)) {
+       for my $k (qw(address listid infourl watchheader)) {
                defined(my $v = $ibx->{$k}) or next;
                $$txt .= "\t$k = $_\n" for @$v;
        }
+       if (my $altid = $ibx->{altid}) {
+               my $base_url = $ibx->base_url($ctx->{env});
+               my $altid_map = $ibx->altid_map;
+               $$txt .= <<EOF;
+       ; altid DBs may be used to provide numeric article ID lookup from
+       ; old, pre-existing sources.  You can recreate them via curl(1),
+       ; gzip(1), and sqlite3(1) as documented:
+EOF
+               for (sort keys %$altid_map) {
+                       $$txt .= "\t;\tcurl -XPOST $base_url$_.sql.gz | \\\n" .
+                               "\t;\tgzip -dc | \\\n" .
+                               "\t;\tsqlite3 $inboxdir/$_.sqlite3\n";
+                       $$txt .= "\taltid = serial:$_:file=$_.sqlite3\n";
+               }
+       }
 
-       for my $k (qw(filter infourl newsgroup obfuscate replyto watchheader)) {
+       for my $k (qw(filter newsgroup obfuscate replyto)) {
                defined(my $v = $ibx->{$k}) or next;
                $$txt .= "\t$k = $v\n";
        }
@@ -166,17 +184,21 @@ EOS
 
                my $pi_config = $ctx->{www}->{pi_config};
                for my $cr_name (@$cr) {
-                       my $url = $pi_config->{"coderepo.$cr_name.cgiturl"};
+                       my $urls = $pi_config->{"coderepo.$cr_name.cgiturl"};
                        my $path = "/path/to/$cr_name";
                        $cr_name = dq_escape($cr_name);
 
                        $$txt .= qq([coderepo "$cr_name"]\n);
-                       if (defined($url)) {
-                               my $cpath = $path;
-                               if ($path !~ m![a-z0-9_/\.\-]!i) {
-                                       $cpath = dq_escape($cpath);
-                               }
-                               $$txt .= qq(\t; git clone $url "$cpath"\n);
+                       if ($urls && scalar(@$urls)) {
+                               $$txt .= "\t; ";
+                               $$txt .= join(" ||\n\t;\t", map {;
+                                       my $cpath = $path;
+                                       if ($path !~ m![a-z0-9_/\.\-]!i) {
+                                               $cpath = dq_escape($cpath);
+                                       }
+                                       qq(git clone $_ "$cpath");
+                               } @$urls);
+                               $$txt .= "\n";
                        }
                        $$txt .= "\tdir = $path\n";
                        $$txt .= "\tcgiturl = https://example.com/";
@@ -250,6 +272,11 @@ EOF
 
        $QP_URL
 
+EOF
+       } # $srch
+       my $over = $ibx->over;
+       if ($over) {
+               $$txt .= <<EOF;
 message threading
 -----------------
 
@@ -295,6 +322,10 @@ message threading
 
        $WIKI_URL/Mbox
 
+EOF
+       } # $over
+
+       $$txt .= <<EOF;
 contact
 -------
 
@@ -303,7 +334,6 @@ contact
 
 EOF
        # TODO: support admin contact info in ~/.public-inbox/config
-       }
        1;
 }