Diff options
authorBryce Kwon <bryce@brycekwon.com>
committerBryce Kwon <bryce@brycekwon.com>
commit
parent
tree
download
Name the guarded settings in one place
-rw-r--r--MANUAL.txt5
-rw-r--r--custom/cgitrc9
2 files changed, 5 insertions, 9 deletions
diff --git a/MANUAL.txt b/MANUAL.txt
index b994d83..d3282f9 100644
--- a/MANUAL.txt
+++ b/MANUAL.txt
@@ -745,10 +745,7 @@ When the option "scan-path" is used to auto-discover git repositories, cgit
tries to parse the file "cgitrc" within any found repository. Such a file may
contain any of the repository settings described above, except "repo.url" and
"repo.path", with the "repo." prefix dropped, so "repo.desc" becomes "desc". The
-options that run a command, put raw markup on the page, serve a file as markup,
-place a link or read a file off the disk are only honoured when
-"trust-scan-config" is set to "1", since the file belongs to whoever can push to
-the repository.
+settings "trust-scan-config" guards are only honoured when it is set to "1".
Filter API
diff --git a/custom/cgitrc b/custom/cgitrc
index 4535a95..b7e151c 100644
--- a/custom/cgitrc
+++ b/custom/cgitrc
@@ -276,11 +276,10 @@ enable-http-clone=1
# repository ships under custom/extensions/. The ones written as
# /path/to/your-command mark where your own command goes.
-# Honour every setting in a repository's own cgitrc and git config found by
-# scan-path. Those files belong to whoever can push, so without this the
-# settings that run a command, put raw markup on the page, serve a file as
-# markup, place a link or read a file off the disk are ignored. The repo.* lines
-# below never need it. Values are 0 or 1. Default is 0.
+# Honour every setting in a scanned repository's own cgitrc and git config,
+# including those that run a command or put markup on the page. Those files
+# belong to whoever can push. The repo.* lines below never need it. Values are
+# 0 or 1. Default is 0.
trust-scan-config=0
# Filter command used to format about-page content. The bundled about-render.lua