tom/cdist
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'master' into feature_install_and_preos

Browse source 
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
This commit is contained in:
Nico Schottelius 2015-05-19 15:16:56 +02:00
commit 4a5bd2069f
7 changed files with 42 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

3
docs/changelog
View file

@ -13,6 +13,9 @@ Changelog
* Core: Integrate initial install support (Nico Schottelius)
* Core: Integrate initial preos support (Nico Schottelius)
next:
* Documentation: Fix spelling in manual pages (Dmitry Bogatov)
3.1.13: 2015-05-16
* Type __block: Fix support for non stdin blocks (Dominique Roux)
* Type __consul: Install package unzip (Nico Schottelius)

8
docs/man/cdist-reference.text.sh
View file

@ -84,7 +84,7 @@ confdir/manifest/init::
confdir/manifest/*::
All other files in this directory are not directly used by cdist, but you
can seperate configuration mappings, if you have a lot of code in the
can separate configuration mappings, if you have a lot of code in the
conf/manifest/init file. This may also be helpful to have different admins
maintain different groups of hosts.
@ -112,10 +112,10 @@ confdir/type/<name>/gencode-remote::
Used to generate code to be executed on the target host
confdir/type/<name>/parameter/required::
Parameters required by type, \n seperated list.
Parameters required by type, \n separated list.
confdir/type/<name>/parameter/optional::
Parameters optionally accepted by type, \n seperated list.
Parameters optionally accepted by type, \n separated list.
confdir/type/<name>/parameter/default/*::
Default values for optional parameters.
@ -123,7 +123,7 @@ confdir/type/<name>/parameter/default/*::
be read from the file confdir/type/<name>/parameter/default/foo.
confdir/type/<name>/parameter/boolean::
Boolean parameters accepted by type, \n seperated list.
Boolean parameters accepted by type, \n separated list.
confdir/type/<name>/explorer::
Location of the type specific explorers.

2
docs/man/man7/cdist-manifest.text
View file

@ -236,7 +236,7 @@ How to override objects:
__user foobar --password 'some_fancy_hash' --home /home/foobarexample
# ... many statements and includes in the manifest later ...
# somewhere in a conditionaly sourced manifest
# somewhere in a conditionally sourced manifest
# (e.g. for example only sourced if a special application is on the target host)
# this leads to an error ...