Merge branch 'master' into __cron-simplify

This commit is contained in:
Nico Schottelius 2013-06-19 11:20:25 +02:00
commit fb40ba4d0f
5 changed files with 9 additions and 6 deletions

View file

@ -25,7 +25,12 @@ else
name="$__object_id"
fi
state_should="$(cat "$__object/parameter/state")"
parameter_state="$__object/parameter/state"
if [ -f "$_parameter_state" ]; then
state_should=(cat "$__object/parameter/state")
else
state_should="present"
fi
runs="$(cat "$__object/explorer/runs")"
if [ "$runs" ]; then

View file

@ -13,14 +13,11 @@ DESCRIPTION
This cdist type allows you to define the state of a process.
REQUIRED PARAMETERS
OPTIONAL PARAMETERS
-------------------
state::
Either "present" or "absent", defaults to "present"
OPTIONAL PARAMETERS
-------------------
name::
Process name to match on when using pgrep -f -x.

View file

@ -1,3 +1,4 @@
name
stop
start
state

View file

@ -1 +0,0 @@
state

View file

@ -14,6 +14,7 @@ next:
* Type __git: Missing quotes added (Chase James)
* Type __postgres_database: Make state parameter optional (Chase James)
* Type __postgres_role: Make state parameter optional, fix password bug (Chase James)
* Type __process: Make state parameter optional
2.1.1: 2013-04-08
* Core: Use dynamic dependency resolver to allow indirect self dependencies