From 432e65b218e6db786c61345170cd140d198ed3c4 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Sat, 12 Apr 2014 19:41:39 +0200 Subject: [PATCH 1/3] document CDIST_LOCAL_SHELL Signed-off-by: Nico Schottelius --- docs/man/cdist-reference.text.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/man/cdist-reference.text.sh b/docs/man/cdist-reference.text.sh index cff0f9c7..644d12f4 100755 --- a/docs/man/cdist-reference.text.sh +++ b/docs/man/cdist-reference.text.sh @@ -237,6 +237,9 @@ The following environment variables influence the behaviour of cdist: require:: Setup dependencies between objects (see cdist-manifest(7)) +CDIST_LOCAL_SHELL:: + Use this shell instead of /bin/sh to execute scripts + CDIST_OVERRIDE:: Allow overwriting type parameters (see cdist-manifest(7)) From 152f02bb62ae240fe32ab47d1817e79b4715c250 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Sat, 12 Apr 2014 19:42:37 +0200 Subject: [PATCH 2/3] document CDIST_REMOTE_SHELL Signed-off-by: Nico Schottelius --- docs/man/cdist-reference.text.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/docs/man/cdist-reference.text.sh b/docs/man/cdist-reference.text.sh index 644d12f4..7081e762 100755 --- a/docs/man/cdist-reference.text.sh +++ b/docs/man/cdist-reference.text.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# 2010-2013 Nico Schottelius (nico-cdist at schottelius.org) +# 2010-2014 Nico Schottelius (nico-cdist at schottelius.org) # 2014 Daniel Heule (hda at sfs.biz) # # This file is part of cdist. @@ -238,7 +238,10 @@ require:: Setup dependencies between objects (see cdist-manifest(7)) CDIST_LOCAL_SHELL:: - Use this shell instead of /bin/sh to execute scripts + Use this shell locally instead of /bin/sh to execute scripts + +CDIST_REMOTE_SHELL:: + Use this shell remotely instead of /bin/sh to execute scripts CDIST_OVERRIDE:: Allow overwriting type parameters (see cdist-manifest(7)) From a568d5da0fcad260ee953758e12968b78ce2487f Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Sat, 12 Apr 2014 19:43:52 +0200 Subject: [PATCH 3/3] ++changes Signed-off-by: Nico Schottelius --- docs/changelog | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/changelog b/docs/changelog index 0a6a4986..68e040e4 100644 --- a/docs/changelog +++ b/docs/changelog @@ -6,6 +6,7 @@ Changelog 3.1.2: + * Documentation: Add missing environment variables to reference * Type __qemu_img: size is optional, if state is not present * Type __key_value: Rewrite using awk (Daniel Heule) * New Type: __dog_vdi