summaryrefslogtreecommitdiff
path: root/gitweb/README
diff options
context:
space:
mode:
authorGerrit Pape <pape@smarden.org>2008-03-26 18:11:19 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-03-27 20:55:10 (GMT)
commit17a8b25005bb09b03bee7ddac5412c7d29675eef (patch)
treebba6a061f9066f80d04502261bb8ee95e478ddd3 /gitweb/README
parent1768905b51601d5d080168059acd24d13b888a2d (diff)
downloadgit-17a8b25005bb09b03bee7ddac5412c7d29675eef.zip
git-17a8b25005bb09b03bee7ddac5412c7d29675eef.tar.gz
git-17a8b25005bb09b03bee7ddac5412c7d29675eef.tar.bz2
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>
Diffstat (limited to 'gitweb/README')
-rw-r--r--gitweb/README9
1 files changed, 8 insertions, 1 deletions
diff --git a/gitweb/README b/gitweb/README
index 2163071..8dfe335 100644
--- a/gitweb/README
+++ b/gitweb/README
@@ -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.