aboutsummaryrefslogtreecommitdiffstats
path: root/cgit.c
diff options
context:
space:
mode:
authorGravatar Lars Hjemli <hjemli@gmail.com>2010-03-22 08:09:43 (JST)
committerGravatar Lars Hjemli <hjemli@gmail.com>2010-03-22 08:09:43 (JST)
commitba56a37e863d0f90e3e953047486905cfb959925 (patch)
tree965e2c917f472264de35125eec35c361984eba4f /cgit.c
parentff3a3b4e2b7463bb8cb370bdda393e8b3526fcb9 (diff)
downloadcgit-ba56a37e863d0f90e3e953047486905cfb959925.zip
cgit-ba56a37e863d0f90e3e953047486905cfb959925.tar.gz
Add support for environment variable expansion
This patch teaches cgit to expand environment variables in certain cgitrc option values (cache_root, scan-path, include) plus when finding the location of cgitrc itself. One use case for this feature is virtual hosting - e.g. by setting $CGIT_CONFIG='/etc/cgitrc/$HTTP_HOST' in httpd.conf, all virtual hosts automatically gets their own cgitrc. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (limited to 'cgit.c')
-rw-r--r--cgit.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/cgit.c b/cgit.c
index 9305d0a..37154e3 100644
--- a/cgit.c
+++ b/cgit.c
@@ -148,7 +148,7 @@ void config_cb(const char *name, const char *value)
148 else if (!strcmp(name, "cache-size")) 148 else if (!strcmp(name, "cache-size"))
149 ctx.cfg.cache_size = atoi(value); 149 ctx.cfg.cache_size = atoi(value);
150 else if (!strcmp(name, "cache-root")) 150 else if (!strcmp(name, "cache-root"))
151 ctx.cfg.cache_root = xstrdup(value); 151 ctx.cfg.cache_root = xstrdup(expand_macros(value));
152 else if (!strcmp(name, "cache-root-ttl")) 152 else if (!strcmp(name, "cache-root-ttl"))
153 ctx.cfg.cache_root_ttl = atoi(value); 153 ctx.cfg.cache_root_ttl = atoi(value);
154 else if (!strcmp(name, "cache-repo-ttl")) 154 else if (!strcmp(name, "cache-repo-ttl"))
@@ -177,9 +177,9 @@ void config_cb(const char *name, const char *value)
177 ctx.cfg.max_commit_count = atoi(value); 177 ctx.cfg.max_commit_count = atoi(value);
178 else if (!strcmp(name, "scan-path")) 178 else if (!strcmp(name, "scan-path"))
179 if (!ctx.cfg.nocache && ctx.cfg.cache_size) 179 if (!ctx.cfg.nocache && ctx.cfg.cache_size)
180 process_cached_repolist(value); 180 process_cached_repolist(expand_macros(value));
181 else 181 else
182 scan_tree(value, repo_config); 182 scan_tree(expand_macros(value), repo_config);
183 else if (!strcmp(name, "source-filter")) 183 else if (!strcmp(name, "source-filter"))
184 ctx.cfg.source_filter = new_filter(value, 1); 184 ctx.cfg.source_filter = new_filter(value, 1);
185 else if (!strcmp(name, "summary-log")) 185 else if (!strcmp(name, "summary-log"))
@@ -203,7 +203,7 @@ void config_cb(const char *name, const char *value)
203 else if (!prefixcmp(name, "mimetype.")) 203 else if (!prefixcmp(name, "mimetype."))
204 add_mimetype(name + 9, value); 204 add_mimetype(name + 9, value);
205 else if (!strcmp(name, "include")) 205 else if (!strcmp(name, "include"))
206 parse_configfile(value, config_cb); 206 parse_configfile(expand_macros(value), config_cb);
207} 207}
208 208
209static void querystring_cb(const char *name, const char *value) 209static void querystring_cb(const char *name, const char *value)
@@ -688,7 +688,7 @@ int main(int argc, const char **argv)
688 cgit_repolist.repos = NULL; 688 cgit_repolist.repos = NULL;
689 689
690 cgit_parse_args(argc, argv); 690 cgit_parse_args(argc, argv);
691 parse_configfile(ctx.env.cgit_config, config_cb); 691 parse_configfile(expand_macros(ctx.env.cgit_config), config_cb);
692 ctx.repo = NULL; 692 ctx.repo = NULL;
693 http_parse_querystring(ctx.qry.raw, querystring_cb); 693 http_parse_querystring(ctx.qry.raw, querystring_cb);
694 694