Embed config skeleton instead of rewriting it

Resolves #796.
This commit is contained in:
Darko Poljak 2019-12-06 09:37:21 +01:00
parent f22349ce8a
commit 90e85d8128
4 changed files with 13 additions and 67 deletions

1
.gitignore vendored
View file

@ -24,6 +24,7 @@ docs/src/man1/*.1
docs/src/man7/*.7 docs/src/man7/*.7
docs/src/man7/cdist-type__*.rst docs/src/man7/cdist-type__*.rst
docs/src/cdist-reference.rst docs/src/cdist-reference.rst
docs/src/cdist.cfg.skeleton
# Ignore cdist cache for version control # Ignore cdist cache for version control
/cache/ /cache/

View file

@ -63,6 +63,11 @@ DOCSREFSH=$(DOCS_SRC_DIR)/cdist-reference.rst.sh
$(DOCSREF): $(DOCSREFSH) $(DOCSREF): $(DOCSREFSH)
$(DOCSREFSH) $(DOCSREFSH)
DOCSCFGSKEL=./configuration/cdist.cfg.skeleton
configskel: $(DOCSCFGSKEL)
cp -f "$(DOCSCFGSKEL)" "$(DOCS_SRC_DIR)/"
version: version:
@[ -f "cdist/version.py" ] || { \ @[ -f "cdist/version.py" ] || { \
printf "Missing 'cdist/version.py', please generate it first.\n" && exit 1; \ printf "Missing 'cdist/version.py', please generate it first.\n" && exit 1; \
@ -72,7 +77,7 @@ version:
man: version $(MANTYPES) $(DOCSREF) man: version $(MANTYPES) $(DOCSREF)
$(SPHINXM) $(SPHINXM)
html: version $(MANTYPES) $(DOCSREF) html: version configskel $(MANTYPES) $(DOCSREF)
$(SPHINXH) $(SPHINXH)
docs: man html docs: man html
@ -114,6 +119,7 @@ speeches: $(SPEECHES)
# #
clean: docs-clean clean: docs-clean
rm -f $(DOCS_SRC_DIR)/cdist-reference.rst rm -f $(DOCS_SRC_DIR)/cdist-reference.rst
rm -f $(DOCS_SRC_DIR)/cdist.cfg.skeleton
find "$(DOCS_SRC_DIR)" -mindepth 2 -type l \ find "$(DOCS_SRC_DIR)" -mindepth 2 -type l \
| xargs rm -f | xargs rm -f

View file

@ -4,6 +4,7 @@ Changelog
next: next:
* Type __package_update_index: Fix Alpine part (Dominique Roux) * Type __package_update_index: Fix Alpine part (Dominique Roux)
* Documentation: Fix man pages for install types (Darko Poljak) * Documentation: Fix man pages for install types (Darko Poljak)
* Documentation: Embed config skeleton instead of rewriting it (Darko Poljak)
6.2.0: 2019-11-30 6.2.0: 2019-11-30
* Core: Redefine/reimplement/fix CDIST_ORDER_DEPENDENCY (Darko Poljak) * Core: Redefine/reimplement/fix CDIST_ORDER_DEPENDENCY (Darko Poljak)

View file

@ -31,73 +31,11 @@ can be used.
Config file format Config file format
------------------ ------------------
cdist configuration file is in the INI file format. Currently it supports cdist configuration file is in the INI file format. Currently it supports
only [GLOBAL] section. only [GLOBAL] section.
The possible keywords and their meanings are as follows:
:strong:`archiving` Here you can find configuration file skeleton:
Use specified archiving. Valid values include:
'none', 'tar', 'tgz', 'tbz2' and 'txz'.
:strong:`beta` .. literalinclude:: cdist.cfg.skeleton
Enable beta functionality. It recognizes boolean values from :language: ini
'yes'/'no', 'on'/'off', 'true'/'false' and '1'/'0'.
:strong:`cache_path_pattern`
Specify cache path pattern.
:strong:`conf_dir`
List of configuration directories separated with the character conventionally
used by the operating system to separate search path components (as in PATH),
such as ':' for POSIX or ';' for Windows.
If also specified at command line then values from command line are
appended to this value.
:strong:`init_manifest`
Specify default initial manifest.
:strong:`inventory_dir`
Specify inventory directory.
:strong:`jobs`
Specify number of jobs for parallel processing. If -1 then the default,
number of CPU's in the system is used. If 0 then parallel processing in
jobs is disabled. If set to positive number then specified maximum
number of processes will be used.
:strong:`local_shell`
Shell command used for local execution.
:strong:`out_path`
Directory to save cdist output in.
:strong:`parallel`
Process hosts in parallel. If -1 then the default, number of CPU's in
the system is used. If 0 then parallel processing of hosts is disabled.
If set to positive number then specified maximum number of processes
will be used.
:strong:`remote_copy`
Command to use for remote copy (should behave like scp).
:strong:`remote_exec`
Command to use for remote execution (should behave like ssh).
:strong:`remote_out_path`
Directory to save cdist output in on the target host.
:strong:`remote_shell`
Shell command at remote host used for remote execution.
:strong:`save_output_streams`
Enable/disable saving output streams (enabled by default).
It recognizes boolean values from 'yes'/'no', 'on'/'off', 'true'/'false'
and '1'/'0'.
:strong:`timestamp`
Timestamp log messages with the current local date and time
in the format: YYYYMMDDHHMMSS.us.
:strong:`verbosity`
Set verbosity level. Valid values are:
'ERROR', 'WARNING', 'INFO', 'VERBOSE', 'DEBUG', 'TRACE' and 'OFF'.