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

Merge branch '__package_state_fix' of https://github.com/jdguffey/cdist

Browse source
This commit is contained in:
Nico Schottelius 2012-10-07 18:48:07 +02:00
commit 6eced94035
43 changed files with 113 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

8
conf/type/__package/man.text
View file

@ -16,9 +16,7 @@ It dispatches the actual work to the package system dependant types.
REQUIRED PARAMETERS
-------------------
state::
The state the package should be in, either "present" or "absent"
(the old values "installed" or "removed" will be removed in cdist 2.1).
None
OPTIONAL PARAMETERS
@ -35,6 +33,10 @@ type::
e.g. __package_apt for Debian
__package_emerge for Gentoo
state::
The state the package should be in, either "present" or "absent"
(the old values "installed" or "removed" will be removed in cdist 2.1).
EXAMPLES
--------

1
conf/type/__package/parameter/optional
View file

@ -2,3 +2,4 @@ name
version
type
pkgsite
state

1
conf/type/__package/parameter/required
View file

@ -1 +0,0 @@
state

6
conf/type/__package_apt/gencode-remote
View file

@ -27,7 +27,11 @@ else
name="$__object_id"
fi
state_should="$(cat "$__object/parameter/state")"
if [ -f "$__object/parameter/state" ]; then
state_should="$(cat "$__object/parameter/state")"
else
state_should="present"
fi
# Correct pre 2.1 naming - FIXME in 2.1
case "$state_should" in

8
conf/type/__package_apt/man.text
View file

@ -16,9 +16,7 @@ manage packages.
REQUIRED PARAMETERS
-------------------
state::
The state the package should be in, either "present" or "absent"
(the old values "installed" or "removed" will be removed in cdist 2.1).
None
OPTIONAL PARAMETERS
@ -26,6 +24,10 @@ OPTIONAL PARAMETERS
name::
If supplied, use the name and not the object id as the package name.
state::
The state the package should be in, either "present" or "absent"
(the old values "installed" or "removed" will be removed in cdist 2.1).
EXAMPLES
--------

1
conf/type/__package_apt/parameter/optional
View file

@ -1,2 +1,3 @@
name
version
state

1
conf/type/__package_apt/parameter/required
View file

@ -1 +0,0 @@
state

6
conf/type/__package_luarocks/gencode-remote
View file

@ -29,7 +29,11 @@ else
name="$__object_id"
fi
state_should="$(cat "$__object/parameter/state")"
if [ -f "$__object/parameter/state" ]; then
state_should="$(cat "$__object/parameter/state")"
else
state_should="present"
fi
# Correct pre 2.1 naming - FIXME in 2.1
case "$state_should" in
installed)

8
conf/type/__package_luarocks/man.text
View file

@ -15,9 +15,7 @@ LuaRocks is a deployment and management system for Lua modules.
REQUIRED PARAMETERS
-------------------
state::
The state the package should be in, either "present" or "absent"
(the old values "installed" or "removed" will be removed in cdist 2.1).
None
OPTIONAL PARAMETERS
@ -25,6 +23,10 @@ OPTIONAL PARAMETERS
name::
If supplied, use the name and not the object id as the package name.
state::
The state the package should be in, either "present" or "absent"
(the old values "installed" or "removed" will be removed in cdist 2.1).
EXAMPLES
--------

1
conf/type/__package_luarocks/parameter/optional
View file

@ -1 +1,2 @@
name
state

1
conf/type/__package_luarocks/parameter/required
View file

@ -1 +0,0 @@
state

7
conf/type/__package_opkg/gencode-remote
View file

@ -28,7 +28,12 @@ else
name="$__object_id"
fi
state_should="$(cat "$__object/parameter/state")"
if [ -f "$__object/parameter/state" ]; then
state_should="$(cat "$__object/parameter/state")"
else
state_should="present"
fi
state_is="$(cat "$__object/explorer/pkg_status")"
case "$state_is" in
absent*)

6
conf/type/__package_opkg/man.text
View file

@ -15,8 +15,7 @@ opkg is usually used on OpenWRT to manage packages.
REQUIRED PARAMETERS
-------------------
state::
The state the package should be in, either "present" or "absent"
None
OPTIONAL PARAMETERS
@ -24,6 +23,9 @@ OPTIONAL PARAMETERS
name::
If supplied, use the name and not the object id as the package name.
state::
The state the package should be in, either "present" or "absent"
EXAMPLES
--------

1
conf/type/__package_opkg/parameter/optional
View file

@ -1 +1,2 @@
name
state

1
conf/type/__package_opkg/parameter/required
View file

@ -1 +0,0 @@
state

6
conf/type/__package_pacman/gencode-remote
View file

@ -31,7 +31,11 @@ else
name="$__object_id"
fi
state_should="$(cat "$__object/parameter/state")"
if [ -f "$__object/parameter/state" ]; then
state_should="$(cat "$__object/parameter/state")"
else
state_should="present"
fi
case "$state_should" in
installed)
echo "WARNING: ${__object_name}: $state_should is deprecated and will be removed in cdist 2.1. Please change to present/absent." >&2

8
conf/type/__package_pacman/man.text
View file

@ -16,9 +16,7 @@ packages.
REQUIRED PARAMETERS
-------------------
state::
The state the package should be in, either "present" or "absent"
(the old values "installed" or "removed" will be removed in cdist 2.1).
None
OPTIONAL PARAMETERS
@ -26,6 +24,10 @@ OPTIONAL PARAMETERS
name::
If supplied, use the name and not the object id as the package name.
state::
The state the package should be in, either "present" or "absent"
(the old values "installed" or "removed" will be removed in cdist 2.1).
EXAMPLES
--------

1
conf/type/__package_pacman/parameter/optional
View file

@ -1 +1,2 @@
name
state

1
conf/type/__package_pacman/parameter/required
View file

@ -1 +0,0 @@
state

6
conf/type/__package_pip/gencode-remote
View file

@ -22,7 +22,11 @@
#
state_is=$(cat "$__object/explorer/state")
state_should=$(cat "$__object/parameter/state")
if [ -f "$__object/parameter/state" ]; then
state_should="$(cat "$__object/parameter/state")"
else
state_should="present"
fi
[ "$state_is" = "$state_should" ] && exit 0

6
conf/type/__package_pip/man.text
View file

@ -16,8 +16,7 @@ It is also included in the python virtualenv environment.
REQUIRED PARAMETERS
-------------------
state::
Either "present" or "absent".
None
OPTIONAL PARAMETERS
@ -28,6 +27,9 @@ name::
pip::
Instead of using pip from PATH, use the specific pip path.
state::
Either "present" or "absent".
EXAMPLES
--------

1
conf/type/__package_pip/parameter/optional
View file

@ -1 +1,2 @@
pip
state

1
conf/type/__package_pip/parameter/required
View file

@ -1 +0,0 @@
state

6
conf/type/__package_pkg_freebsd/gencode-remote
View file

@ -63,7 +63,11 @@ if [ -f "$__object/parameter/pkgsite" ]; then
pkgsite="$(cat "$__object/parameter/pkgsite")"
fi
state="$(cat "$__object/parameter/state")"
if [ -f "$__object/parameter/state" ]; then
state="$(cat "$__object/parameter/state")"
else
state="present"
fi
curr_version="$(cat "$__object/explorer/pkg_version")"
add_cmd="pkg_add"
rm_cmd="pkg_delete"

6
conf/type/__package_pkg_freebsd/man.text
View file

@ -15,8 +15,7 @@ This type is usually used on FreeBSD to manage packages.
REQUIRED PARAMETERS
-------------------
state::
Either "present" or "absent".
None
OPTIONAL PARAMETERS
@ -33,6 +32,9 @@ version::
pkgsite::
If supplied, use to install from a specific package repository.
state::
Either "present" or "absent".
EXAMPLES
--------

1
conf/type/__package_pkg_freebsd/parameter/optional
View file

@ -2,3 +2,4 @@ name
flavor
version
pkgsite
state

1
conf/type/__package_pkg_freebsd/parameter/required
View file

@ -1 +0,0 @@
state

6
conf/type/__package_pkg_openbsd/gencode-remote
View file

@ -42,7 +42,11 @@ else
name="$__object_id"
fi
state_should="$(cat "$__object/parameter/state")"
if [ -f "$__object/parameter/state" ]; then
state_should="$(cat "$__object/parameter/state")"
else
state_should="present"
fi
# Correct pre 2.1 naming - FIXME in 2.1
case "$state_should" in
installed)

8
conf/type/__package_pkg_openbsd/man.text
View file

@ -15,9 +15,7 @@ This type is usually used on OpenBSD to manage packages.
REQUIRED PARAMETERS
-------------------
state::
The state the package should be in, either "present" or "absent"
(the old values "installed" or "removed" will be removed in cdist 2.1).
None
OPTIONAL PARAMETERS
@ -28,6 +26,10 @@ name::
flavor::
If supplied, use to avoid ambiguity.
state::
The state the package should be in, either "present" or "absent"
(the old values "installed" or "removed" will be removed in cdist 2.1).
EXAMPLES
--------

1
conf/type/__package_pkg_openbsd/parameter/optional
View file

@ -1,2 +1,3 @@
name
flavor
state

1
conf/type/__package_pkg_openbsd/parameter/required
View file

@ -1 +0,0 @@
state

6
conf/type/__package_rubygem/gencode-remote
View file

@ -27,7 +27,11 @@ else
name="$__object_id"
fi
state_should="$(cat "$__object/parameter/state")"
if [ -f "$__object/parameter/state" ]; then
state_should="$(cat "$__object/parameter/state")"
else
state_should="present"
fi
# Correct pre 2.1 naming - FIXME in 2.1
case "$state_should" in
installed)

8
conf/type/__package_rubygem/man.text
View file

@ -15,9 +15,7 @@ Rubygems is the default package management system for the Ruby programming langu
REQUIRED PARAMETERS
-------------------
state::
The state the package should be in, either "present" or "absent"
(the old values "installed" or "removed" will be removed in cdist 2.1).
None
OPTIONAL PARAMETERS
@ -25,6 +23,10 @@ OPTIONAL PARAMETERS
name::
If supplied, use the name and not the object id as the package name.
state::
The state the package should be in, either "present" or "absent"
(the old values "installed" or "removed" will be removed in cdist 2.1).
EXAMPLES
--------

1
conf/type/__package_rubygem/parameter/optional
View file

@ -1 +1,2 @@
name
state

1
conf/type/__package_rubygem/parameter/required
View file

@ -1 +0,0 @@
state

6
conf/type/__package_yum/gencode-remote
View file

@ -27,7 +27,11 @@ else
name="$__object_id"
fi
state_should="$(cat "$__object/parameter/state")"
if [ -f "$__object/parameter/state" ]; then
state_should="$(cat "$__object/parameter/state")"
else
state_should="present"
fi
case "$state_should" in
installed)
echo "WARNING: ${__object_name}: $state_should is deprecated and will be removed in cdist 2.1. Please change to present/absent." >&2

8
conf/type/__package_yum/man.text
View file

@ -17,9 +17,7 @@ slightly confusing error message "Error: Nothing to do".
REQUIRED PARAMETERS
-------------------
state::
The state the package should be in, either "present" or "absent"
(the old values "installed" or "removed" will be removed in cdist 2.1).
None
OPTIONAL PARAMETERS
@ -27,6 +25,10 @@ OPTIONAL PARAMETERS
name::
If supplied, use the name and not the object id as the package name.
state::
The state the package should be in, either "present" or "absent"
(the old values "installed" or "removed" will be removed in cdist 2.1).
EXAMPLES
--------

1
conf/type/__package_yum/parameter/optional
View file

@ -1 +1,2 @@
name
state

1
conf/type/__package_yum/parameter/required
View file

@ -1 +0,0 @@
state

6
conf/type/__package_zypper/gencode-remote
View file

@ -33,7 +33,11 @@ else
name="$__object_id"
fi
state_should="$(cat "$__object/parameter/state")"
if [ -f "$__object/parameter/state" ]; then
state_should="$(cat "$__object/parameter/state")"
else
state_should="present"
fi
# Exit if nothing is needed to be done
[ "$state_is" = "$state_should" ] && exit 0

6
conf/type/__package_zypper/man.text
View file

@ -15,8 +15,7 @@ Zypper is usually used on the SuSE distribution to manage packages.
REQUIRED PARAMETERS
-------------------
state::
The state the package should be in, either "present" or "absent"
None
OPTIONAL PARAMETERS
@ -24,6 +23,9 @@ OPTIONAL PARAMETERS
name::
If supplied, use the name and not the object id as the package name.
state::
The state the package should be in, either "present" or "absent"
EXAMPLES
--------

1
conf/type/__package_zypper/parameter/optional
View file

@ -1 +1,2 @@
name
state

1
conf/type/__package_zypper/parameter/required
View file

@ -1 +0,0 @@
state