|
diff --git a/cgit.c b/cgit.c index ab25b6a..fde0757 100644 --- a/ cgit.c+++ b/ cgit.c |
|
@@ -153,5 +153,5 @@ void config_cb(const char *name, const char *value) |
153 | ctx.cfg.cache_size = atoi(value); |
153 | ctx.cfg.cache_size = atoi(value); |
154 | else if (!strcmp(name, "cache-root")) |
154 | else if (!strcmp(name, "cache-root")) |
155 | ctx.cfg.cache_root = xstrdup(value); |
155 | ctx.cfg.cache_root = xstrdup(expand_macros(value)); |
156 | else if (!strcmp(name, "cache-root-ttl")) |
156 | else if (!strcmp(name, "cache-root-ttl")) |
157 | ctx.cfg.cache_root_ttl = atoi(value); |
157 | ctx.cfg.cache_root_ttl = atoi(value); |
@@ -184,7 +184,7 @@ void config_cb(const char *name, const char *value) |
184 | else if (!strcmp(name, "scan-path")) |
184 | else if (!strcmp(name, "scan-path")) |
185 | if (!ctx.cfg.nocache && ctx.cfg.cache_size) |
185 | if (!ctx.cfg.nocache && ctx.cfg.cache_size) |
186 | process_cached_repolist(value); |
186 | process_cached_repolist(expand_macros(value)); |
187 | else |
187 | else |
188 | scan_tree(value, repo_config); |
188 | scan_tree(expand_macros(value), repo_config); |
189 | else if (!strcmp(name, "source-filter")) |
189 | else if (!strcmp(name, "source-filter")) |
190 | ctx.cfg.source_filter = new_filter(value, 1); |
190 | ctx.cfg.source_filter = new_filter(value, 1); |
@@ -210,5 +210,5 @@ void config_cb(const char *name, const char *value) |
210 | add_mimetype(name + 9, value); |
210 | add_mimetype(name + 9, value); |
211 | else if (!strcmp(name, "include")) |
211 | else if (!strcmp(name, "include")) |
212 | parse_configfile(value, config_cb); |
212 | parse_configfile(expand_macros(value), config_cb); |
213 | } |
213 | } |
214 | |
214 | |
@@ -706,5 +706,5 @@ int main(int argc, const char **argv) |
706 | |
706 | |
707 | cgit_parse_args(argc, argv); |
707 | cgit_parse_args(argc, argv); |
708 | parse_configfile(ctx.env.cgit_config, config_cb); |
708 | parse_configfile(expand_macros(ctx.env.cgit_config), config_cb); |
709 | ctx.repo = NULL; |
709 | ctx.repo = NULL; |
710 | http_parse_querystring(ctx.qry.raw, querystring_cb); |
710 | http_parse_querystring(ctx.qry.raw, querystring_cb); |
|