From 7afaafc54aa84ba614d07f19cb5dc284c296c686 Mon Sep 17 00:00:00 2001 From: Sitaram Chamarty Date: Wed, 27 Jan 2010 16:48:56 +0530 Subject: [PATCH] document the "include" mechanism --- conf/example.conf | 13 +++++++++++++ doc/3-faq-tips-etc.mkd | 5 +++++ 2 files changed, 18 insertions(+) diff --git a/conf/example.conf b/conf/example.conf index 07f60ab..9d73aca 100644 --- a/conf/example.conf +++ b/conf/example.conf @@ -246,3 +246,16 @@ repo gitolite # This does either a plain "git config section.key value" (for the first 3 # examples above) or "git config --unset-all section.key" (for the last # example). Other forms (--add, the value_regex, etc) are not supported. + +# INCLUDE SOME OTHER FILE +# ----------------------- + + include "foo.conf" + +# this includes the contents of $GL_ADMINDIR/conf/foo.conf here + +# Notes: +# - the include statement is not allowed inside delegated fragments for +# security reasons. +# - you can also use an absolute path if you like, although in the interests +# of cloning the admin-repo sanely you should avoid doing this! diff --git a/doc/3-faq-tips-etc.mkd b/doc/3-faq-tips-etc.mkd index 9361099..8b82086 100644 --- a/doc/3-faq-tips-etc.mkd +++ b/doc/3-faq-tips-etc.mkd @@ -15,6 +15,7 @@ In this document: * two levels of access rights checking * file/dir NAME based restrictions * error checking the config file + * including config lines from other files * delegating parts of the config file * easier to specify gitweb "description" and gitweb/daemon access * easier to link gitweb authorisation with gitolite @@ -254,6 +255,10 @@ was denied. Gitolite "compiles" the config file first and keyword typos *are* caught so you know right away. +#### including config lines from other files + +See the entry under "INCLUDE SOME OTHER FILE" in `conf/example.conf`. + #### delegating parts of the config file You can now split up the config file and delegate the authority to specify