From 2f88521d41d4288cdf767ba996c4f7365a5be21a Mon Sep 17 00:00:00 2001 From: Daniel Roth Date: Tue, 8 Mar 2011 21:43:36 +0100 Subject: [PATCH 01/10] ads --- asd | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 asd diff --git a/asd b/asd new file mode 100644 index 00000000..e69de29b From 4f8932c1427b3491f05dd289fd08e448d67e3bac Mon Sep 17 00:00:00 2001 From: Daniel Roth Date: Tue, 15 Mar 2011 19:07:58 +0100 Subject: [PATCH 02/10] Documented parameters for __addifnosuchline --- .../to_check/cdist-type-addifnosuchline.text | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/doc/man/to_check/cdist-type-addifnosuchline.text b/doc/man/to_check/cdist-type-addifnosuchline.text index 09618dc3..12690000 100644 --- a/doc/man/to_check/cdist-type-addifnosuchline.text +++ b/doc/man/to_check/cdist-type-addifnosuchline.text @@ -19,6 +19,31 @@ cdist-type-addifnosuchline can be used to check a file for existence of a specific line and adding that if not found +REQUIRED PARAMETERS +------------------- +line:: + Specifies the content which shall be added if not existing. + + +OPTIONAL PARAMETERS +------------------- +file:: + If supplied, use this as the destination file. Otherwise the + object_id is used. + +EXAMPLES +-------- + +-------------------------------------------------------------------------------- +# Creates or appends the line specifiend in "foo" to the file "bar" + +__addifnosuchline foo --file bar --line foo + +# Adds the line "foo2" to the file "bar" +__addifnosuchline foo --file bar --line foo2 + +-------------------------------------------------------------------------------- + SEE ALSO -------- cdist(7) From f306004c9ca018abad6e1e1207ace40f01035127 Mon Sep 17 00:00:00 2001 From: Daniel Roth Date: Tue, 15 Mar 2011 20:16:56 +0100 Subject: [PATCH 03/10] Moved manpages for addifnosuchline --- asd | 0 doc/man/{to_check => }/cdist-type-addifnosuchline.text | 0 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 asd rename doc/man/{to_check => }/cdist-type-addifnosuchline.text (100%) diff --git a/asd b/asd deleted file mode 100644 index e69de29b..00000000 diff --git a/doc/man/to_check/cdist-type-addifnosuchline.text b/doc/man/cdist-type-addifnosuchline.text similarity index 100% rename from doc/man/to_check/cdist-type-addifnosuchline.text rename to doc/man/cdist-type-addifnosuchline.text From 2072fc196f3ed01b045e3836f6afb33f27fdf335 Mon Sep 17 00:00:00 2001 From: Daniel Roth Date: Tue, 15 Mar 2011 20:46:15 +0100 Subject: [PATCH 04/10] Examples changed --- doc/man/cdist-type-addifnosuchline.text | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/man/cdist-type-addifnosuchline.text b/doc/man/cdist-type-addifnosuchline.text index 12690000..2222283a 100644 --- a/doc/man/cdist-type-addifnosuchline.text +++ b/doc/man/cdist-type-addifnosuchline.text @@ -15,14 +15,14 @@ cdist-type-addifnosuchline Add if no such line DESCRIPTION ----------- -cdist-type-addifnosuchline can be used to check a file for existence of a +cdist-type-addifnosuchline can be used to check a file for existence of a specific line and adding that if not found REQUIRED PARAMETERS ------------------- line:: - Specifies the content which shall be added if not existing. + Specifies the content which shall be added if not existing. OPTIONAL PARAMETERS @@ -35,12 +35,12 @@ EXAMPLES -------- -------------------------------------------------------------------------------- -# Creates or appends the line specifiend in "foo" to the file "bar" +# Creates or appends the line specifiend in "include_www" to the file "lighttpd.conf" -__addifnosuchline foo --file bar --line foo +__addifnosuchline www --file lighttpd.conf --line include_www -# Adds the line "foo2" to the file "bar" -__addifnosuchline foo --file bar --line foo2 +# Adds the line "include_git" to the file "bar" +__addifnosuchline git_web --file lighttpd.conf --line include_git -------------------------------------------------------------------------------- From c010c9b2886c1786b13c2bfadeea71a61bf1e1bd Mon Sep 17 00:00:00 2001 From: Daniel Roth Date: Tue, 15 Mar 2011 21:02:47 +0100 Subject: [PATCH 05/10] moved manpages --- .../type/__addifnosuchline/man.text | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename doc/man/cdist-type-addifnosuchline.text => conf/type/__addifnosuchline/man.text (100%) diff --git a/doc/man/cdist-type-addifnosuchline.text b/conf/type/__addifnosuchline/man.text similarity index 100% rename from doc/man/cdist-type-addifnosuchline.text rename to conf/type/__addifnosuchline/man.text From 2ed638a0a2bafc52f2421f808ee61be567c53aa1 Mon Sep 17 00:00:00 2001 From: Daniel Roth Date: Tue, 15 Mar 2011 21:18:18 +0100 Subject: [PATCH 06/10] Minor doc fixes --- conf/type/__addifnosuchline/man.text | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/conf/type/__addifnosuchline/man.text b/conf/type/__addifnosuchline/man.text index 2222283a..3d332cd0 100644 --- a/conf/type/__addifnosuchline/man.text +++ b/conf/type/__addifnosuchline/man.text @@ -1,21 +1,21 @@ -cdist-type-addifnosuchline(1) +cdist-type__addifnosuchline(1) ====================== Daniel Roth NAME ---- -cdist-type-addifnosuchline +cdist-type__addifnosuchline - Add if no such line SYNOPSIS -------- -cdist-type-addifnosuchline Add if no such line +cdist-type__addifnosuchline - Add if no such line DESCRIPTION ----------- -cdist-type-addifnosuchline can be used to check a file for existence of a +cdist-type__addifnosuchline - can be used to check a file for existence of a specific line and adding that if not found @@ -36,17 +36,16 @@ EXAMPLES -------------------------------------------------------------------------------- # Creates or appends the line specifiend in "include_www" to the file "lighttpd.conf" - __addifnosuchline www --file lighttpd.conf --line include_www -# Adds the line "include_git" to the file "bar" -__addifnosuchline git_web --file lighttpd.conf --line include_git +# Adds the line "include_git" to the file "lighttpd.conf" +__addifnosuchline lighttpd.conf --line include_git -------------------------------------------------------------------------------- SEE ALSO -------- -cdist(7) +- cdist-type(7) COPYING From 6f7312e877bd166992f41b9f75f603fe128b8526 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Tue, 15 Mar 2011 21:25:09 +0100 Subject: [PATCH 07/10] some cleanups in cdist-type__addifnosuchline(7) Signed-off-by: Nico Schottelius --- conf/type/__addifnosuchline/man.text | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/conf/type/__addifnosuchline/man.text b/conf/type/__addifnosuchline/man.text index 3d332cd0..722a3080 100644 --- a/conf/type/__addifnosuchline/man.text +++ b/conf/type/__addifnosuchline/man.text @@ -1,22 +1,17 @@ -cdist-type__addifnosuchline(1) -====================== +cdist-type__addifnosuchline(7) +============================== Daniel Roth NAME ---- -cdist-type__addifnosuchline - Add if no such line - - -SYNOPSIS --------- -cdist-type__addifnosuchline - Add if no such line +cdist-type__addifnosuchline - Add a line (if not existing already) DESCRIPTION ----------- -cdist-type__addifnosuchline - can be used to check a file for existence of a -specific line and adding that if not found +This type can be used to check a file for existence of a +specific line and adding it, if it was not found. REQUIRED PARAMETERS @@ -28,21 +23,22 @@ line:: OPTIONAL PARAMETERS ------------------- file:: - If supplied, use this as the destination file. Otherwise the - object_id is used. + If supplied, use this as the destination file. + Otherwise the object_id is used. + EXAMPLES -------- -------------------------------------------------------------------------------- # Creates or appends the line specifiend in "include_www" to the file "lighttpd.conf" -__addifnosuchline www --file lighttpd.conf --line include_www +__addifnosuchline www --file /etc/lighttpd.conf --line include_www # Adds the line "include_git" to the file "lighttpd.conf" -__addifnosuchline lighttpd.conf --line include_git - +__addifnosuchline /etc/lighttpd.conf --line include_git -------------------------------------------------------------------------------- + SEE ALSO -------- - cdist-type(7) From b19a29be6e9928da729a3f9748906c777c033954 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Tue, 15 Mar 2011 21:30:02 +0100 Subject: [PATCH 08/10] make cdist-env usable standalone (i.e. without cdist-config) Signed-off-by: Nico Schottelius --- bin/cdist-env | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/bin/cdist-env b/bin/cdist-env index e95e078b..a7610aac 100755 --- a/bin/cdist-env +++ b/bin/cdist-env @@ -18,14 +18,14 @@ # along with cdist. If not, see . # # -# Setup environment for use with cdist +# Setup environment for use with cdist - must be standalone! # -. cdist-config -[ $# -eq 0 ] || __cdist_usage "no arguments" - -# Allow access to unset variables like PATH and MANPATH -set +u +__cdist_pwd="$(pwd -P)" +__cdist_mydir="${0%/*}"; +__cdist_abs_mydir="$(cd "$__cdist_mydir" && pwd -P)" +__cdist_myname=${0##*/}; +__cdist_abs_myname="$__cdist_abs_mydir/$__cdist_myname" echo export PATH=$__cdist_abs_mydir:$PATH From 8fa48be2aeeeb15708ea7cc627b55be9841cebf9 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Tue, 15 Mar 2011 21:31:11 +0100 Subject: [PATCH 09/10] change footer (looks better) Signed-off-by: Nico Schottelius --- bin/cdist-deploy-to | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/cdist-deploy-to b/bin/cdist-deploy-to index 7f66888f..d006dd2d 100755 --- a/bin/cdist-deploy-to +++ b/bin/cdist-deploy-to @@ -67,4 +67,4 @@ cdist-dir push "$__cdist_target_host" "$__cdist_out_object_dir" \ # And finally - execute the code cdist-code-run-all "$__cdist_target_host" -echo "cdist $__cdist_version: success on $__cdist_target_host" +echo "cdist $__cdist_version: Successfully finished run on $__cdist_target_host" From e69db644b468deaae62dabe3490779dd251f2a4e Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Tue, 15 Mar 2011 21:38:09 +0100 Subject: [PATCH 10/10] prepare version 1.0.4 Signed-off-by: Nico Schottelius --- bin/cdist-config | 2 +- doc/changelog | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/cdist-config b/bin/cdist-config index 0d0fd152..61b7117f 100755 --- a/bin/cdist-config +++ b/bin/cdist-config @@ -19,7 +19,7 @@ # # -__cdist_version="1.0.3" +__cdist_version="1.0.4" # Fail if something bogus is going on set -u diff --git a/doc/changelog b/doc/changelog index 50fb9de1..c869c146 100644 --- a/doc/changelog +++ b/doc/changelog @@ -1,4 +1,4 @@ -1.0.4: +1.0.4: 2011-03-15 * New type __motd * New type __addifnosuchline * Document type __issue