Merge branch '__postgres_role-changes' of https://github.com/nuex/cdist

cdist/conf/type/__postgres_role/gencode-remote

@@ -20,14 +20,15 @@
 
 name="$__object_id"
 state_is="$(cat "$__object/explorer/state")"
-state_should="$(cat "$__object/parameter/state")"
+state_should="present"
+[ -f "$__object/parameter/state" ] && state_should="$(cat "$__object/parameter/state")"
 
 [ "$state_is" = "$state_should" ] && exit 0
 
 case "$state_should" in
     present)
         if [ -f "$__object/parameter/password" ]; then
-            password="$(cat "$__object/parameter/$parameter")"
+            password="$(cat "$__object/parameter/password")"
         fi
         booleans=""
         for boolean in login createdb createrole superuser; do

cdist/conf/type/__postgres_role/man.text

@@ -13,15 +13,12 @@ DESCRIPTION
 This cdist type allows you to create or drop postgres roles.
 
 
-REQUIRED PARAMETERS
+OPTIONAL PARAMETERS
 -------------------
 state::
     Either "present" or "absent", defaults to "present"
 
-
-OPTIONAL PARAMETERS
--------------------
-All parameter map directly to the corresponding postgres createrole
+All other parameters map directly to the corresponding postgres createrole
 parameters.
 
 password::
@@ -41,13 +38,13 @@ EXAMPLES
 --------
 
 --------------------------------------------------------------------------------
-__postgres_role myrole --state present
+__postgres_role myrole
 
-__postgres_role myrole --state present --password 'secret'
+__postgres_role myrole --password 'secret'
 
-__postgres_role admin --state present --password 'very-secret' --superuser
+__postgres_role admin --password 'very-secret' --superuser
 
-__postgres_role dbcustomer --state present --password 'bla' --createdb
+__postgres_role dbcustomer --password 'bla' --createdb
 --------------------------------------------------------------------------------
 
 

cdist/conf/type/__postgres_role/parameter/optional

@@ -1 +1,2 @@
+state
 password

cdist/conf/type/__postgres_role/parameter/required

@@ -1 +0,0 @@
-state