From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <e@80x24.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net
X-Spam-Level: 
X-Spam-ASN:  
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.0
Received: from localhost (dcvr.yhbt.net [127.0.0.1])
	by dcvr.yhbt.net (Postfix) with ESMTP id 3B01D20FD0
	for <meta@public-inbox.org>; Fri,  1 Jul 2016 01:17:05 +0000 (UTC)
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
Message-Id: <20160701011703.16578-3-e@80x24.org>
In-Reply-To: <20160701011703.16578-1-e@80x24.org>
References: <20160701011703.16578-1-e@80x24.org>
List-Id: <meta@public-inbox.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>';
 }