moep
/
cdist
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make state parameter optional for all types, fixes #131

This commit is contained in:
Daniel Heule 2014-02-08 21:48:51 +01:00
parent 4cca593071
commit 423001b702
19 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cdist/conf/type/__pf_ruleset/man.text
View File

@ -16,7 +16,7 @@ This type is used on *BSD systems to manage the pf firewall's ruleset.
REQUIRED PARAMETERS REQUIRED PARAMETERS
------------------- -------------------
state:: state::
Either "absent" (no ruleset at all) or "present" Either "absent" (no ruleset at all) or "present", defaults to "present".
OPTIONAL PARAMETERS OPTIONAL PARAMETERS

1
cdist/conf/type/__pf_ruleset/parameter/default/state Normal file
View File

@ -0,0 +1 @@
present

1
cdist/conf/type/__pf_ruleset/parameter/optional
View File

@ -1 +1,2 @@
source source
state

3
cdist/conf/type/__postgres_database/gencode-remote
View File

@ -19,8 +19,7 @@
# #
name="$__object_id" name="$__object_id"
state_should="present" state_should="$(cat "$__object/parameter/state")"
[ -f "$__object/parameter/state" ] && state_should="$(cat "$__object/parameter/state")"
state_is="$(cat "$__object/explorer/state")" state_is="$(cat "$__object/explorer/state")"
if [ "$state_should" != "$state_is" ]; then if [ "$state_should" != "$state_is" ]; then

2
cdist/conf/type/__postgres_database/man.text
View File

@ -16,7 +16,7 @@ This cdist type allows you to create or drop postgres databases.
OPTIONAL PARAMETERS OPTIONAL PARAMETERS
------------------- -------------------
state:: state::
either 'present' or 'absent' either 'present' or 'absent', defaults to 'present'.
owner:: owner::
the role owning this database the role owning this database

1
cdist/conf/type/__postgres_database/parameter/default/state Normal file
View File

@ -0,0 +1 @@
present

3
cdist/conf/type/__postgres_role/gencode-remote
View File

@ -20,8 +20,7 @@
name="$__object_id" name="$__object_id"
state_is="$(cat "$__object/explorer/state")" state_is="$(cat "$__object/explorer/state")"
state_should="present" state_should="$(cat "$__object/parameter/state")"
[ -f "$__object/parameter/state" ] && state_should="$(cat "$__object/parameter/state")"
[ "$state_is" = "$state_should" ] && exit 0 [ "$state_is" = "$state_should" ] && exit 0

1
cdist/conf/type/__postgres_role/parameter/default/state Normal file
View File

@ -0,0 +1 @@
present

2
cdist/conf/type/__rvm/man.text
View File

@ -16,7 +16,7 @@ RVM is the Ruby enVironment Manager for the Ruby programming language.
REQUIRED PARAMETERS REQUIRED PARAMETERS
------------------- -------------------
state:: state::
Either "present" or "absent". Either "present" or "absent", defaults to "present".
EXAMPLES EXAMPLES

1
cdist/conf/type/__rvm/parameter/default/state Normal file
View File

@ -0,0 +1 @@
present

0
cdist/conf/type/__pf_ruleset/parameter/required → cdist/conf/type/__rvm/parameter/optional
View File

2
cdist/conf/type/__rvm_gemset/man.text
View File

@ -18,7 +18,7 @@ REQUIRED PARAMETERS
user:: user::
The remote user account to use The remote user account to use
state:: state::
Either "present" or "absent". Either "present" or "absent", defaults to "present".
BOOLEAN PARAMETERS BOOLEAN PARAMETERS
------------------- -------------------

1
cdist/conf/type/__rvm_gemset/parameter/default/state Normal file
View File

@ -0,0 +1 @@
present

0
cdist/conf/type/__rvm/parameter/required → cdist/conf/type/__rvm_gemset/parameter/optional
View File

1
cdist/conf/type/__rvm_gemset/parameter/required
View File

@ -1,2 +1 @@
state
user user

2
cdist/conf/type/__rvm_ruby/man.text
View File

@ -18,7 +18,7 @@ REQUIRED PARAMETERS
user:: user::
The remote user account to use The remote user account to use
state:: state::
Either "present" or "absent". Either "present" or "absent", defaults to "present".
BOOLEAN PARAMETERS BOOLEAN PARAMETERS
------------------ ------------------

1
cdist/conf/type/__rvm_ruby/parameter/default/state Normal file
View File

@ -0,0 +1 @@
present

1
cdist/conf/type/__rvm_ruby/parameter/optional Normal file
View File

@ -0,0 +1 @@
state

1
cdist/conf/type/__rvm_ruby/parameter/required
View File

@ -1,2 +1 @@
state
user user