From: Florent Clairambault Date: Thu, 26 Dec 2013 22:21:33 +0000 (+0100) Subject: Adding some documentation around the /etc/tinc/$NET/conf.d directory. X-Git-Tag: 1.0.23-android-1~5 X-Git-Url: https://git.tinc-vpn.org/git/browse?a=commitdiff_plain;h=00ef2f6825ed69421b4d334dc4f3d11833c9a737;p=tinc Adding some documentation around the /etc/tinc/$NET/conf.d directory. --- diff --git a/doc/tinc.conf.5.in b/doc/tinc.conf.5.in index 365a3e33..1e109e2b 100644 --- a/doc/tinc.conf.5.in +++ b/doc/tinc.conf.5.in @@ -631,6 +631,8 @@ The top directory for configuration files. .It Pa @sysconfdir@/tinc/ Ns Ar NETNAME Ns Pa /tinc.conf The default name of the server configuration file for net .Ar NETNAME . +.It Pa @sysconfdir@/tinc/ Ns Ar NETNAME Ns Pa /conf.d/ +Optional directory from which any *.conf file will be loaded .It Pa @sysconfdir@/tinc/ Ns Ar NETNAME Ns Pa /hosts/ Host configuration files are kept in this directory. .It Pa @sysconfdir@/tinc/ Ns Ar NETNAME Ns Pa /tinc-up diff --git a/doc/tinc.texi b/doc/tinc.texi index b86bc09c..2aba7034 100644 --- a/doc/tinc.texi +++ b/doc/tinc.texi @@ -718,6 +718,9 @@ The actual configuration of the daemon is done in the file @file{@value{sysconfdir}/tinc/@var{netname}/tinc.conf} and at least one other file in the directory @file{@value{sysconfdir}/tinc/@var{netname}/hosts/}. +An optionnal directory @file{@value{sysconfdir}/tinc/@var{netname}/conf.d} can be added from which +any .conf file will be read. + These file consists of comments (lines started with a #) or assignments in the form of