about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMichael Krelin <hacker@klever.net>2007-07-02 02:29:12 +0200
committerLars Hjemli <hjemli@gmail.com>2007-07-03 21:28:13 +0200
commit51f6547879e2516b9850b0b3c51df044c16a8a52 (patch)
treef73a2db285a41c1c8d6ece33ec7519728a392d84
parentMerge branch 'lh/menu' (diff)
downloadcgit-pink-51f6547879e2516b9850b0b3c51df044c16a8a52.tar.gz
cgit-pink-51f6547879e2516b9850b0b3c51df044c16a8a52.zip
make config adjustable via env variable CGIT_CONFIG
Signed-off-by: Michael Krelin <hacker@klever.net>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (limited to '')
-rw-r--r--cgit.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/cgit.c b/cgit.c
index d9a03c2..1281bfa 100644
--- a/cgit.c
+++ b/cgit.c
@@ -222,6 +222,7 @@ static void cgit_parse_args(int argc, const char **argv)
 int main(int argc, const char **argv)
 {
 	struct cacheitem item;
+	const char *cgit_config_env = getenv("CGIT_CONFIG");
 
 	htmlfd = STDOUT_FILENO;
 	item.st.st_mtime = time(NULL);
@@ -229,7 +230,8 @@ int main(int argc, const char **argv)
 	cgit_repolist.count = 0;
 	cgit_repolist.repos = NULL;
 
-	cgit_read_config(CGIT_CONFIG, cgit_global_config_cb);
+	cgit_read_config(cgit_config_env ? cgit_config_env : CGIT_CONFIG,
+			 cgit_global_config_cb);
 	cgit_repo = NULL;
 	if (getenv("SCRIPT_NAME"))
 		cgit_script_name = xstrdup(getenv("SCRIPT_NAME"));