diff --git a/src/extra/manual/beta/_sources/cdist-reference.rst.txt b/src/extra/manual/beta/_sources/cdist-reference.rst.txt
index 1842b903..97f65d91 100644
--- a/src/extra/manual/beta/_sources/cdist-reference.rst.txt
+++ b/src/extra/manual/beta/_sources/cdist-reference.rst.txt
@@ -329,6 +329,10 @@ __cdist_log_level, __cdist_log_level_name
| TRACE | 5 |
+----------------+-----------------+
+ Available for: initial manifest, explorer, type manifest, type explorer,
+ type gencode.
+__cdist_dry_run
+ Is set only when doing dry run (-n flag).
Available for: initial manifest, explorer, type manifest, type explorer,
type gencode.
__explorer
diff --git a/src/extra/manual/beta/_sources/cdist-type.rst.txt b/src/extra/manual/beta/_sources/cdist-type.rst.txt
index f4079372..2de71884 100644
--- a/src/extra/manual/beta/_sources/cdist-type.rst.txt
+++ b/src/extra/manual/beta/_sources/cdist-type.rst.txt
@@ -371,6 +371,15 @@ It is available for initial manifest, explorer, type manifest,
type explorer, type gencode.
+Detecting dry run
+-----------------
+
+If ``$__cdist_dry_run`` environment variable is set, then it's dry run.
+
+It is available for initial manifest, explorer, type manifest,
+type explorer, type gencode.
+
+
Hints for typewriters
----------------------
It must be assumed that the target is pretty dumb and thus does not have high
diff --git a/src/extra/manual/beta/_static/basic.css b/src/extra/manual/beta/_static/basic.css
index 104f076a..3c7223b1 100644
--- a/src/extra/manual/beta/_static/basic.css
+++ b/src/extra/manual/beta/_static/basic.css
@@ -4,7 +4,7 @@
*
* Sphinx stylesheet -- basic theme.
*
- * :copyright: Copyright 2007-2018 by the Sphinx team, see AUTHORS.
+ * :copyright: Copyright 2007-2017 by the Sphinx team, see AUTHORS.
* :license: BSD, see LICENSE for details.
*
*/
@@ -81,26 +81,10 @@ div.sphinxsidebar input {
font-size: 1em;
}
-div.sphinxsidebar #searchbox form.search {
- overflow: hidden;
-}
-
div.sphinxsidebar #searchbox input[type="text"] {
- float: left;
- width: 80%;
- padding: 0.25em;
- box-sizing: border-box;
+ width: 170px;
}
-div.sphinxsidebar #searchbox input[type="submit"] {
- float: left;
- width: 20%;
- border-left: none;
- padding: 0.25em;
- box-sizing: border-box;
-}
-
-
img {
border: 0;
max-width: 100%;
@@ -215,11 +199,6 @@ table.modindextable td {
/* -- general body styles --------------------------------------------------- */
-div.body {
- min-width: 450px;
- max-width: 800px;
-}
-
div.body p, div.body dd, div.body li, div.body blockquote {
-moz-hyphens: auto;
-ms-hyphens: auto;
@@ -353,11 +332,6 @@ table.docutils {
border-collapse: collapse;
}
-table.align-center {
- margin-left: auto;
- margin-right: auto;
-}
-
table caption span.caption-number {
font-style: italic;
}
@@ -431,13 +405,6 @@ table.field-list td, table.field-list th {
hyphens: manual;
}
-/* -- hlist styles ---------------------------------------------------------- */
-
-table.hlist td {
- vertical-align: top;
-}
-
-
/* -- other body styles ----------------------------------------------------- */
ol.arabic {
diff --git a/src/extra/manual/beta/_static/doctools.js b/src/extra/manual/beta/_static/doctools.js
index ffadbec1..24992e64 100644
--- a/src/extra/manual/beta/_static/doctools.js
+++ b/src/extra/manual/beta/_static/doctools.js
@@ -4,7 +4,7 @@
*
* Sphinx JavaScript utilities for all documentation.
*
- * :copyright: Copyright 2007-2018 by the Sphinx team, see AUTHORS.
+ * :copyright: Copyright 2007-2017 by the Sphinx team, see AUTHORS.
* :license: BSD, see LICENSE for details.
*
*/
@@ -70,9 +70,7 @@ jQuery.fn.highlightText = function(text, className) {
if (node.nodeType === 3) {
var val = node.nodeValue;
var pos = val.toLowerCase().indexOf(text);
- if (pos >= 0 &&
- !jQuery(node.parentNode).hasClass(className) &&
- !jQuery(node.parentNode).hasClass("nohighlight")) {
+ if (pos >= 0 && !jQuery(node.parentNode).hasClass(className)) {
var span;
var isInSVG = jQuery(node).closest("body, svg, foreignObject").is("svg");
if (isInSVG) {
@@ -150,9 +148,7 @@ var Documentation = {
this.fixFirefoxAnchorBug();
this.highlightSearchWords();
this.initIndexTable();
- if (DOCUMENTATION_OPTIONS.NAVIGATION_WITH_KEYS) {
- this.initOnKeyListeners();
- }
+
},
/**
@@ -208,7 +204,7 @@ var Documentation = {
* see: https://bugzilla.mozilla.org/show_bug.cgi?id=645075
*/
fixFirefoxAnchorBug : function() {
- if (document.location.hash && $.browser.mozilla)
+ if (document.location.hash)
window.setTimeout(function() {
document.location.href += '';
}, 10);
@@ -312,4 +308,4 @@ _ = Documentation.gettext;
$(document).ready(function() {
Documentation.init();
-});
+});
\ No newline at end of file
diff --git a/src/extra/manual/beta/_static/jquery.js b/src/extra/manual/beta/_static/jquery.js
index 644d35e2..f6a6a99e 100644
--- a/src/extra/manual/beta/_static/jquery.js
+++ b/src/extra/manual/beta/_static/jquery.js
@@ -1,4 +1,4 @@
-/*! jQuery v3.2.1 | (c) JS Foundation and other contributors | jquery.org/license */
-!function(a,b){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){"use strict";var c=[],d=a.document,e=Object.getPrototypeOf,f=c.slice,g=c.concat,h=c.push,i=c.indexOf,j={},k=j.toString,l=j.hasOwnProperty,m=l.toString,n=m.call(Object),o={};function p(a,b){b=b||d;var c=b.createElement("script");c.text=a,b.head.appendChild(c).parentNode.removeChild(c)}var q="3.2.1",r=function(a,b){return new r.fn.init(a,b)},s=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,t=/^-ms-/,u=/-([a-z])/g,v=function(a,b){return b.toUpperCase()};r.fn=r.prototype={jquery:q,constructor:r,length:0,toArray:function(){return f.call(this)},get:function(a){return null==a?f.call(this):a<0?this[a+this.length]:this[a]},pushStack:function(a){var b=r.merge(this.constructor(),a);return b.prevObject=this,b},each:function(a){return r.each(this,a)},map:function(a){return this.pushStack(r.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(f.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(a<0?b:0);return this.pushStack(c>=0&&c0&&b-1 in a)}var x=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u="sizzle"+1*new Date,v=a.document,w=0,x=0,y=ha(),z=ha(),A=ha(),B=function(a,b){return a===b&&(l=!0),0},C={}.hasOwnProperty,D=[],E=D.pop,F=D.push,G=D.push,H=D.slice,I=function(a,b){for(var c=0,d=a.length;c","
"],col:[2,"
"],tr:[2,"","
"],td:[3,"
"],_default:[0,"",""]};ma.optgroup=ma.option,ma.tbody=ma.tfoot=ma.colgroup=ma.caption=ma.thead,ma.th=ma.td;function na(a,b){var c;return c="undefined"!=typeof a.getElementsByTagName?a.getElementsByTagName(b||"*"):"undefined"!=typeof a.querySelectorAll?a.querySelectorAll(b||"*"):[],void 0===b||b&&B(a,b)?r.merge([a],c):c}function oa(a,b){for(var c=0,d=a.length;c","
On the source host, ensure that /bin/sh is not bash: bash is quite slow for script execution. Instead, you could use dash after installing it:
-ln -sf /bin/dash /bin/sh
+ln -sf /bin/dash /bin/sh
# Go to cdist checkout
+# Go to cdist checkout
cd /path/to/cdist
# Create branches
@@ -252,7 +261,7 @@ realise this with git branches:
Similar if you want to have cdist checked out at multiple machines,
you can clone it multiple times:
-machine-a % git clone git://your-git-server/cdist
+machine-a % git clone git://your-git-server/cdist
machine-b % git clone git://your-git-server/cdist
@@ -263,7 +272,7 @@ you can clone it multiple times:
you can delegate to other manifests and have the groups edit only
their manifests. You can use the following snippet in
conf/manifests/init:
-# Include other groups
+# Include other groups
sh -e "$__manifest/systems"
sh -e "$__manifest/cbrg"
@@ -275,7 +284,7 @@ their manifests. You can use the following snippet in
When you need to manage multiple sites with cdist, like company_a, company_b
and private for instance, you can easily use git for this purpose.
Including a possible common base that is reused across the different sites:
-# create branches
+# create branches
git branch company_a company_b common private
# make stuff for company a
@@ -296,7 +305,7 @@ Including a possible common base that is reused across the different sites:
The following .git/config is taken from a real world scenario:
-# Track upstream, merge from time to time
+# Track upstream, merge from time to time
[remote "upstream"]
url = git://git.schottelius.org/cdist
fetch = +refs/heads/*:refs/remotes/upstream/*
@@ -359,7 +368,7 @@ implement this scenario with a gateway host and sudo:
create directory files/ in your type (convention)
create the template as an executable file like files/basic.conf.sh, it will output text using shell variables for the values
-#!/bin/sh
+#!/bin/sh
# in the template, use cat << eof (here document) to output the text
# and use standard shell variables in the template
# output everything in the template script to stdout
@@ -378,7 +387,7 @@ cat << EOF
- in the manifest, export the relevant variables and add the following lines to your manifest:
-# export variables needed for the template
+# export variables needed for the template
export SERVERNAME='test"
export ROOT='/var/www/test'
# render the template
@@ -397,7 +406,7 @@ cat << EOF
object of this type: Use the '--initial-manifest' parameter
with - (stdin) as argument and feed object into stdin
of cdist:
-# Singleton type without parameter
+# Singleton type without parameter
echo __ungleich_munin_server | cdist --initial-manifest - munin.panter.ch
# Singleton type with parameter
@@ -437,7 +446,7 @@ on the previously created object.
things you are assuring that remote host has packages sudo and curl
installed.
init1
-CDIST_ORDER_DEPENDENCY=1
+CDIST_ORDER_DEPENDENCY=1
export CDIST_ORDER_DEPENDENCY
for p in sudo curl
@@ -449,7 +458,7 @@ installed.
Then you have some other special init manifest where among other things you are
assuring sudo package is installed.
init2
-CDIST_ORDER_DEPENDENCY=1
+CDIST_ORDER_DEPENDENCY=1
export CDIST_ORDER_DEPENDENCY
__package sudo
@@ -458,12 +467,12 @@ __package sudo
Then you have third init manifest where you combine those two init manifests,
by including them:
init
-sh -e "$__manifest/init1"
+sh -e "$__manifest/init1"
sh -e "$__manifest/init2"
The resulting init manifest is then equal to:
-CDIST_ORDER_DEPENDENCY=1
+CDIST_ORDER_DEPENDENCY=1
export CDIST_ORDER_DEPENDENCY
for p in sudo curl
@@ -504,7 +513,7 @@ and gencode.
Suppose you have defined CDIST_ORDER_DEPENDENCY and then, among other things,
you specify creation of three, by nature independent, files.
init
-CDIST_ORDER_DEPENDENCY=1
+CDIST_ORDER_DEPENDENCY=1
export CDIST_ORDER_DEPENDENCY
...
@@ -517,7 +526,7 @@ __file /tmp/file3
Due to defined CDIST_ORDER_DEPENDENCY cdist will execute them in specified order.
It is better to use CDIST_ORDER_DEPENDENCY in well defined blocks:
init
-CDIST_ORDER_DEPENDENCY=1
+CDIST_ORDER_DEPENDENCY=1
export CDIST_ORDER_DEPENDENCY
...
unset CDIST_ORDER_DEPENDENCY
diff --git a/src/extra/manual/beta/cdist-bootstrap.html b/src/extra/manual/beta/cdist-bootstrap.html
index 62766814..8321ee10 100644
--- a/src/extra/manual/beta/cdist-bootstrap.html
+++ b/src/extra/manual/beta/cdist-bootstrap.html
@@ -8,7 +8,7 @@
- 11. Bootstrap — cdist 5.0.1 documentation
+ 11. Bootstrap — cdist 5.0.2 documentation
@@ -20,11 +20,20 @@
-
+
-
@@ -63,7 +72,7 @@
- 5.0.1
+ 5.0.2
@@ -217,7 +226,7 @@ you are on the master branch.
development branch, it may or may not work. There are also version branches
available, which are kept in a stable state. Let's use git branch -r
to list all branches:
-cdist% git branch -r
+cdist% git branch -r
origin/1.0
origin/1.1
origin/1.2
@@ -245,7 +254,7 @@ your own work. Now it's time to create your branch, which contains your
local changes. I usually name it by the company/area I am working for:
ethz-systems, localch, customerX, ... But this is pretty much up to you.
In this tutorial I use the branch mycompany:
-cdist% git checkout -b mycompany origin/master
+cdist% git checkout -b mycompany origin/master
Branch mycompany set up to track remote branch master from origin.
Switched to a new branch 'mycompany'
cdist-user% git branch
@@ -262,7 +271,7 @@ temporary only. For this reason and to enable shareability, the configuration
should be published to another device as early as possible. The following
example shows how to publish the configuration to another host that is
reachable via ssh and has git installed:
-# Create bare git repository on the host named "loch"
+# Create bare git repository on the host named "loch"
cdist% ssh loch "GIT_DIR=/home/nutzer/cdist git init"
Initialized empty Git repository in /home/nutzer/cdist/
@@ -286,7 +295,7 @@ as usual in your branch and push out changes by entering git push
11.4. Updating from origin¶
Whenever you want to update your cdist installation, you can use git to do so:
-# Update git repository with latest changes from origin
+# Update git repository with latest changes from origin
cdist% git fetch origin
# Update current branch with master branch from origin
diff --git a/src/extra/manual/beta/cdist-cache.html b/src/extra/manual/beta/cdist-cache.html
index 8868bb60..c33035ef 100644
--- a/src/extra/manual/beta/cdist-cache.html
+++ b/src/extra/manual/beta/cdist-cache.html
@@ -8,7 +8,7 @@
- 26. Local cache overview — cdist 5.0.1 documentation
+ 26. Local cache overview — cdist 5.0.2 documentation
@@ -20,11 +20,20 @@
-
+
-
@@ -63,7 +72,7 @@
- 5.0.1
+ 5.0.2
diff --git a/src/extra/manual/beta/cdist-configuration.html b/src/extra/manual/beta/cdist-configuration.html
index fa48b0bf..5e20107d 100644
--- a/src/extra/manual/beta/cdist-configuration.html
+++ b/src/extra/manual/beta/cdist-configuration.html
@@ -8,7 +8,7 @@
- 12. Configuration — cdist 5.0.1 documentation
+ 12. Configuration — cdist 5.0.2 documentation
@@ -20,11 +20,20 @@
-
+
-
@@ -63,7 +72,7 @@
- 5.0.1
+ 5.0.2
diff --git a/src/extra/manual/beta/cdist-explorer.html b/src/extra/manual/beta/cdist-explorer.html
index 31f235f1..725afc9c 100644
--- a/src/extra/manual/beta/cdist-explorer.html
+++ b/src/extra/manual/beta/cdist-explorer.html
@@ -8,7 +8,7 @@
- 16. Explorer — cdist 5.0.1 documentation
+ 16. Explorer — cdist 5.0.2 documentation
@@ -20,11 +20,20 @@
-
+
-
@@ -63,7 +72,7 @@
- 5.0.1
+ 5.0.2
@@ -200,11 +209,11 @@ type explorers. Both work almost exactly the same way, with the difference
that the values of the general explorers are stored in a general location and
the type specific below the object.
Explorers can reuse other explorers on the target system by calling
-$__explorer/<explorer_name> (general and type explorer)
+$__explorer/<explorer_name> (general and type explorer)
or
-$__type_explorer/<explorer name> (type explorer).
+$__type_explorer/<explorer name> (type explorer).
In case of significant errors, the explorer may exit non-zero and return an
@@ -215,12 +224,12 @@ explorer.
16.2. Examples¶
A very simple explorer may look like this:
-hostname
+hostname
Which is in practise the hostname explorer.
A type explorer, which could check for the status of a package may look like this:
-if [ -f "$__object/parameter/name" ]; then
+if [ -f "$__object/parameter/name" ]; then
name="$(cat "$__object/parameter/name")"
else
name="$__object_id"
diff --git a/src/extra/manual/beta/cdist-features.html b/src/extra/manual/beta/cdist-features.html
index ce9205a8..430bbeaf 100644
--- a/src/extra/manual/beta/cdist-features.html
+++ b/src/extra/manual/beta/cdist-features.html
@@ -8,7 +8,7 @@
- 2. Features — cdist 5.0.1 documentation
+ 2. Features — cdist 5.0.2 documentation
@@ -20,11 +20,20 @@
-
+
-
@@ -63,7 +72,7 @@
- 5.0.1
+ 5.0.2
diff --git a/src/extra/manual/beta/cdist-hacker.html b/src/extra/manual/beta/cdist-hacker.html
index b348b54d..7228c966 100644
--- a/src/extra/manual/beta/cdist-hacker.html
+++ b/src/extra/manual/beta/cdist-hacker.html
@@ -8,7 +8,7 @@
- 29. Hacking — cdist 5.0.1 documentation
+ 29. Hacking — cdist 5.0.2 documentation
@@ -20,11 +20,20 @@
-
+
-
@@ -63,7 +72,7 @@
- 5.0.1
+ 5.0.2
@@ -262,7 +271,7 @@ core cdist already.
29.6. Example git workflow¶
The following workflow works fine for most developers
-# get latest upstream master branch
+# get latest upstream master branch
git clone https://code.ungleich.ch/ungleich-public/cdist.git
# update if already existing
@@ -306,7 +315,7 @@ git merge origin/master
If at any point you want to go back to the original master branch, you can
use git stash to stash your changes away:
-.. code-block:: sh
+.. code-block:: sh
@@ -319,7 +328,7 @@ git merge origin/master
Similarly when you want to develop another new feature, you go back
to the master branch and create another branch based on it:
-.. code-block:: sh
+.. code-block:: sh
diff --git a/src/extra/manual/beta/cdist-install.html b/src/extra/manual/beta/cdist-install.html
index fa8844ac..6180b1f0 100644
--- a/src/extra/manual/beta/cdist-install.html
+++ b/src/extra/manual/beta/cdist-install.html
@@ -8,7 +8,7 @@
- 4. How to install cdist — cdist 5.0.1 documentation
+ 4. How to install cdist — cdist 5.0.2 documentation
@@ -20,11 +20,20 @@
-
+
-
@@ -63,7 +72,7 @@
- 5.0.1
+ 5.0.2
@@ -233,7 +242,7 @@
a version control in place for development of your own stuff
immediately.
To install cdist, execute the following commands:
-git clone https://code.ungleich.ch/ungleich-public/cdist.git
+git clone https://code.ungleich.ch/ungleich-public/cdist.git
cd cdist
export PATH=$PATH:$(pwd -P)/bin
@@ -243,20 +252,20 @@ You can get GPG public key used for signing github mirror.
To install cdist with distutils from cloned repository, first you have to
create version.py:
-./bin/build-helper version
+./bin/build-helper version
Then you install it with:
-make install
+make install
or with:
-make install-user
+make install-user
to install it into user site-packages directory.
Or directly with distutils:
-python setup.py install
+python setup.py install
Note that bin/build-helper script is intended for cdist maintainers.
@@ -270,19 +279,19 @@ Or directly with distutils:
Other branches may be available for features or bugfixes, but they
may vanish at any point. To select a specific branch use
-# Generic code
+# Generic code
git checkout -b <localbranchname> origin/<branchname>
So for instance if you want to use and stay with version 4.1, you can use
-git checkout -b 4.1 origin/4.1
+git checkout -b 4.1 origin/4.1
4.2.1.2. Building and using documentation (man and html)¶
If you want to build and use the documentation, run:
-make docs
+make docs
Documentation comes in two formats, man pages and full HTML
@@ -290,7 +299,7 @@ documentation. Documentation is built into distribution's
docs/dist directory. man pages are in docs/dist/man and
HTML documentation in docs/dist/html.
If you want to use man pages, run:
-export MANPATH=$MANPATH:$(pwd -P)/docs/dist/man
+export MANPATH=$MANPATH:$(pwd -P)/docs/dist/man
Or you can move man pages from docs/dist/man directory to some
@@ -298,20 +307,20 @@ other directory and add it to MANPATH.
Full HTML documentation can be accessed at docs/dist/html/index.html.
You can also build only man pages or only html documentation, for
only man pages run:
-make man
+make man
for only html documentation run:
-make html
+make html
You can also build man pages for types in your ~/.cdist directory:
-make dotman
+make dotman
Built man pages are now in docs/dist/man directory. If you have
some other custom .cdist directory, e.g. /opt/cdist then use:
-make DOT_CDIST_PATH=/opt/cdist dotman
+make DOT_CDIST_PATH=/opt/cdist dotman
Note that dotman-target has to be built before a make docs-run, otherwise
@@ -322,7 +331,7 @@ the custom man-pages are not picked up.
4.2.2. Python package¶
Cdist is available as a python package at
PyPi. You can install it using
-pip install cdist
+pip install cdist
diff --git a/src/extra/manual/beta/cdist-integration.html b/src/extra/manual/beta/cdist-integration.html
index bfb6e3d9..a8efba2f 100644
--- a/src/extra/manual/beta/cdist-integration.html
+++ b/src/extra/manual/beta/cdist-integration.html
@@ -8,7 +8,7 @@
- 22. cdist integration / using cdist as library — cdist 5.0.1 documentation
+ 22. cdist integration / using cdist as library — cdist 5.0.2 documentation
@@ -20,11 +20,20 @@
-
+
-
@@ -63,7 +72,7 @@
- 5.0.1
+ 5.0.2
@@ -210,7 +219,7 @@ find it first from local lib directory and then in PATH.
22.2. Examples¶
-# configure host from python interactive shell
+# configure host from python interactive shell
>>> import cdist.integration
>>> cdist.integration.configure_hosts_simple('185.203.114.185',
... '~/.cdist/manifest/init')
diff --git a/src/extra/manual/beta/cdist-inventory.html b/src/extra/manual/beta/cdist-inventory.html
index 1bb4fafb..3e9f5c66 100644
--- a/src/extra/manual/beta/cdist-inventory.html
+++ b/src/extra/manual/beta/cdist-inventory.html
@@ -8,7 +8,7 @@
- 19. Inventory — cdist 5.0.1 documentation
+ 19. Inventory — cdist 5.0.2 documentation
@@ -20,11 +20,20 @@
-
+
-
@@ -63,7 +72,7 @@
- 5.0.1
+ 5.0.2
@@ -228,7 +237,7 @@ selected.
19.5. Examples¶
-# List inventory content
+# List inventory content
$ cdist inventory list -b
# List inventory for specified host localhost
@@ -268,7 +277,7 @@ $ cdist config -b -A
19.6. Example of manipulating database¶
-$ python3 scripts/cdist inventory list -b
+$ python3 scripts/cdist inventory list -b
$ python3 scripts/cdist inventory add-host -b localhost
$ python3 scripts/cdist inventory add-host -b test.mycloud.net
$ python3 scripts/cdist inventory list -b
@@ -383,7 +392,7 @@ cdist can then be fed with this list of hosts through stdin or file using
-f option. For example, if your host list is stored in sqlite3 database
hosts.db and you want to select hosts which purpose is django then you
can use it with cdist like:
-$ sqlite3 hosts.db "select hostname from hosts where purpose = 'django';" | cdist config
+$ sqlite3 hosts.db "select hostname from hosts where purpose = 'django';" | cdist config
diff --git a/src/extra/manual/beta/cdist-manifest.html b/src/extra/manual/beta/cdist-manifest.html
index c0931d70..05228571 100644
--- a/src/extra/manual/beta/cdist-manifest.html
+++ b/src/extra/manual/beta/cdist-manifest.html
@@ -8,7 +8,7 @@
- 13. Manifest — cdist 5.0.1 documentation
+ 13. Manifest — cdist 5.0.2 documentation
@@ -20,11 +20,20 @@
-
+
-
@@ -63,7 +72,7 @@
- 5.0.1
+ 5.0.2
@@ -207,7 +216,7 @@ setup the MANPATH correctly, you can use man cdist-reference to
the reference with pointers to the manpages.
Types in manifests are used like normal command line tools. Let's have a look
at an example:
-# Create object of type __package with the parameter state = absent
+# Create object of type __package with the parameter state = absent
__package apache2 --state absent
# Same with the __directory type
@@ -239,7 +248,7 @@ Cdist expects the initial manifest at cdist/conf/manifest/init.
created on which host. To distinguish between hosts, you can use the
environment variable __target_host and/or __target_hostname and/or
__target_fqdn. Let's have a look at a simple example:
-__cdistmarker
+__cdistmarker
case "$__target_host" in
localhost)
@@ -264,7 +273,7 @@ scripts in cdist/conf/manifest/ and include them in cdi
Cdist provides the environment variable __manifest to reference
the directory containing the initial manifest (see cdist reference).
The following example would include every file with a .sh suffix:
-# Include *.sh
+# Include *.sh
for manifest in $__manifest/*.sh; do
# And source scripts into our shell environment
. "$manifest"
@@ -277,7 +286,7 @@ done
If you want to describe that something requires something else, just
setup the variable "require" to contain the requirements. Multiple
requirements can be added white space separated.
- 1 # No dependency
+ 1 # No dependency
2 __file /etc/cdist-configured
3
4 # Require above object
@@ -302,7 +311,7 @@ if necessary before "__link" proceeds (or to abort execution with an e
export the "require" variable as well. But then, if you need to add extra
dependencies to a specific type, you have to make sure that you append these
to the globally already defined one.
-# First of all, update the package index
+# First of all, update the package index
__package_update_index
# Upgrade all the installed packages afterwards
require="__package_update_index" __package_upgrade_all
@@ -350,7 +359,7 @@ overrides would result in circular dependencies, which is an error.
13.8. Examples¶
The initial manifest may for instance contain the following code:
-# Always create this file, so other sysadmins know cdist is used.
+# Always create this file, so other sysadmins know cdist is used.
__file /etc/cdist-configured
case "$__target_host" in
@@ -362,11 +371,11 @@ __file /etc/cdist-configured
The manifest of the type "nologin" may look like this:
-__file /etc/nologin --source "$__type/files/default.nologin"
+__file /etc/nologin --source "$__type/files/default.nologin"
This example makes use of dependencies:
-# Ensure that lighttpd is installed
+# Ensure that lighttpd is installed
__package lighttpd --state present
# Ensure that munin makes use of lighttpd instead of the default webserver
# package as decided by the package manager
@@ -374,7 +383,7 @@ __package lighttpd --state present
How to override objects:
-# for example in the initial manifest
+# for example in the initial manifest
# create user account foobar with some hash for password
__user foobar --password 'some_fancy_hash' --home /home/foobarexample
@@ -393,7 +402,7 @@ __user foobar --password 'some_other_hash'
Dependencies defined by execution order work as following:
-# Tells cdist to execute all types in the order in which they are created ...
+# Tells cdist to execute all types in the order in which they are created ...
export CDIST_ORDER_DEPENDENCY=on
__sample_type 1
require="__some_type_somewhere/id" __sample_type 2
diff --git a/src/extra/manual/beta/cdist-messaging.html b/src/extra/manual/beta/cdist-messaging.html
index 908b1c7e..53ca2d34 100644
--- a/src/extra/manual/beta/cdist-messaging.html
+++ b/src/extra/manual/beta/cdist-messaging.html
@@ -8,7 +8,7 @@
- 17. Messaging — cdist 5.0.1 documentation
+ 17. Messaging — cdist 5.0.2 documentation
@@ -20,11 +20,20 @@
-
+
-
@@ -63,7 +72,7 @@
- 5.0.1
+ 5.0.2
@@ -220,17 +229,17 @@ can only react reliably on messages by objects that you depend on.
17.3. Examples¶
When you want to emit a message use:
-echo "something" >> "$__messages_out"
+echo "something" >> "$__messages_out"
When you want to react on a message use:
-if grep -q "^__your_type/object/id:something" "$__messages_in"; then
+if grep -q "^__your_type/object/id:something" "$__messages_in"; then
echo "I do something else"
fi
Some real life examples:
-# Reacting on changes from block for keepalive
+# Reacting on changes from block for keepalive
if grep -q "^__block/keepalive-vrrp" "$__messages_in"; then
echo /etc/init.d/keepalived restart
fi
@@ -242,7 +251,7 @@ can only react reliably on messages by objects that you depend on.
Restart sshd on changes
-os="$(cat "$__global/explorer/os")"
+os="$(cat "$__global/explorer/os")"
case "$os" in
centos|redhat|suse)
diff --git a/src/extra/manual/beta/cdist-os.html b/src/extra/manual/beta/cdist-os.html
index c8ae20b0..1682bcef 100644
--- a/src/extra/manual/beta/cdist-os.html
+++ b/src/extra/manual/beta/cdist-os.html
@@ -8,7 +8,7 @@
- 3. Supported operating systems — cdist 5.0.1 documentation
+ 3. Supported operating systems — cdist 5.0.2 documentation
@@ -20,11 +20,20 @@
-
+
-
@@ -63,7 +72,7 @@
- 5.0.1
+ 5.0.2
diff --git a/src/extra/manual/beta/cdist-parallelization.html b/src/extra/manual/beta/cdist-parallelization.html
index a021fa25..14f335d3 100644
--- a/src/extra/manual/beta/cdist-parallelization.html
+++ b/src/extra/manual/beta/cdist-parallelization.html
@@ -8,7 +8,7 @@
- 18. Parallelization — cdist 5.0.1 documentation
+ 18. Parallelization — cdist 5.0.2 documentation
@@ -20,11 +20,20 @@
-
+
-
@@ -63,7 +72,7 @@
- 5.0.1
+ 5.0.2
@@ -206,7 +215,7 @@ using specified number of parallel jobs.
18.2. Examples¶
-# Configure hosts read from file hosts.file in parallel
+# Configure hosts read from file hosts.file in parallel
$ cdist config -p -f hosts.file
# Configure hosts read from file hosts.file sequentially but using default
@@ -232,7 +241,7 @@ This limit is controlled with sshd :strong:MaxSessions configuration
options. For more details refer to sshd_config(5).
For example, if you reach MaxSessions sessions you may get the
following output:
-$ cdist config -b -j 11 -v 78.47.116.244
+