[PATCH v5 19/28] http-backend: add example for gitweb on same URL

git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed

From: "Shawn O. Pearce" <spearce@spearce.org>
To: git@vger.kernel.org
Cc: Mark Lodato <lodatom@gmail.com>
Subject: [PATCH v5 19/28] http-backend: add example for gitweb on same URL
Date: Fri, 30 Oct 2009 17:47:38 -0700	[thread overview]
Message-ID: <1256950067-27938-21-git-send-email-spearce@spearce.org> (raw)
In-Reply-To: <1256950067-27938-1-git-send-email-spearce@spearce.org>

From: Mark Lodato <lodatom@gmail.com>

In the git-http-backend documentation, add an example of how to set up
gitweb and git-http-backend on the same URL by using a series of
mod_alias commands.

Signed-off-by: Mark Lodato <lodatom@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
---
 Documentation/git-http-backend.txt |   33 +++++++++++++++++++++++++++++++++
 1 files changed, 33 insertions(+), 0 deletions(-)

diff --git a/Documentation/git-http-backend.txt b/Documentation/git-http-backend.txt
index e67519d..2989c9f 100644
--- a/Documentation/git-http-backend.txt
+++ b/Documentation/git-http-backend.txt
@@ -88,6 +88,23 @@ directive around the repository, or one of its parent directories:
 	...
 </Location>
 ----------------------------------------------------------------
++
+To serve gitweb at the same url, use a ScriptAliasMatch to only
+those URLs that 'git-http-backend' can handle, and forward the
+rest to gitweb:
++
+----------------------------------------------------------------
+ScriptAliasMatch \
+	"(?x)^/git/(.*/(HEAD | \
+			info/refs | \
+			objects/(info/[^/]+ | \
+				 [0-9a-f]{2}/[0-9a-f]{38} | \
+				 pack/pack-[0-9a-f]{40}\.(pack|idx)) | \
+			git-(upload|receive)-pack))$" \
+	/usr/libexec/git-core/git-http-backend/$1
+
+ScriptAlias /git/ /var/www/cgi-bin/gitweb.cgi/
+----------------------------------------------------------------
 
 Accelerated static Apache 2.x::
 	Similar to the above, but Apache can be used to return static
@@ -102,6 +119,22 @@ AliasMatch ^/git/(.*/objects/[0-9a-f]{2}/[0-9a-f]{38})$          /var/www/git/$1
 AliasMatch ^/git/(.*/objects/pack/pack-[0-9a-f]{40}.(pack|idx))$ /var/www/git/$1
 ScriptAlias /git/ /usr/libexec/git-core/git-http-backend/
 ----------------------------------------------------------------
++
+This can be combined with the gitweb configuration:
++
+----------------------------------------------------------------
+SetEnv GIT_PROJECT_ROOT /var/www/git
+
+AliasMatch ^/git/(.*/objects/[0-9a-f]{2}/[0-9a-f]{38})$          /var/www/git/$1
+AliasMatch ^/git/(.*/objects/pack/pack-[0-9a-f]{40}.(pack|idx))$ /var/www/git/$1
+ScriptAliasMatch \
+	"(?x)^/git/(.*/(HEAD | \
+			info/refs | \
+			objects/info/[^/]+ | \
+			git-(upload|receive)-pack))$" \
+	/usr/libexec/git-core/git-http-backend/$1
+ScriptAlias /git/ /var/www/cgi-bin/gitweb.cgi/
+----------------------------------------------------------------
 
 
 ENVIRONMENT
-- 
1.6.5.2.181.gd6f41

next prev parent reply	other threads:[~2009-10-31  0:49 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-10-31  0:47 [PATCH v5 00/28] Return of smart HTTP Shawn O. Pearce
2009-10-31  0:47 ` [PATCH v5 00/28] interdiff to v4 Shawn O. Pearce
2009-10-31  0:47 ` [PATCH v5 01/28] http-push: fix check condition on http.c::finish_http_pack_request() Shawn O. Pearce
2009-10-31  0:47 ` [PATCH v5 02/28] pkt-line: Add strbuf based functions Shawn O. Pearce
2009-10-31  0:47 ` [PATCH v5 03/28] pkt-line: Make packet_read_line easier to debug Shawn O. Pearce
2009-10-31  0:47 ` [PATCH v5 04/28] fetch-pack: Use a strbuf to compose the want list Shawn O. Pearce
2009-10-31  0:47 ` [PATCH v5 05/28] Move "get_ack()" back to fetch-pack Shawn O. Pearce
2009-10-31  0:47 ` [PATCH v5 06/28] Add multi_ack_detailed capability to fetch-pack/upload-pack Shawn O. Pearce
2009-10-31  0:47 ` [PATCH v5 07/28] remote-curl: Refactor walker initialization Shawn O. Pearce
2009-10-31  0:47 ` [PATCH v5 08/28] fetch: Allow transport -v -v -v to set verbosity to 3 Shawn O. Pearce
2009-10-31  0:47 ` [PATCH v5 09/28] remote-helpers: Fetch more than one ref in a batch Shawn O. Pearce
2009-10-31  0:47 ` [PATCH v5 10/28] remote-helpers: Support custom transport options Shawn O. Pearce
2009-10-31  0:47 ` [PATCH v5 11/28] Move WebDAV HTTP push under remote-curl Shawn O. Pearce
2009-10-31  0:47 ` [PATCH v5 12/28] remote-helpers: return successfully if everything up-to-date Shawn O. Pearce
2009-10-31  0:47 ` [PATCH v5 13/28] Git-aware CGI to provide dumb HTTP transport Shawn O. Pearce
2009-10-31  0:47 ` [PATCH v5 14/28] Add stateless RPC options to upload-pack, receive-pack Shawn O. Pearce
2009-10-31  0:47 ` [PATCH v5 15/28] Smart fetch and push over HTTP: server side Shawn O. Pearce
2009-10-31  0:47 ` [PATCH v5 16/28] http-backend: add GIT_PROJECT_ROOT environment var Shawn O. Pearce
2009-10-31  0:47 ` [PATCH v5 17/28] http-backend: reword some documentation Shawn O. Pearce
2009-10-31  0:47 ` [PATCH v5 18/28] http-backend: use mod_alias instead of mod_rewrite Shawn O. Pearce
2009-10-31  0:47 ` Shawn O. Pearce [this message]
2009-10-31  0:47 ` [PATCH v5 20/28] http-backend: more explict LocationMatch Shawn O. Pearce
2009-10-31  0:47 ` [PATCH v5 21/28] Discover refs via smart HTTP server when available Shawn O. Pearce
2009-10-31  0:47 ` [PATCH v5 22/28] Smart push over HTTP: client side Shawn O. Pearce
2009-10-31  0:47 ` [PATCH v5 23/28] Smart fetch " Shawn O. Pearce
2009-10-31  0:47 ` [PATCH v5 24/28] Smart HTTP fetch: gzip requests Shawn O. Pearce
2009-10-31  0:47 ` [PATCH v5 25/28] t5540-http-push: remove redundant fetches Shawn O. Pearce
2009-10-31  0:47 ` [PATCH v5 26/28] set httpd port before sourcing lib-httpd Shawn O. Pearce
2009-10-31  0:47 ` [PATCH v5 27/28] http tests: use /dumb/ URL prefix Shawn O. Pearce
2009-11-01 14:50   ` Tay Ray Chuan
2009-10-31  0:47 ` [PATCH v5 28/28] test smart http fetch and push Shawn O. Pearce

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:e67519d dfblob:2989c9f )
 OR (
bs:"[PATCH v5 19/28] http-backend: add example for gitweb on same URL" )
	(help)

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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1256950067-27938-21-git-send-email-spearce@spearce.org \
    --to=spearce@spearce.org \
    --cc=git@vger.kernel.org \
    --cc=lodatom@gmail.com \
    /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 NNTP newsgroup(s).