From b470a47b15a4b5f77e7a73514f972aedb05f8e8c Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Mon, 12 Sep 2011 11:18:18 +0200 Subject: [PATCH] add working cdist manpage Signed-off-by: Nico Schottelius --- bin/cdist | 2 +- doc/man/man1/cdist.text | 30 +++++++++++++++++++++--------- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/bin/cdist b/bin/cdist index 628cbca4..7fb73e65 100755 --- a/bin/cdist +++ b/bin/cdist @@ -601,7 +601,7 @@ if __name__ == "__main__": help='Operate on multiple hosts in parallel', action='store_true', dest='parallel') parser.add_argument('-s', '--sequential', - help='Operate on multiple hosts sequentially', + help='Operate on multiple hosts sequentially (default)', action='store_false', dest='parallel') parser.add_argument('-V', '--version', help='Show version', action='version', version='%(prog)s ' + VERSION) diff --git a/doc/man/man1/cdist.text b/doc/man/man1/cdist.text index 368d9097..f45d4495 100644 --- a/doc/man/man1/cdist.text +++ b/doc/man/man1/cdist.text @@ -23,11 +23,24 @@ OPTIONS -h, --help:: Show the help screen +-b, --banner:: + Show cdist banner + +-c CDIST_HOME, --cdist-home CDIST_HOME:: + Instead of using the parent of the bin directory as cdist home, + use the specified directory + -d, --debug:: Enable debug output +-i MANIFEST, --initial-manifest MANIFEST:: + Path to a cdist manifest or - to read from stdin + -p, --parallel:: - Parallelise backup processes + Operate on multiple hosts in parallel + +-s, --sequential:: + Operate on multiple hosts sequentially -V, --version:: Show version and exit @@ -40,16 +53,15 @@ EXAMPLES # Configure ikq05.ethz.ch with debug enabled cdist -d ikq05.ethz.ch -__motd +# Configure hosts in parallel and use a different home directory +cdist -c ~/p/cdist-nutzung -p ikq02.ethz.ch ikq03.ethz.ch ikq04.ethz.ch + +# Does not need a comment, plain works +cdist --banner +cdist --help +cdist --version -------------------------------------------------------------------------------- -In both cases, cdist-type-emulator is called instead of a real type. -In the first case, the object id "/tmp/linetest" is recorded and the -parameter "line" stored with the content "test". - -In the second case, __motd must be decleared as a singleton, as the -object id is missing. - SEE ALSO --------