X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=examples%2Fpublic-inbox.psgi;h=e017b2fb6f1629968f8ff5d9592c2f20b57e357f;hb=21fcd8a37c82c1ef654d402cf592f0c9d803aa26;hp=b0b9ae9850bd9620937a15dff753df152588d0df;hpb=e2ed3be62fbb53e16a9248a408a7a069a05842e6;p=public-inbox.git

diff --git a/examples/public-inbox.psgi b/examples/public-inbox.psgi
index b0b9ae98..e017b2fb 100644
--- a/examples/public-inbox.psgi
+++ b/examples/public-inbox.psgi
@@ -1,25 +1,53 @@
 #!/usr/bin/perl -w
-# Copyright (C) 2014-2015 all contributors <meta@public-inbox.org>
-# License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt)
+# Copyright (C) 2014-2021 all contributors <meta@public-inbox.org>
+# License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
 # Note: this is part of our test suite, update t/plack.t if this changes
 # Usage: plackup [OPTIONS] /path/to/this/file
+#
+# A startup command for development which monitors changes:
+#	plackup -I lib -o 127.0.0.1 -R lib -r examples/public-inbox.psgi
+#
+# .psgi paths may also be passed to public-inbox-httpd(1) for
+# production deployments:
+#	public-inbox-httpd [OPTIONS] /path/to/examples/public-inbox.psgi
 use strict;
 use warnings;
 use PublicInbox::WWW;
-PublicInbox::WWW->preload;
-use Plack::Request;
 use Plack::Builder;
-my $have_deflater = eval { require Plack::Middleware::Deflater; 1 };
+my $www = PublicInbox::WWW->new;
+$www->preload;
+
+# share the public-inbox code itself:
+my $src = $ENV{SRC_GIT_DIR}; # '/path/to/public-inbox.git'
+$src = PublicInbox::Git->new($src) if defined $src;
 
 builder {
-	if ($have_deflater) {
-		enable "Deflater",
-			content_type => [ 'text/html', 'text/plain',
-					'application/atom+xml' ];
-	}
-	enable "Head";
+	# Enable to ensure redirects and Atom feed URLs are generated
+	# properly when running behind a reverse proxy server which
+	# sets the X-Forwarded-Proto request header.
+	# See Plack::Middleware::ReverseProxy documentation for details
+	eval { enable 'ReverseProxy' };
+	$@ and warn
+"Plack::Middleware::ReverseProxy missing,\n",
+"URL generation for redirects may be wrong if behind a reverse proxy\n";
+
+	# Optional: Log timing information for requests to track performance.
+	# Logging to STDOUT is recommended since public-inbox-httpd knows
+	# how to reopen it via SIGUSR1 after log rotation.
+	# enable 'AccessLog::Timed',
+	#	logger => sub { syswrite(STDOUT, $_[0]) },
+	#	format => '%t "%r" %>s %b %D';
+
+	enable 'Head';
 	sub {
-		my $req = Plack::Request->new(@_);
-		PublicInbox::WWW::run($req, $req->method);
-	}
+		my ($env) = @_;
+		# share public-inbox.git code!
+		if ($src && $env->{PATH_INFO} =~
+				m!\A/(?:public-inbox(?:\.git)?/)?
+				($PublicInbox::GitHTTPBackend::ANY)\z!xo) {
+			PublicInbox::GitHTTPBackend::serve($env, $src, $1);
+		} else {
+			$www->call($env);
+		}
+	};
 }