Author: Lars Hjemli <hjemli@gmail.com>
Rename 'repo.scan' to 'scan-path' The 'repo.' prefix will soon be reserved for repo-specific config options. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
cgit.c | 10 +++++----- cgitrc.5.txt | 10 +++++-----
diff --git a/cgit.c b/cgit.c index 594b95029b521c3807ddc47d0579eb0bd530877c..6ece4116460a171eb7597c00cccf48cb073e816b 100644 --- a/cgit.c +++ b/cgit.c @@ -118,6 +118,11 @@ else if (!strcmp(name, "max-repo-count")) ctx.cfg.max_repo_count = atoi(value); else if (!strcmp(name, "max-commit-count")) ctx.cfg.max_commit_count = atoi(value); + else if (!strcmp(name, "scan-path")) + if (!ctx.cfg.nocache && ctx.cfg.cache_size) + process_cached_repolist(value); + else + scan_tree(value); else if (!strcmp(name, "source-filter")) ctx.cfg.source_filter = new_filter(value, 1); else if (!strcmp(name, "summary-log")) @@ -140,11 +145,6 @@ else if (!prefixcmp(name, "mimetype.")) add_mimetype(name + 9, value); else if (!strcmp(name, "repo.group")) ctx.cfg.repo_group = xstrdup(value); - else if (!strcmp(name, "repo.scan")) - if (!ctx.cfg.nocache && ctx.cfg.cache_size) - process_cached_repolist(value); - else - scan_tree(value); else if (!strcmp(name, "repo.url")) ctx.repo = cgit_add_repo(value); else if (!strcmp(name, "repo.name")) diff --git a/cgitrc.5.txt b/cgitrc.5.txt index 68ae2edb1cac1b3dc044e56f53ccf5b883cc9fd3..2abbd4146bf77d862860f559235ca5fa91aa0891 100644 --- a/cgitrc.5.txt +++ b/cgitrc.5.txt @@ -203,11 +203,6 @@ repo.group:: A value for the current repository group, which all repositories specified after this setting will inherit. Default value: none. -repo.scan:: - A path which will be scanned for repositories. If caching is enabled, - the result will be cached as a cgitrc include-file in the cache - directory. Default value: none. See also: cache-scanrc-ttl. - robots:: Text used as content for the "robots" meta-tag. Default value: "index, nofollow". @@ -224,6 +219,11 @@ root-title:: Text printed as heading on the repository index page. Default value: "Git Repository Browser". + +scan-path:: + A path which will be scanned for repositories. If caching is enabled, + the result will be cached as a cgitrc include-file in the cache + directory. Default value: none. See also: cache-scanrc-ttl. snapshots:: Text which specifies the default set of snapshot formats generated by