gitweb: fallback to system-wide config file if default config does not exist
From a distribution point of view, configuration files for applications should reside in /etc/. On the other hand it's convenient for multiple instances of gitweb (e.g. virtual web servers on a single machine) to have a per-instance configuration file, just as gitweb currently supports through the file gitweb_config.perl next to the cgi. To support both at runtime, this commit introduces GITWEB_CONFIG_SYSTEM as a system-wide configuration file which will be used as a fallback if the config file sprecified throug GITWEB_CONFIG does not exist. See also http://bugs.debian.org/450592 Signed-off-by: Gerrit Pape <pape@smarden.org> Acked-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
committed by
Junio C Hamano
parent
1768905b51
commit
17a8b25005
@ -100,13 +100,20 @@ You can specify the following configuration variables when building GIT:
|
||||
is set when gitweb.cgi is executed, then the file specified in the
|
||||
environment variable will be loaded instead of the file specified
|
||||
when gitweb.cgi was created. [Default: gitweb_config.perl]
|
||||
* GITWEB_CONFIG_SYSTEM
|
||||
This Perl file will be loaded using 'do' as a fallback if GITWEB_CONFIG
|
||||
does not exist. If the environment variable GITWEB_CONFIG_SYSTEM is set
|
||||
when gitweb.cgi is executed, then the file specified in the environment
|
||||
variable will be loaded instead of the file specified when gitweb.cgi was
|
||||
created. [Default: /etc/gitweb.conf]
|
||||
|
||||
|
||||
Runtime gitweb configuration
|
||||
----------------------------
|
||||
|
||||
You can adjust gitweb behaviour using the file specified in `GITWEB_CONFIG`
|
||||
(defaults to 'gitweb_config.perl' in the same directory as the CGI).
|
||||
(defaults to 'gitweb_config.perl' in the same directory as the CGI), and
|
||||
as a fallback `GITWEB_CONFIG_SYSTEM` (defaults to /etc/gitweb.conf).
|
||||
The most notable thing that is not configurable at compile time are the
|
||||
optional features, stored in the '%features' variable.
|
||||
|
||||
|
||||
Reference in New Issue
Block a user