examples/grok-pull.post_update_hook: move url_base to the top

[public-inbox.git] / examples / public-inbox.psgi

diff --git a/examples/public-inbox.psgi b/examples/public-inbox.psgi
index a90a2bc3ae7544ebedcc5eb04d64b52750989231..9891a1f03e747a6a5cf92a1aec51789c40e5243b 100644 (file)
--- a/examples/public-inbox.psgi
+++ b/examples/public-inbox.psgi
@@ -1,19 +1,25 @@
 #!/usr/bin/perl -w
-# Copyright (C) 2014-2016 all contributors <meta@public-inbox.org>
+# Copyright (C) 2014-2020 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::Builder;
 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 {
        eval {
@@ -24,12 +30,10 @@ builder {
                                application/atom+xml
                                )]
        };
-       $@ and warn
-"Plack::Middleware::Deflater missing, bandwidth will be wasted\n";
 
        # Enable to ensure redirects and Atom feed URLs are generated
        # properly when running behind a reverse proxy server which
-       # sets X-Forwarded-For and X-Forwarded-Proto request headers.
+       # sets the X-Forwarded-Proto request header.
        # See Plack::Middleware::ReverseProxy documentation for details
        eval { enable 'ReverseProxy' };
        $@ and warn
@@ -47,7 +51,9 @@ builder {
        sub {
                my ($env) = @_;
                # share public-inbox.git code!
-               if ($src && $env->{PATH_INFO} =~ m!\A/public-inbox\.git/(.*)!) {
+               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);