From 49c686319ed9fdb4e6eddcc489a4a59aee8a2b52 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Thu, 10 Oct 2013 09:51:26 +0900 Subject: [PATCH] add more exapmles to cdist-manifest Signed-off-by: Nico Schottelius --- cdist/conf/type/__package_apt/gencode-remote | 2 +- docs/changelog | 1 + docs/man/man7/cdist-manifest.text | 11 +++++++++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/cdist/conf/type/__package_apt/gencode-remote b/cdist/conf/type/__package_apt/gencode-remote index 2ba8320b..7aba76d5 100755 --- a/cdist/conf/type/__package_apt/gencode-remote +++ b/cdist/conf/type/__package_apt/gencode-remote @@ -42,7 +42,7 @@ case "$state_is" in ;; esac -aptget="DEBIAN_FRONTEND=noninteractive apt-get --quiet --yes --no-install-recommends" +aptget="DEBIAN_FRONTEND=noninteractive apt-get --quiet --yes --no-install-recommends -o DPkg::Options::=\"--force-confold\"" [ "$state_is" = "$state_should" ] && exit 0 diff --git a/docs/changelog b/docs/changelog index d9be8b62..bead7001 100644 --- a/docs/changelog +++ b/docs/changelog @@ -6,6 +6,7 @@ Changelog 2.3.5: * Documentation: Updated manpages of __package and __file (Alex Greif) + * Type __package_apt: Do not install recommends by default 2.3.4: 2013-10-03 * Core: Add missing bits to support dry run (Steven Armstrong) diff --git a/docs/man/man7/cdist-manifest.text b/docs/man/man7/cdist-manifest.text index cc6fad42..92d0b897 100644 --- a/docs/man/man7/cdist-manifest.text +++ b/docs/man/man7/cdist-manifest.text @@ -151,6 +151,17 @@ The manifest of the type "nologin" may look like this: __file /etc/nologin --source "$__type/files/default.nologin" -------------------------------------------------------------------------------- +This example makes use of dependencies: + +-------------------------------------------------------------------------------- +# Ensure that lighttpd is installed +__package lighttpd --state present +# Ensure that munin makes use of lighttpd instead of the default webserver +# package as decided by the package manager +require="__package/lighttpd" __package munin --state present +-------------------------------------------------------------------------------- + + SEE ALSO --------