Re: [PATCH] gitweb: require $ENV{'GITWEB_CONFIG'}

From: Junio C Hamano <junkio@cox.net>
Date: Aug 2, 2006, 20:58 UTC
Message-ID: <7vhd0uua6e.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <20060802205033.GB15678@sigio.intra.peff.net>

Jeff King <peff@peff.net> writes:

Show 7 quoted lines

> I think this patch is a good idea, but it seems confusing to have two
> Maybe the environment should trump the built-in
> default:
>   our $GITWEB_CONFIG = $ENV{GITWEB_CONFIG} || '@@GITWEB_CONFIG@@';
> which actually might be a reasonable thing for all of the config
> directives (so people can use a config file, apache environment munging,
> or the built-in defaults).

Sounds very sane. So Matthias's patch now becomes something like this:

-- >8 --

diff --git a/gitweb/README b/gitweb/README
index b91d42a..dc4b850 100644
--- a/gitweb/README
+++ b/gitweb/README
@@ -23,6 +23,11 @@ You can specify the following configurat
    Points to the location where you put gitweb.css on your web server.
  * GITWEB_LOGO
    Points to the location where you put git-logo.png on your web server.
+ * GITWEB_CONFIG
+   This file will be loaded using 'require'.  If the environment
+   $GITWEB_CONFIG is set when gitweb.cgi is executed the file in the
+   environment variable will be loaded instead of the file
+   specified when gitweb.cgi was created.
 
 Originally written by:
   Kay Sievers <kay.sievers@vrfy.org>
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index d5b2de8..c7f13e7 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -63,6 +63,6 @@ our $mimetypes_file = undef;
-our $GITWEB_CONFIG = "@@GITWEB_CONFIG@@";
+our $GITWEB_CONFIG = $ENV{'GITWEB_CONFIG'} || "@@GITWEB_CONFIG@@";
 require $GITWEB_CONFIG if -e $GITWEB_CONFIG;
 
 # version of the core git binary
 our $git_version = qx($GIT --version) =~ m/git version (.*)$/ ? $1 : "unknown";