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 365a3e33ea1f360a20af43a49e9abcd63e18b6c5..1e109e2b54de281e545c4280316f333d330ab7f4 100644 (file)
--- 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 b86bc09cc553ce4d1db237afae29bb87fbc68e46..2aba7034d91e21e93f3ad3560183355f9a553e1c 100644 (file)
--- 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