summary refs log tree commit diff
diff options
context:
space:
mode:
authorLars Hjemli <hjemli@gmail.com>2009-08-23 19:35:56 +0200
committerLars Hjemli <hjemli@gmail.com>2009-08-24 10:22:58 +0200
commit00466376922e2f7db02b3c335d46af5eb8991c49 (patch)
tree717c6770e8a6937d5c7ad38b014d6aa0c2028e11
parentb4dc93dc76fabf043b7679f8fcab91cdb1f418c6 (diff)
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>
-rw-r--r--cgit.c10
-rw-r--r--cgitrc.5.txt10
2 files changed, 10 insertions, 10 deletions
diff --git a/cgit.c b/cgit.c
index 594b950..6ece411 100644
--- a/cgit.c
+++ b/cgit.c
@@ -118,6 +118,11 @@ void config_cb(const char *name, const char *value)
 		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 @@ void config_cb(const char *name, const char *value)
 		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 68ae2ed..2abbd41 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".
@@ -225,6 +220,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
 	cgit. The value is a space-separated list of zero or more of the