Browse Source

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

3.0
Nico Schottelius 9 years ago
parent
commit
4264237bfe
  1. 15
      cdist/conf/type/__git/gencode-remote
  2. 3
      cdist/conf/type/__git/manifest
  3. 1
      cdist/conf/type/__git/parameter/default/branch
  4. 1
      cdist/conf/type/__git/parameter/default/group
  5. 1
      cdist/conf/type/__git/parameter/default/mode
  6. 1
      cdist/conf/type/__git/parameter/default/owner
  7. 1
      cdist/conf/type/__git/parameter/default/state
  8. 12
      cdist/conf/type/__jail/gencode-local
  9. 13
      cdist/conf/type/__jail/gencode-remote
  10. 6
      cdist/conf/type/__jail/manifest
  11. 1
      cdist/conf/type/__jail/parameter/default/devfs-ruleset
  12. 1
      cdist/conf/type/__jail/parameter/default/jailbase
  13. 1
      cdist/conf/type/__jail/parameter/default/jaildir
  14. 6
      cdist/conf/type/__package_yum/gencode-remote
  15. 1
      cdist/conf/type/__package_yum/parameter/default/state
  16. 13
      cdist/conf/type/__package_zypper/gencode-remote
  17. 1
      cdist/conf/type/__package_zypper/parameter/default/state
  18. 2
      cdist/conf/type/__user_groups/gencode-remote
  19. 1
      cdist/conf/type/__user_groups/parameter/default/state

15
cdist/conf/type/__git/gencode-remote vendored

@ -23,22 +23,17 @@ state_is="$(cat "$__object/explorer/state")"
owner_is="$(cat "$__object/explorer/owner")"
group_is="$(cat "$__object/explorer/group")"
state_should=present
[ -f "$__object/parameter/state" ] && state_should="$(cat "$__object/parameter/state")"
state_should="$(cat "$__object/parameter/state")"
branch=master
[ -f "$__object/parameter/branch" ] && branch="$(cat "$__object/parameter/branch")"
branch="$(cat "$__object/parameter/branch")"
source="$(cat "$__object/parameter/source")"
destination="/$__object_id"
owner=""
[ -f "$__object/parameter/owner" ] && owner="$(cat "$__object/parameter/owner")"
group=""
[ -f "$__object/parameter/group" ] && group="$(cat "$__object/parameter/group")"
mode=""
[ -f "$__object/parameter/mode" ] && mode="$(cat "$__object/parameter/mode")"
owner="$(cat "$__object/parameter/owner")"
group="$(cat "$__object/parameter/group")"
mode="$(cat "$__object/parameter/mode")"
[ "$state_should" = "$state_is" -a \
"$owner" = "$owner_is" -a \

3
cdist/conf/type/__git/manifest vendored

@ -23,8 +23,7 @@
__package git --state present
state_should=present
[ -f "$__object/parameter/state" ] && state_should="$(cat "$__object/parameter/state")"
state_should="$(cat "$__object/parameter/state")"
# Let __directory handle removal of git repos

1
cdist/conf/type/__git/parameter/default/branch vendored

@ -0,0 +1 @@
master

1
cdist/conf/type/__git/parameter/default/group vendored

@ -0,0 +1 @@

1
cdist/conf/type/__git/parameter/default/mode vendored

@ -0,0 +1 @@

1
cdist/conf/type/__git/parameter/default/owner vendored

@ -0,0 +1 @@

1
cdist/conf/type/__git/parameter/default/state vendored

@ -0,0 +1 @@
present

12
cdist/conf/type/__jail/gencode-local vendored

@ -22,17 +22,9 @@
# virtual machines.
#
if [ -f "$__object/parameter/jaildir" ]; then
jaildir="$(cat "$__object/parameter/jaildir")"
else
jaildir="/usr/jail"
fi
jaildir="$(cat "$__object/parameter/jaildir")"
if [ -f "$__object/parameter/jailbase" ]; then
jailbase="$(cat "$__object/parameter/jailbase")"
else
jailbase=""
fi
jailbase="$(cat "$__object/parameter/jailbase")"
state="$(cat "$__object/parameter/state")"

13
cdist/conf/type/__jail/gencode-remote vendored

@ -66,11 +66,7 @@ else
devfsenable="true"
fi
if [ -f "$__object/parameter/devfs-ruleset" ]; then
devfsruleset="$(cat "$__object/parameter/devfs-ruleset")"
else
devfsruleset="jailrules"
fi
devfsruleset="$(cat "$__object/parameter/devfs-ruleset")"
# devfs_ruleset being defined without devfs_enable being true
# is pointless. Treat this as an error.
@ -84,14 +80,11 @@ if [ -f "$__object/parameter/onboot" ]; then
onboot="true"
fi
if [ -f "$__object/parameter/jaildir" ]; then
jaildir="$(cat "$__object/parameter/jaildir")"
else
jaildir="/usr/jail"
fi
jaildir="$(cat "$__object/parameter/jaildir")"
present="$(cat "$__object/explorer/present")"
status="$(cat "$__object/explorer/status")"
# Handle ip="iface|addr, iface|addr" format
if [ $(expr "${ip}" : ".*|.*") -gt "0" ]; then
# If we have multiple IPs defined, $interface doesn't make sense because ip="iface|addr, iface|addr" implies it

6
cdist/conf/type/__jail/manifest vendored

@ -33,11 +33,7 @@ if [ ! "$os" = "freebsd" ]; then
exit 1
fi
if [ -f "$__object/parameter/jaildir" ]; then
jaildir="$(cat "$__object/parameter/jaildir")"
else
jaildir="/usr/jail"
fi
jaildir="$(cat "$__object/parameter/jaildir")"
__directory ${jaildir} --parents

1
cdist/conf/type/__jail/parameter/default/devfs-ruleset vendored

@ -0,0 +1 @@
jailrules

1
cdist/conf/type/__jail/parameter/default/jailbase vendored

@ -0,0 +1 @@

1
cdist/conf/type/__jail/parameter/default/jaildir vendored

@ -0,0 +1 @@
/usr/jail

6
cdist/conf/type/__package_yum/gencode-remote vendored

@ -27,11 +27,7 @@ else
name="$__object_id"
fi
if [ -f "$__object/parameter/state" ]; then
state_should="$(cat "$__object/parameter/state")"
else
state_should="present"
fi
state_should="$(cat "$__object/parameter/state")"
if grep -q -E "(centos|redhat|amazon)" "$__global/explorer/os"; then
opts="-y --quiet"

1
cdist/conf/type/__package_yum/parameter/default/state vendored

@ -0,0 +1 @@
present

13
cdist/conf/type/__package_zypper/gencode-remote vendored

@ -34,17 +34,8 @@ else
name="$__object_id"
fi
if [ -f "$__object/parameter/state" ]; then
state_should="$(cat "$__object/parameter/state")"
else
state_should="present"
fi
if [ -f "$__object/parameter/ptype" ]; then
ptype="$(cat "$__object/parameter/ptype")"
else
ptype="package"
fi
state_should="$(cat "$__object/parameter/state")"
ptype="$(cat "$__object/parameter/ptype")"
if [ -f "$__object/parameter/version" ]; then
version_should="$(cat "$__object/parameter/version")"

1
cdist/conf/type/__package_zypper/parameter/default/state vendored

@ -0,0 +1 @@
present

2
cdist/conf/type/__user_groups/gencode-remote vendored

@ -19,7 +19,7 @@
#
user="$(cat "$__object/parameter/user" 2>/dev/null || echo "$__object_id")"
state_should="$(cat "$__object/parameter/state" 2>/dev/null || echo "present")"
state_should="$(cat "$__object/parameter/state")"
mkdir "$__object/files"
# file has to be sorted for comparison with `comm`

1
cdist/conf/type/__user_groups/parameter/default/state vendored

@ -0,0 +1 @@
present
Loading…
Cancel
Save