DWS/chrony
1
0
Fork 0
mirror of https://gitlab.com/chrony/chrony.git synced 2025-12-04 22:55:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

conf: rename confdirs and sourcedirs directives

Browse Source 
Rename the directives to confdir and sourcedir to better match an
expected use case with only one specified directory.
This commit is contained in:
Miroslav Lichvar
2020-08-18 14:21:06 +02:00
parent 839e9aa4af
commit b7fbac617d
4 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
doc/chrony.conf.adoc
View File

@@ -2191,22 +2191,25 @@ sendmail binary.
=== Miscellaneous
[[confdirs]]*confdirs* _directory_...::
The *confdirs* directive includes configuration files with the _.conf_ suffix
from up to 10 directories. The files are included in the lexicographical order
(ignoring the names of the directories). If multiple directories contain a file
with the same name, only the first file in the order of the specified
directories will be included. This enables a fragmented configuration, where
existing fragments can be replaced by adding files to a different directory.
[[confdir]]*confdir* _directory_...::
The *confdir* directive includes configuration files with the _.conf_ suffix
from a directory. The files are included in the lexicographical order of the
file names.
+
Multiple directories (up to 10) can be specified with a single *confdir*
directive. In this case, if multiple directories contain a file with the same
name, only the first file in the order of the specified directories will be
included. This enables a fragmented configuration where existing fragments can
be replaced by adding files to a different directory.
+
An example of the directive is:
+
----
confdirs @SYSCONFDIR@/chrony.d /var/run/chrony.d /usr/lib/chrony.d
confdir @SYSCONFDIR@/chrony.d
----
[[sourcedirs]]*sourcedirs* _directory_...::
The *sourcedirs* directive is identical to the *confdirs* directive, except the
[[sourcedir]]*sourcedir* _directory_...::
The *sourcedir* directive is identical to the *confdir* directive, except the
configuration files have the _.sources_ suffix, they can only specify NTP
sources (i.e. use the *server*, *pool*, and *peer* directive), and can be
reloaded by the <<chronyc.adoc#reload,*reload sources*>> command in
@@ -2217,12 +2220,12 @@ network interface by a networking script.
An example of the directive is:
+
----
sourcedirs /var/run/chrony-dhcp
sourcedir /var/run/chrony-dhcp
----
[[include]]*include* _pattern_::
The *include* directive includes a configuration file, or multiple configuration
files if a wildcard pattern is specified. Unlike with the *confdirs* directive,
files if a wildcard pattern is specified. Unlike with the *confdir* directive,
the full name of the files needs to be specified and at least one file is
required to exist.
+

2
doc/chronyc.adoc
View File

@@ -931,7 +931,7 @@ to replace them immediately and not wait until they are marked as unreachable.
[[reload]]*reload* *sources*::
The *reload sources* command causes *chronyd* to re-read all _*.sources_ files
from the directories specified by the
<<chrony.conf.adoc#sourcedirs,*sourcedirs*>> directive.
<<chrony.conf.adoc#sourcedir,*sourcedir*>> directive.
[[sourcename]]*sourcename* _address_::
The *sourcename* command prints the original hostname or address that was

2
doc/chronyd.adoc
View File

@@ -80,7 +80,7 @@ default value is 0.
When run in this mode, *chronyd* will print the configuration and exit. It will
not detach from the terminal. This option can be used to verify the syntax of
the configuration and get the whole configuration, even if it is split into
multiple files and read by the *include* or *confdirs* directive.
multiple files and read by the *include* or *confdir* directive.
*-q*::
When run in this mode, *chronyd* will set the system clock once and exit. It