On Wed, Aug 02, 2006 at 10:29:36PM +0200, Matthias Lederhofer wrote:
> --- a/gitweb/gitweb.perl
> +++ b/gitweb/gitweb.perl
> @@ -63,6 +63,10 @@ our $mimetypes_file = undef;
> our $GITWEB_CONFIG = '@@GITWEB_CONFIG@@';
> require $GITWEB_CONFIG if -e $GITWEB_CONFIG;
>
> +if (defined($ENV{'GITWEB_CONFIG'}) && -e $ENV{'GITWEB_CONFIG'}) {
> + require $ENV{'GITWEB_CONFIG'};
> +}
> +
> # version of the core git binary
> our $git_version = qx($GIT --version) =~ m/git version (.*)$/ ? $1 : "unknown";
I think this patch is a good idea, but it seems confusing to have two
different config files. 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). I would think the sanest order would be
environment, then config file, then built-ins (which is what all the
rest of the git programs do).
-Peff
-
: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html