tom/cdist
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'bugfix_state_params' of git://github.com/dheule/cdist

Browse source
This commit is contained in:
Nico Schottelius 2014-02-12 17:04:30 +01:00
commit 2ceced593b
26 changed files with 20 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cdist/conf/type/__jail/man.text
View file

@ -16,7 +16,7 @@ This type is used on FreeBSD to manage jails.
REQUIRED PARAMETERS REQUIRED PARAMETERS
------------------- -------------------
state:: state::
Either "present" or "absent." Either "present" or "absent", defaults to "present".
jailbase:: jailbase::
The location of the .tgz archive containing the base fs for your jails. The location of the .tgz archive containing the base fs for your jails.

1
cdist/conf/type/__jail/parameter/default/state Normal file
View file

@ -0,0 +1 @@
present

1
cdist/conf/type/__jail/parameter/optional
View file

@ -5,3 +5,4 @@ interface
devfs-ruleset devfs-ruleset
jaildir jaildir
jailbase jailbase
state

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/__jail/parameter/required → cdist/conf/type/__rvm/parameter/optional
View file

2
cdist/conf/type/__rvm_gem/man.text
View file

@ -20,7 +20,7 @@ user::
gemset:: gemset::
The gemset to use The gemset to use
state:: state::
Either "present" or "absent" Either "present" or "absent", defaults to "present".
OPTIONAL PARAMETERS OPTIONAL PARAMETERS
------------------- -------------------

1
cdist/conf/type/__rvm_gem/parameter/default/state Normal file
View file

@ -0,0 +1 @@
present

1
cdist/conf/type/__rvm_gem/parameter/optional
View file

@ -1 +1,2 @@
default default
state

1
cdist/conf/type/__rvm_gem/parameter/required
View file

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

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/__pf_ruleset/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

0
cdist/conf/type/__rvm/parameter/required → cdist/conf/type/__rvm_ruby/parameter/optional
View file

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

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