From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 2/2] update git repo location to https:// using GitHTTPBackend.pm
Date: Fri, 1 Jul 2016 01:17:03 +0000 [thread overview]
Message-ID: <20160701011703.16578-3-e@80x24.org> (raw)
In-Reply-To: <20160701011703.16578-1-e@80x24.org>
Might as well eat our own dogfood...
---
Documentation/dc-dlvr-spam-flow.txt | 2 +-
README | 2 +-
examples/public-inbox.psgi | 14 +++++++++++++-
examples/unsubscribe.psgi | 3 ++-
lib/PublicInbox/Unsubscribe.pm | 2 +-
lib/PublicInbox/WwwStream.pm | 6 +++---
6 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/Documentation/dc-dlvr-spam-flow.txt b/Documentation/dc-dlvr-spam-flow.txt
index 5a7e290..d151d27 100644
--- a/Documentation/dc-dlvr-spam-flow.txt
+++ b/Documentation/dc-dlvr-spam-flow.txt
@@ -45,4 +45,4 @@ delivery path as well as removing the message from the git tree.
* spamc / spamd - SpamAssassin: http://spamassassin.apache.org/
* report-spam / dc-dlvr - distributed with public-inbox in the scripts/
- directory: git clone git://80x24.org/public-inbox
+ directory: git clone https://public-inbox.org/public-inbox.git
diff --git a/README b/README
index a91c45b..ca4e2a8 100644
--- a/README
+++ b/README
@@ -87,7 +87,7 @@ Hacking
Source code is available via git:
- git clone git://80x24.org/public-inbox
+ git clone https://public-inbox.org/public-inbox.git
See below for contact info.
diff --git a/examples/public-inbox.psgi b/examples/public-inbox.psgi
index 4edbf5e..a90a2bc 100644
--- a/examples/public-inbox.psgi
+++ b/examples/public-inbox.psgi
@@ -11,6 +11,10 @@ use PublicInbox::WWW;
PublicInbox::WWW->preload;
use Plack::Builder;
my $www = PublicInbox::WWW->new;
+
+# share the public-inbox code itself:
+my $src = $ENV{SRC_GIT_DIR}; # '/path/to/public-inbox.git'
+
builder {
eval {
enable 'Deflater',
@@ -40,5 +44,13 @@ builder {
# format => '%t "%r" %>s %b %D';
enable 'Head';
- sub { $www->call(@_) };
+ sub {
+ my ($env) = @_;
+ # share public-inbox.git code!
+ if ($src && $env->{PATH_INFO} =~ m!\A/public-inbox\.git/(.*)!) {
+ PublicInbox::GitHTTPBackend::serve($env, $src, $1);
+ } else {
+ $www->call($env);
+ }
+ };
}
diff --git a/examples/unsubscribe.psgi b/examples/unsubscribe.psgi
index beeab9f..5b9b16c 100644
--- a/examples/unsubscribe.psgi
+++ b/examples/unsubscribe.psgi
@@ -17,7 +17,8 @@ my $app = PublicInbox::Unsubscribe->new(
# the archives runs as a different user.
PublicInbox::Config->new('/home/pi/.public-inbox/config')
},
- code_url => 'git://80x24.org/public-inbox.git', # change if you fork
+ # change if you fork
+ code_url => 'https://public-inbox.org/public-inbox.git',
owner_email => 'BOFH@example.com',
confirm => 0,
diff --git a/lib/PublicInbox/Unsubscribe.pm b/lib/PublicInbox/Unsubscribe.pm
index 79234aa..46d5d8d 100644
--- a/lib/PublicInbox/Unsubscribe.pm
+++ b/lib/PublicInbox/Unsubscribe.pm
@@ -12,7 +12,7 @@ use warnings;
use Crypt::CBC;
use Plack::Util;
use MIME::Base64 qw(decode_base64url);
-my $CODE_URL = 'git://80x24.org/public-inbox.git';
+my $CODE_URL = 'https://public-inbox.org/public-inbox.git';
my @CT_HTML = ('Content-Type', 'text/html; charset=UTF-8');
sub new {
diff --git a/lib/PublicInbox/WwwStream.pm b/lib/PublicInbox/WwwStream.pm
index d9abb5a..97a6dc7 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/README.html';
+use constant PI_URL => 'https://public-inbox.org/public-inbox.git';
sub new {
my ($class, $ctx, $cb) = @_;
@@ -86,8 +86,8 @@ sub _html_end {
'<pre>'.join("\n",
'- ' . $desc,
$urls,
- 'served with software from public-inbox: '
- ."<a\nhref=\"$url\">$url</a>",
+ 'Archived served using code from public-inbox:',
+ "\tgit clone $url",
).'</pre></body></html>';
}
next prev parent reply other threads:[~2016-07-01 1:17 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-01 1:17 [PATCH 0/2] HTTPS smart git repository for our code Eric Wong
2016-07-01 1:17 ` [PATCH 1/2] githttpbackend: allow git to be a regular scalar string Eric Wong
2016-07-01 1:17 ` Eric Wong [this message]
2016-07-01 2:15 ` [PATCH 3/2] git: allow cloning from the URL root, too Eric Wong
2016-07-01 2:20 ` [PATCH 4/2] www_stream: fix stupid typo :x Eric Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://public-inbox.org/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160701011703.16578-3-e@80x24.org \
--to=e@80x24.org \
--cc=meta@public-inbox.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).