From 3818548d9aaec02b67875177c481107e5f94f063 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Mon, 9 Jan 2012 16:30:52 +0100 Subject: [PATCH] find conf/type -type f -exec sed -i 's/ *$//' {} \; Signed-off-by: Nico Schottelius --- conf/type/__apt_ppa/man.text | 2 +- conf/type/__directory/gencode-remote | 4 ++-- conf/type/__file/gencode-remote | 4 ++-- conf/type/__file/man.text | 2 +- conf/type/__group/gencode-remote | 2 +- conf/type/__key_value/gencode-remote | 2 +- conf/type/__key_value/man.text | 2 +- conf/type/__package/man.text | 2 +- conf/type/__package_pkg_openbsd/gencode-remote | 2 +- conf/type/__package_pkg_openbsd/man.text | 2 +- conf/type/__partition_msdos_apply/gencode-remote | 2 +- conf/type/__postgres_role/man.text | 4 ++-- conf/type/__timezone/man.text | 2 +- conf/type/__user/explorer/group | 2 +- conf/type/__user/gencode-remote | 2 +- 15 files changed, 18 insertions(+), 18 deletions(-) diff --git a/conf/type/__apt_ppa/man.text b/conf/type/__apt_ppa/man.text index 5423a1a2..f986eb2d 100644 --- a/conf/type/__apt_ppa/man.text +++ b/conf/type/__apt_ppa/man.text @@ -17,7 +17,7 @@ REQUIRED PARAMETERS ------------------- state:: The state the ppa should be in, either "enabled" or "disabled". - + OPTIONAL PARAMETERS ------------------- diff --git a/conf/type/__directory/gencode-remote b/conf/type/__directory/gencode-remote index 49ab789f..e871547a 100755 --- a/conf/type/__directory/gencode-remote +++ b/conf/type/__directory/gencode-remote @@ -65,8 +65,8 @@ case "$state_should" in echo rm -rf \"$destination\" fi - ;; - *) + ;; + *) echo "Unknown state: $state_should" >&2 exit 1 ;; diff --git a/conf/type/__file/gencode-remote b/conf/type/__file/gencode-remote index aedae218..9e700934 100755 --- a/conf/type/__file/gencode-remote +++ b/conf/type/__file/gencode-remote @@ -33,7 +33,7 @@ case "$state_should" in echo touch \"$destination\" fi fi - + # Mode settings if [ -f "$__object/parameter/mode" ]; then echo chmod \"$(cat "$__object/parameter/mode")\" \"$destination\" @@ -55,7 +55,7 @@ case "$state_should" in if [ "$exists" = "yes" ]; then echo rm -f \"$destination\" fi - + ;; *) diff --git a/conf/type/__file/man.text b/conf/type/__file/man.text index c787c930..5e91599f 100644 --- a/conf/type/__file/man.text +++ b/conf/type/__file/man.text @@ -10,7 +10,7 @@ cdist-type__file - Manage files DESCRIPTION ----------- -This cdist type allows you to create files, remove files and set file +This cdist type allows you to create files, remove files and set file attributes on the target. diff --git a/conf/type/__group/gencode-remote b/conf/type/__group/gencode-remote index 5d43a054..20e08738 100755 --- a/conf/type/__group/gencode-remote +++ b/conf/type/__group/gencode-remote @@ -47,7 +47,7 @@ if grep -q "^${name}:" "$__object/explorer/group"; then echo groupmod "$@" "$name" else true - fi + fi else for property in $(ls .); do new_value="$(cat "$property")" diff --git a/conf/type/__key_value/gencode-remote b/conf/type/__key_value/gencode-remote index 97da7349..184dfdf3 100755 --- a/conf/type/__key_value/gencode-remote +++ b/conf/type/__key_value/gencode-remote @@ -37,7 +37,7 @@ if [ "$value_is" != "$value_should" ]; then cat << DONE sed -i '/^${key}/d' "$file" DONE - else + else # change value cat << DONE awk -F "$delimiter" ' diff --git a/conf/type/__key_value/man.text b/conf/type/__key_value/man.text index 7b9381df..3e4e8013 100644 --- a/conf/type/__key_value/man.text +++ b/conf/type/__key_value/man.text @@ -35,7 +35,7 @@ EXAMPLES -------- -------------------------------------------------------------------------------- -# Set the maximum system user id +# Set the maximum system user id __key_value SYS_UID_MAX --file /etc/login.defs --value 666 --delimiter ' ' # Same with fancy id diff --git a/conf/type/__package/man.text b/conf/type/__package/man.text index 46af7b3d..d0460a31 100644 --- a/conf/type/__package/man.text +++ b/conf/type/__package/man.text @@ -26,7 +26,7 @@ name:: The name of the package to install. Default is to use the object_id as the package name. version:: - The version of the package to install. Default is to install the version + The version of the package to install. Default is to install the version choosen by the local package manager. type:: The package type to use. Default is determined based on the $os explorer diff --git a/conf/type/__package_pkg_openbsd/gencode-remote b/conf/type/__package_pkg_openbsd/gencode-remote index 0cafddd6..eee2a3d9 100755 --- a/conf/type/__package_pkg_openbsd/gencode-remote +++ b/conf/type/__package_pkg_openbsd/gencode-remote @@ -78,7 +78,7 @@ eof eof fi ;; - *) + *) echo "Unknown state: $state" >&2 exit 1 ;; diff --git a/conf/type/__package_pkg_openbsd/man.text b/conf/type/__package_pkg_openbsd/man.text index 98aeaccf..555bb0ac 100644 --- a/conf/type/__package_pkg_openbsd/man.text +++ b/conf/type/__package_pkg_openbsd/man.text @@ -5,7 +5,7 @@ Andi Brönnimann NAME ---- -cdist-type__package_pkg_openbsd - Manage OpenBSD packages +cdist-type__package_pkg_openbsd - Manage OpenBSD packages DESCRIPTION diff --git a/conf/type/__partition_msdos_apply/gencode-remote b/conf/type/__partition_msdos_apply/gencode-remote index 1d5c33cb..5dab7070 100755 --- a/conf/type/__partition_msdos_apply/gencode-remote +++ b/conf/type/__partition_msdos_apply/gencode-remote @@ -77,7 +77,7 @@ for object in $objects; do debug "current_device=$current_device" debug "available_device_size=$available_device_size" fi - + type="$(cat "$object/parameter/type")" partition="$(cat "$object/parameter/partition")" minor="$(cat "$object/parameter/minor")" diff --git a/conf/type/__postgres_role/man.text b/conf/type/__postgres_role/man.text index a7264870..bcc7b5d7 100644 --- a/conf/type/__postgres_role/man.text +++ b/conf/type/__postgres_role/man.text @@ -21,7 +21,7 @@ state:: OPTIONAL PARAMETERS ------------------- -All optional parameter map directly to the corresponding postgres createrole +All optional parameter map directly to the corresponding postgres createrole parameters. password:: @@ -36,7 +36,7 @@ EXAMPLES -------- -------------------------------------------------------------------------------- -__postgres_role myrole --state present +__postgres_role myrole --state present __postgres_role myrole --state present --password 'secret' diff --git a/conf/type/__timezone/man.text b/conf/type/__timezone/man.text index 97e85dd3..89136855 100644 --- a/conf/type/__timezone/man.text +++ b/conf/type/__timezone/man.text @@ -10,7 +10,7 @@ cdist-type__timezone - Allows to configure the desired localtime timezone. DESCRIPTION ----------- -This type creates a symlink (/etc/localtime) to the selected timezone +This type creates a symlink (/etc/localtime) to the selected timezone (which should be available in /usr/share/zoneinfo). diff --git a/conf/type/__user/explorer/group b/conf/type/__user/explorer/group index 9defba14..98ce39c6 100755 --- a/conf/type/__user/explorer/group +++ b/conf/type/__user/explorer/group @@ -24,5 +24,5 @@ if [ -f "$__object/parameter/gid" ]; then gid=$(cat "$__object/parameter/gid") getent group "$gid" || true -fi +fi diff --git a/conf/type/__user/gencode-remote b/conf/type/__user/gencode-remote index c4f9123a..ce50359b 100755 --- a/conf/type/__user/gencode-remote +++ b/conf/type/__user/gencode-remote @@ -42,7 +42,7 @@ if grep -q "^${name}:" "$__object/explorer/passwd"; then fi ;; password) - field=3 + field=3 file="$__object/explorer/shadow" ;; comment) field=5 ;;