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

2014-02-12 17:04:30 +01:00 · 2014-02-12 17:04:30 +01:00 · 2ceced593b
commit 2ceced593b
parent a4376b4d74 f3172fda95
26 changed files with 20 additions and 14 deletions
--- a/cdist/conf/type/__jail/man.text
+++ b/cdist/conf/type/__jail/man.text
@ -16,7 +16,7 @@ This type is used on FreeBSD to manage jails.
 REQUIRED PARAMETERS
 -------------------
 state::
-   Either "present" or "absent."
+   Either "present" or "absent", defaults to "present".

 jailbase::
   The location of the .tgz archive containing the base fs for your jails.
--- a/cdist/conf/type/__jail/parameter/default/state
+++ b/cdist/conf/type/__jail/parameter/default/state
@ -0,0 +1 @@
+present
--- a/cdist/conf/type/__jail/parameter/optional
+++ b/cdist/conf/type/__jail/parameter/optional
@ -5,3 +5,4 @@ interface
 devfs-ruleset
 jaildir
 jailbase
+state
--- a/cdist/conf/type/__pf_ruleset/man.text
+++ b/cdist/conf/type/__pf_ruleset/man.text
@ -16,7 +16,7 @@ This type is used on *BSD systems to manage the pf firewall's ruleset.
 REQUIRED PARAMETERS
 -------------------
 state::
-   Either "absent" (no ruleset at all) or "present"
+   Either "absent" (no ruleset at all) or "present", defaults to "present".


 OPTIONAL PARAMETERS
--- a/cdist/conf/type/__pf_ruleset/parameter/default/state
+++ b/cdist/conf/type/__pf_ruleset/parameter/default/state
@ -0,0 +1 @@
+present
--- a/cdist/conf/type/__pf_ruleset/parameter/optional
+++ b/cdist/conf/type/__pf_ruleset/parameter/optional
@ -1 +1,2 @@
 source
+state
--- a/cdist/conf/type/__postgres_database/gencode-remote
+++ b/cdist/conf/type/__postgres_database/gencode-remote
@ -19,8 +19,7 @@
 #

 name="$__object_id"
-state_should="present"
-[ -f "$__object/parameter/state" ] && state_should="$(cat "$__object/parameter/state")"
+state_should="$(cat "$__object/parameter/state")"
 state_is="$(cat "$__object/explorer/state")"

 if [ "$state_should" != "$state_is" ]; then
--- a/cdist/conf/type/__postgres_database/man.text
+++ b/cdist/conf/type/__postgres_database/man.text
@ -16,7 +16,7 @@ This cdist type allows you to create or drop postgres databases.
 OPTIONAL PARAMETERS
 -------------------
 state::
-   either 'present' or 'absent'
+   either 'present' or 'absent', defaults to 'present'.

 owner::
   the role owning this database
--- a/cdist/conf/type/__postgres_database/parameter/default/state
+++ b/cdist/conf/type/__postgres_database/parameter/default/state
@ -0,0 +1 @@
+present
--- a/cdist/conf/type/__postgres_role/gencode-remote
+++ b/cdist/conf/type/__postgres_role/gencode-remote
@ -20,8 +20,7 @@

 name="$__object_id"
 state_is="$(cat "$__object/explorer/state")"
-state_should="present"
-[ -f "$__object/parameter/state" ] && state_should="$(cat "$__object/parameter/state")"
+state_should="$(cat "$__object/parameter/state")"

 [ "$state_is" = "$state_should" ] && exit 0

--- a/cdist/conf/type/__postgres_role/parameter/default/state
+++ b/cdist/conf/type/__postgres_role/parameter/default/state
@ -0,0 +1 @@
+present
--- a/cdist/conf/type/__rvm/man.text
+++ b/cdist/conf/type/__rvm/man.text
@ -16,7 +16,7 @@ RVM is the Ruby enVironment Manager for the Ruby programming language.
 REQUIRED PARAMETERS
 -------------------
 state::
-    Either "present" or "absent".
+    Either "present" or "absent", defaults to "present".


 EXAMPLES
--- a/cdist/conf/type/__rvm/parameter/default/state
+++ b/cdist/conf/type/__rvm/parameter/default/state
@ -0,0 +1 @@
+present
--- a/cdist/conf/type/jail/parameter/required
+++ b/cdist/conf/type/jail/parameter/required
--- a/cdist/conf/type/__rvm_gem/man.text
+++ b/cdist/conf/type/__rvm_gem/man.text
@ -20,7 +20,7 @@ user::
 gemset::
    The gemset to use
 state::
-    Either "present" or "absent"
+    Either "present" or "absent", defaults to "present".

 OPTIONAL PARAMETERS
 -------------------
--- a/cdist/conf/type/__rvm_gem/parameter/default/state
+++ b/cdist/conf/type/__rvm_gem/parameter/default/state
@ -0,0 +1 @@
+present
--- a/cdist/conf/type/__rvm_gem/parameter/optional
+++ b/cdist/conf/type/__rvm_gem/parameter/optional
@ -1 +1,2 @@
 default
+state
--- a/cdist/conf/type/__rvm_gem/parameter/required
+++ b/cdist/conf/type/__rvm_gem/parameter/required
@ -1,3 +1,2 @@
-state
 gemset
 user
--- a/cdist/conf/type/__rvm_gemset/man.text
+++ b/cdist/conf/type/__rvm_gemset/man.text
@ -18,7 +18,7 @@ REQUIRED PARAMETERS
 user::
    The remote user account to use
 state::
-    Either "present" or "absent".
+    Either "present" or "absent", defaults to "present".

 BOOLEAN PARAMETERS
 -------------------
--- a/cdist/conf/type/__rvm_gemset/parameter/default/state
+++ b/cdist/conf/type/__rvm_gemset/parameter/default/state
@ -0,0 +1 @@
+present
--- a/cdist/conf/type/__rvm_gemset/parameter/optional
+++ b/cdist/conf/type/__rvm_gemset/parameter/optional
--- a/cdist/conf/type/__rvm_gemset/parameter/required
+++ b/cdist/conf/type/__rvm_gemset/parameter/required
@ -1,2 +1 @@
-state
 user
--- a/cdist/conf/type/__rvm_ruby/man.text
+++ b/cdist/conf/type/__rvm_ruby/man.text
@ -18,7 +18,7 @@ REQUIRED PARAMETERS
 user::
    The remote user account to use
 state::
-    Either "present" or "absent".
+    Either "present" or "absent", defaults to "present".

 BOOLEAN PARAMETERS
 ------------------
--- a/cdist/conf/type/__rvm_ruby/parameter/default/state
+++ b/cdist/conf/type/__rvm_ruby/parameter/default/state
@ -0,0 +1 @@
+present
--- a/cdist/conf/type/rvm_ruby/parameter/optional
+++ b/cdist/conf/type/rvm_ruby/parameter/optional
--- a/cdist/conf/type/__rvm_ruby/parameter/required
+++ b/cdist/conf/type/__rvm_ruby/parameter/required
@ -1,2 +1 @@
-state
 user