From 82bcc83d4164c5e83b5ccde75d74637bceca0887 Mon Sep 17 00:00:00 2001 From: Tomas Pospisek Date: Mon, 18 Aug 2014 19:09:19 +0200 Subject: [PATCH 01/14] add new __package_dpkg type --- cdist/conf/type/__package_dpkg/gencode-local | 57 +++++++++++++++++++ cdist/conf/type/__package_dpkg/man.text | 47 +++++++++++++++ .../type/__package_dpkg/parameter/required | 1 + cdist/conf/type/__package_dpkg/singleton | 0 4 files changed, 105 insertions(+) create mode 100755 cdist/conf/type/__package_dpkg/gencode-local create mode 100644 cdist/conf/type/__package_dpkg/man.text create mode 100644 cdist/conf/type/__package_dpkg/parameter/required create mode 100644 cdist/conf/type/__package_dpkg/singleton diff --git a/cdist/conf/type/__package_dpkg/gencode-local b/cdist/conf/type/__package_dpkg/gencode-local new file mode 100755 index 00000000..9704c46c --- /dev/null +++ b/cdist/conf/type/__package_dpkg/gencode-local @@ -0,0 +1,57 @@ +#!/bin/sh +# +# 2013 Tomas Pospisek (tpo_deb sourcepole.ch) +# +# This file is based on cdist's __file/gencode-local and part of cdist. +# +# cdist is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# cdist is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with cdist. If not, see . +# +# +# This __package_dpkg type does not check whether a *.deb package is +# allready installed. It just copies the *.deb package over to the +# destination and installs it. We could use __package_apt to check +# whether a *.deb package is allready installed and only install it +# if we're given a --force argument or similar (would be clever not +# to conflict with dpkg's --force options). But currently we don't +# do any checks or --force'ing. +# + +local_package_path=$( cat "$__object/parameter/install" ) +package=$( basename "$local_package_path" ) + +if [ ! -f "$local_package_path" ]; then + echo "Package \"$local_package_path\" does not exist." >&2 + exit 1 +fi + +# upload package to temp directory +temp_dir="cdist.XXXXXXXXXX" +cat << DONE +destination_dir="\$($__remote_exec $__target_host "mktemp -d $temp_dir")" +DONE + +cat << DONE +$__remote_copy $local_package_path ${__target_host}:\$destination_dir +DONE + +# install package +echo "3" >&2 +cat << DONE +$__remote_exec $__target_host "dpkg -i \"\$destination_dir/$package\"" +DONE + +# clean up: remove tmp_dir and contents on remote host +cat << DONE +$__remote_exec $__target_host "rm -rf \"\$destination_dir\"" +DONE diff --git a/cdist/conf/type/__package_dpkg/man.text b/cdist/conf/type/__package_dpkg/man.text new file mode 100644 index 00000000..e6a67e79 --- /dev/null +++ b/cdist/conf/type/__package_dpkg/man.text @@ -0,0 +1,47 @@ +cdist-type__package_dpkg(7) +========================== +Tomas Pospisek + + +NAME +---- +cdist-type__package_dpkg - Manage packages with dpkg + + +DESCRIPTION +----------- +dpkg is usually used on Debian and variants (like Ubuntu) to +install packages. + + +REQUIRED PARAMETERS +------------------- +install:: + Specifies the local path to the *.deb package to be installed + + +OPTIONAL PARAMETERS +------------------- +None + + +EXAMPLES +-------- + +-------------------------------------------------------------------------------- +# Install foo package +__package_dpkg --install /tmp/foo_0.1_all.deb +-------------------------------------------------------------------------------- + + +SEE ALSO +-------- +- cdist-type(7) +- cdist-type__package(7) + + +COPYING +------- +Copyright \(C) 2013 Tomas Pospisek. Free use of this software is +granted under the terms of the GNU General Public License version 3 (GPLv3). +This type is based on __package_apt diff --git a/cdist/conf/type/__package_dpkg/parameter/required b/cdist/conf/type/__package_dpkg/parameter/required new file mode 100644 index 00000000..7c32f559 --- /dev/null +++ b/cdist/conf/type/__package_dpkg/parameter/required @@ -0,0 +1 @@ +install diff --git a/cdist/conf/type/__package_dpkg/singleton b/cdist/conf/type/__package_dpkg/singleton new file mode 100644 index 00000000..e69de29b From d8af4d3ad5e53b8aac3b571aac969f36a63d2d6b Mon Sep 17 00:00:00 2001 From: Tomas Pospisek Date: Mon, 18 Aug 2014 19:11:28 +0200 Subject: [PATCH 02/14] fix email address --- cdist/conf/type/__package_dpkg/man.text | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cdist/conf/type/__package_dpkg/man.text b/cdist/conf/type/__package_dpkg/man.text index e6a67e79..6dc07c41 100644 --- a/cdist/conf/type/__package_dpkg/man.text +++ b/cdist/conf/type/__package_dpkg/man.text @@ -1,6 +1,6 @@ cdist-type__package_dpkg(7) ========================== -Tomas Pospisek +Tomas Pospisek NAME From 44941137d67d3a534b066bc4ddc93a466ca4e180 Mon Sep 17 00:00:00 2001 From: Tomas Pospisek Date: Wed, 10 Sep 2014 11:21:09 +0200 Subject: [PATCH 03/14] change implementation and API of __package_dpkg __package_dpkg wasn't working as intended - being a singleton meant that it could only install one package. Now we missuse /var/cache/apt/archives to copy our package into and `dpkg -i` from there --- .../{gencode-local => gencode-remote} | 29 +--------------- cdist/conf/type/__package_dpkg/man.text | 21 +++++------- cdist/conf/type/__package_dpkg/manifest | 34 +++++++++++++++++++ .../type/__package_dpkg/parameter/required | 2 +- cdist/conf/type/__package_dpkg/singleton | 0 5 files changed, 45 insertions(+), 41 deletions(-) rename cdist/conf/type/__package_dpkg/{gencode-local => gencode-remote} (62%) create mode 100644 cdist/conf/type/__package_dpkg/manifest delete mode 100644 cdist/conf/type/__package_dpkg/singleton diff --git a/cdist/conf/type/__package_dpkg/gencode-local b/cdist/conf/type/__package_dpkg/gencode-remote similarity index 62% rename from cdist/conf/type/__package_dpkg/gencode-local rename to cdist/conf/type/__package_dpkg/gencode-remote index 9704c46c..d4186e66 100755 --- a/cdist/conf/type/__package_dpkg/gencode-local +++ b/cdist/conf/type/__package_dpkg/gencode-remote @@ -27,31 +27,4 @@ # do any checks or --force'ing. # -local_package_path=$( cat "$__object/parameter/install" ) -package=$( basename "$local_package_path" ) - -if [ ! -f "$local_package_path" ]; then - echo "Package \"$local_package_path\" does not exist." >&2 - exit 1 -fi - -# upload package to temp directory -temp_dir="cdist.XXXXXXXXXX" -cat << DONE -destination_dir="\$($__remote_exec $__target_host "mktemp -d $temp_dir")" -DONE - -cat << DONE -$__remote_copy $local_package_path ${__target_host}:\$destination_dir -DONE - -# install package -echo "3" >&2 -cat << DONE -$__remote_exec $__target_host "dpkg -i \"\$destination_dir/$package\"" -DONE - -# clean up: remove tmp_dir and contents on remote host -cat << DONE -$__remote_exec $__target_host "rm -rf \"\$destination_dir\"" -DONE +echo "dpkg -i /var/cache/apt/archives/$__object_id" diff --git a/cdist/conf/type/__package_dpkg/man.text b/cdist/conf/type/__package_dpkg/man.text index 6dc07c41..ae98be99 100644 --- a/cdist/conf/type/__package_dpkg/man.text +++ b/cdist/conf/type/__package_dpkg/man.text @@ -10,27 +10,24 @@ cdist-type__package_dpkg - Manage packages with dpkg DESCRIPTION ----------- -dpkg is usually used on Debian and variants (like Ubuntu) to -install packages. +__package_dpkg is used on Debian and variants (like Ubuntu) to +install packages that are provided locally as *.deb files. + +The object given to __package_dpkg must be the name of the deb package. REQUIRED PARAMETERS ------------------- -install:: - Specifies the local path to the *.deb package to be installed - - -OPTIONAL PARAMETERS -------------------- -None - +source:: + path to the *.deb package EXAMPLES -------- -------------------------------------------------------------------------------- -# Install foo package -__package_dpkg --install /tmp/foo_0.1_all.deb +# Install foo and bar packages +__package_dpkg --source /tmp/foo_0.1_all.deb foo_0.1_all.deb +__package_dpkg --source $__type/files/bar_1.4.deb bar_1.4.deb -------------------------------------------------------------------------------- diff --git a/cdist/conf/type/__package_dpkg/manifest b/cdist/conf/type/__package_dpkg/manifest new file mode 100644 index 00000000..ff477c2d --- /dev/null +++ b/cdist/conf/type/__package_dpkg/manifest @@ -0,0 +1,34 @@ +#!/bin/sh +# +# 2013 Tomas Pospisek (tpo_deb sourcepole.ch) +# +# cdist is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# cdist is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with cdist. If not, see . +# +# +# This __package_dpkg type does not check whether a *.deb package is +# allready installed. It just copies the *.deb package over to the +# destination and installs it. We could use __package_apt to check +# whether a *.deb package is allready installed and only install it +# if we're given a --force argument or similar (would be clever not +# to conflict with dpkg's --force options). But currently we don't +# do any checks or --force'ing. + + +package_path=$( cat "$__object/parameter/source" ) +package=$( basename "$__object_id" ) + +__file "/var/cache/apt/archives/$package" \ + --source "$package_path" \ + --state present + diff --git a/cdist/conf/type/__package_dpkg/parameter/required b/cdist/conf/type/__package_dpkg/parameter/required index 7c32f559..5a18cd2f 100644 --- a/cdist/conf/type/__package_dpkg/parameter/required +++ b/cdist/conf/type/__package_dpkg/parameter/required @@ -1 +1 @@ -install +source diff --git a/cdist/conf/type/__package_dpkg/singleton b/cdist/conf/type/__package_dpkg/singleton deleted file mode 100644 index e69de29b..00000000 From 8e3281aa7c5cf83c1180f139dbcbcc59e8878268 Mon Sep 17 00:00:00 2001 From: Tomas Pospisek Date: Thu, 1 Dec 2016 09:09:57 +0100 Subject: [PATCH 04/14] rewrite man page in rst Only minimal changes needed. This was done to satisfy darko-poljak's request here: https://github.com/ungleich/cdist/pull/354#issuecomment-263492801 --- .../type/__package_dpkg/{man.text => man.rst} | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) rename cdist/conf/type/__package_dpkg/{man.text => man.rst} (62%) diff --git a/cdist/conf/type/__package_dpkg/man.text b/cdist/conf/type/__package_dpkg/man.rst similarity index 62% rename from cdist/conf/type/__package_dpkg/man.text rename to cdist/conf/type/__package_dpkg/man.rst index ae98be99..2af69341 100644 --- a/cdist/conf/type/__package_dpkg/man.text +++ b/cdist/conf/type/__package_dpkg/man.rst @@ -1,7 +1,5 @@ cdist-type__package_dpkg(7) ========================== -Tomas Pospisek - NAME ---- @@ -18,27 +16,29 @@ The object given to __package_dpkg must be the name of the deb package. REQUIRED PARAMETERS ------------------- -source:: +source path to the *.deb package EXAMPLES -------- --------------------------------------------------------------------------------- -# Install foo and bar packages -__package_dpkg --source /tmp/foo_0.1_all.deb foo_0.1_all.deb -__package_dpkg --source $__type/files/bar_1.4.deb bar_1.4.deb --------------------------------------------------------------------------------- +.. code-block:: sh + + # Install foo and bar packages + __package_dpkg --source /tmp/foo_0.1_all.deb foo_0.1_all.deb + __package_dpkg --source $__type/files/bar_1.4.deb bar_1.4.deb SEE ALSO -------- -- cdist-type(7) -- cdist-type__package(7) +:strong:`cdist-type`\ (7), :strong:`cdist-type__package`\ (7) +AUTHORS +------- +Tomas Pospisek COPYING ------- Copyright \(C) 2013 Tomas Pospisek. Free use of this software is granted under the terms of the GNU General Public License version 3 (GPLv3). -This type is based on __package_apt +This type is based on __package_apt. From 6bcfdec1545e862339ae0457e6ecd77593e8ca44 Mon Sep 17 00:00:00 2001 From: Tomas Pospisek Date: Thu, 1 Dec 2016 09:54:27 +0100 Subject: [PATCH 05/14] remove reference to cdist_type, use GPL3+ as requested by darko-poljak here: https://github.com/ungleich/cdist/pull/360#issuecomment-264110087 --- cdist/conf/type/__package_dpkg/man.rst | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/cdist/conf/type/__package_dpkg/man.rst b/cdist/conf/type/__package_dpkg/man.rst index 2af69341..fbd5b4b1 100644 --- a/cdist/conf/type/__package_dpkg/man.rst +++ b/cdist/conf/type/__package_dpkg/man.rst @@ -31,7 +31,7 @@ EXAMPLES SEE ALSO -------- -:strong:`cdist-type`\ (7), :strong:`cdist-type__package`\ (7) +:strong:`cdist-type__package`\ (7) AUTHORS ------- @@ -39,6 +39,8 @@ Tomas Pospisek COPYING ------- -Copyright \(C) 2013 Tomas Pospisek. Free use of this software is -granted under the terms of the GNU General Public License version 3 (GPLv3). +Copyright \(C) 2013 Tomas Pospisek. You can redistribute it +and/or modify it under the terms of the GNU General Public License as +published by the Free Software Foundation, either version 3 of the +License, or (at your option) any later version. This type is based on __package_apt. From 4370efdbb86910bb060cb003550347252904ba67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Posp=C3=AD=C5=A1ek?= Date: Fri, 2 Dec 2016 09:39:53 +0100 Subject: [PATCH 06/14] Update man.rst fix title as requested here https://github.com/ungleich/cdist/pull/354#issuecomment-264117501 --- cdist/conf/type/__package_dpkg/man.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cdist/conf/type/__package_dpkg/man.rst b/cdist/conf/type/__package_dpkg/man.rst index fbd5b4b1..65a695b5 100644 --- a/cdist/conf/type/__package_dpkg/man.rst +++ b/cdist/conf/type/__package_dpkg/man.rst @@ -1,5 +1,5 @@ cdist-type__package_dpkg(7) -========================== +=========================== NAME ---- From 3054bae8c2cd847b29416027ecfd38235309b4ab Mon Sep 17 00:00:00 2001 From: Dominique Roux Date: Fri, 2 Dec 2016 14:34:01 +0100 Subject: [PATCH 07/14] Added __docker type from asteven, implemented debian support --- cdist/conf/type/__docker/man.text | 51 ++++++++++++++ cdist/conf/type/__docker/manifest | 81 ++++++++++++++++++++++ cdist/conf/type/__docker/parameter/boolean | 1 + cdist/conf/type/__docker/singleton | 0 4 files changed, 133 insertions(+) create mode 100644 cdist/conf/type/__docker/man.text create mode 100755 cdist/conf/type/__docker/manifest create mode 100644 cdist/conf/type/__docker/parameter/boolean create mode 100644 cdist/conf/type/__docker/singleton diff --git a/cdist/conf/type/__docker/man.text b/cdist/conf/type/__docker/man.text new file mode 100644 index 00000000..566c2f4c --- /dev/null +++ b/cdist/conf/type/__docker/man.text @@ -0,0 +1,51 @@ +cdist-type__docker(7) +===================== +Steven Armstrong + + +NAME +---- +cdist-type__docker - install docker-engine + + +DESCRIPTION +----------- +Installs latest docker-engine package from dockerproject.org. + + +REQUIRED PARAMETERS +------------------- +None. + + +OPTIONAL PARAMETERS +------------------- +None. + + +BOOLEAN PARAMETERS +------------------ +experimentel:: + Install the experimentel docker-engine package instead of the latest stable release. + + +EXAMPLES +-------- + +-------------------------------------------------------------------------------- +__docker + +# experimentel +__docker --experimental +-------------------------------------------------------------------------------- + + +SEE ALSO +-------- +- cdist-type(7) + + +COPYING +------- +Copyright \(C) 2016 Steven Armstrong. Free use of this software is +granted under the terms of the GNU General Public License version 3 (GPLv3). diff --git a/cdist/conf/type/__docker/manifest b/cdist/conf/type/__docker/manifest new file mode 100755 index 00000000..ba13b3e4 --- /dev/null +++ b/cdist/conf/type/__docker/manifest @@ -0,0 +1,81 @@ +#!/bin/sh +# +# 2016 Steven Armstrong (steven-cdist at armstrong.cc) +# +# This file is part of cdist. +# +# cdist is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# cdist is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with cdist. If not, see . +# + + +os=$(cat "$__global/explorer/os") + +case "$os" in + centos) + component="main" + if [ -f "$__object/parameter/experimental" ]; then + component="experimental" + fi + export CDIST_ORDER_DEPENDENCY=on + __yum_repo docker \ + --name 'Docker Repository' \ + --baseurl "https://yum.dockerproject.org/repo/$component/centos/\$releasever/" \ + --enabled \ + --gpgcheck \ + --gpgkey 'https://yum.dockerproject.org/gpg' + __package docker-engine + unset CDIST_ORDER_DEPENDENCY + ;; + ubuntu) + component="main" + if [ -f "$__object/parameter/experimental" ]; then + component="experimental" + fi + __package apparmor + __package ca-certificates + __package apt-transport-https + __apt_key docker --keyid 58118E89F3A912897C070ADBF76221572C52609D + export CDIST_ORDER_DEPENDENCY=on + __apt_source docker \ + --uri https://apt.dockerproject.org/repo \ + --distribution "ubuntu-$(cat "$__global/explorer/lsb_codename")" \ + --component "$component" + __package docker-engine + unset CDIST_ORDER_DEPENDENCY + ;; + debian) + component="main" + if [ -f "$__object/parameter/experimental" ]; then + component="experimental" + fi + + __package apt-transport-https + __package ca-certificates + __package gnupg2 + __apt_key docker --keyid 58118E89F3A912897C070ADBF76221572C52609D + export CDIST_ORDER_DEPENDENCY=on + __apt_source docker \ + --uri https://apt.dockerproject.org/repo \ + --distribution "debian-$(cat "$__global/explorer/lsb_codename")" \ + --component "$component" + __package docker-engine + unset CDIST_ORDER_DEPENDENCY + + ;; + *) + echo "Your operating system ($os) is currently not supported by this type (${__type##*/})." >&2 + echo "Please contribute an implementation for it if you can." >&2 + exit 1 + ;; +esac diff --git a/cdist/conf/type/__docker/parameter/boolean b/cdist/conf/type/__docker/parameter/boolean new file mode 100644 index 00000000..9839eb20 --- /dev/null +++ b/cdist/conf/type/__docker/parameter/boolean @@ -0,0 +1 @@ +experimental diff --git a/cdist/conf/type/__docker/singleton b/cdist/conf/type/__docker/singleton new file mode 100644 index 00000000..e69de29b From b24adcbe202fdb1d59e6ccdea08a39a012e8c244 Mon Sep 17 00:00:00 2001 From: Darko Poljak Date: Sat, 3 Dec 2016 14:03:24 +0100 Subject: [PATCH 08/14] Fix changelog style. --- docs/changelog | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/changelog b/docs/changelog index d9939bf1..168282aa 100644 --- a/docs/changelog +++ b/docs/changelog @@ -2,14 +2,14 @@ Changelog --------- 4.4.0: 2016-12-03 - * Core: deprecate -d option and make -v option log level counter (Darko Poljak) + * Core: Deprecate -d option and make -v option log level counter (Darko Poljak) * New type: __postgres_extension (Tomas Pospisek) - * Core, types: support IPv6 (Darko Poljak) - * Type __consul: add source and cksum files for Consul 0.7.0 and 0.7.1 (Carlos Ortigoza) + * Core, types: Support IPv6 (Darko Poljak) + * Type __consul: Add source and cksum files for Consul 0.7.0 and 0.7.1 (Carlos Ortigoza) * Type __user: FreeBSD fix (Kamila Souckova) * New type: __apt_mark (Ander Punnar) - * Type __package_upgrade_all: do not dist-upgrade by default, add apt-clean and apt-dist-upgrade options (Ander Punnar) - * Core: fix target_host vars (Darko Poljak) + * Type __package_upgrade_all: Do not dist-upgrade by default, add apt-clean and apt-dist-upgrade options (Ander Punnar) + * Core: Correct target_host var in code.py (Darko Poljak) * All: Merge install feature from 4.0-pre-not-stable (Darko Poljak) 4.3.2: 2016-10-13 @@ -20,7 +20,7 @@ Changelog * Type __package_pkg_openbsd: Support --version (Andres Erbsen) * Type __hostname: Support openbsd (Andres Erbsen) * New type: __firewalld_start: start/stop firewalld and/or enable/disable start on boot (Darko Poljak) - * Bugfix __consul_agent: config option was misnamed 'syslog' instead of 'enable_syslog' (Steven Armstrong) + * Bugfix __consul_agent: Config option was misnamed 'syslog' instead of 'enable_syslog' (Steven Armstrong) 4.3.1: 2016-08-22 * Documentation: Spelling fixes (Darko Poljak) From fc18e0f99cc57a2813bfe9c577566cfc5e4096ac Mon Sep 17 00:00:00 2001 From: Dominique Roux Date: Sat, 3 Dec 2016 18:14:58 +0100 Subject: [PATCH 09/14] migrated man.text -> man.rst --- .../conf/type/__docker/{man.text => man.rst} | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) rename cdist/conf/type/__docker/{man.text => man.rst} (71%) diff --git a/cdist/conf/type/__docker/man.text b/cdist/conf/type/__docker/man.rst similarity index 71% rename from cdist/conf/type/__docker/man.text rename to cdist/conf/type/__docker/man.rst index 566c2f4c..88786ad7 100644 --- a/cdist/conf/type/__docker/man.text +++ b/cdist/conf/type/__docker/man.rst @@ -1,7 +1,5 @@ cdist-type__docker(7) ===================== -Steven Armstrong - NAME ---- @@ -25,24 +23,23 @@ None. BOOLEAN PARAMETERS ------------------ -experimentel:: +experimentel Install the experimentel docker-engine package instead of the latest stable release. EXAMPLES -------- --------------------------------------------------------------------------------- -__docker +.. code-block:: sh + __docker -# experimentel -__docker --experimental --------------------------------------------------------------------------------- + # experimentel + __docker --experimental -SEE ALSO --------- -- cdist-type(7) +AUTHORS +------- +Steven Armstrong COPYING From 1ee6c2e7b1dbfe25d26f30a6648ce4d7f5336e1f Mon Sep 17 00:00:00 2001 From: Dominique Roux Date: Mon, 5 Dec 2016 07:57:30 +0100 Subject: [PATCH 10/14] added line after 33, changed experimentel to experimental --- cdist/conf/type/__docker/man.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cdist/conf/type/__docker/man.rst b/cdist/conf/type/__docker/man.rst index 88786ad7..80088983 100644 --- a/cdist/conf/type/__docker/man.rst +++ b/cdist/conf/type/__docker/man.rst @@ -23,7 +23,7 @@ None. BOOLEAN PARAMETERS ------------------ -experimentel +experimental Install the experimentel docker-engine package instead of the latest stable release. @@ -31,6 +31,7 @@ EXAMPLES -------- .. code-block:: sh + __docker # experimentel From eb56c6ef59118a30987aa44683644f808a650b6d Mon Sep 17 00:00:00 2001 From: Darko Poljak Date: Mon, 5 Dec 2016 08:53:48 +0100 Subject: [PATCH 11/14] experimentel -> experimental --- cdist/conf/type/__docker/man.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cdist/conf/type/__docker/man.rst b/cdist/conf/type/__docker/man.rst index 80088983..42e71af5 100644 --- a/cdist/conf/type/__docker/man.rst +++ b/cdist/conf/type/__docker/man.rst @@ -24,7 +24,7 @@ None. BOOLEAN PARAMETERS ------------------ experimental - Install the experimentel docker-engine package instead of the latest stable release. + Install the experimental docker-engine package instead of the latest stable release. EXAMPLES @@ -34,7 +34,7 @@ EXAMPLES __docker - # experimentel + # experimental __docker --experimental From 0f175bc65a184a89f6b82556bbf71e7c3f3c1ef5 Mon Sep 17 00:00:00 2001 From: Darko Poljak Date: Mon, 5 Dec 2016 08:53:59 +0100 Subject: [PATCH 12/14] Update changelog. --- docs/changelog | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/changelog b/docs/changelog index 168282aa..ea3c74c2 100644 --- a/docs/changelog +++ b/docs/changelog @@ -1,6 +1,10 @@ Changelog --------- +next: + * New type: __docker (Steven Armstrong) + * New type: __package_dpkg (Tomas Pospisek) + 4.4.0: 2016-12-03 * Core: Deprecate -d option and make -v option log level counter (Darko Poljak) * New type: __postgres_extension (Tomas Pospisek) From d17c517a0c220213ea343bf1926a6ff4d8d7dc37 Mon Sep 17 00:00:00 2001 From: Darko Poljak Date: Wed, 7 Dec 2016 22:43:53 +0100 Subject: [PATCH 13/14] enable-beta -> beta --- cdist/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cdist/__init__.py b/cdist/__init__.py index c142230c..6ea02d41 100644 --- a/cdist/__init__.py +++ b/cdist/__init__.py @@ -67,13 +67,13 @@ class CdistBetaRequired(cdist.Error): if self.arg is None: err_msg = ("\'{}\' command is beta, but beta is " "not enabled. If you want to use it please enable beta " - "functionalities by using the -b/--enable-beta command " + "functionalities by using the -b/--beta command " "line flag or setting CDIST_BETA env var.") fmt_args = [self.command, ] else: err_msg = ("\'{}\' argument of \'{}\' command is beta, but beta " "is not enabled. If you want to use it please enable " - "beta functionalities by using the -b/--enable-beta " + "beta functionalities by using the -b/--beta " "command line flag or setting CDIST_BETA env var.") fmt_args = [self.arg, self.command, ] return err_msg.format(*fmt_args) From 6d765c1ff728098d5570118015bbb21fe0ea4e0f Mon Sep 17 00:00:00 2001 From: Darko Poljak Date: Wed, 7 Dec 2016 23:43:03 +0100 Subject: [PATCH 14/14] enable-beta -> beta --- completions/bash/cdist-completion.bash | 2 +- completions/zsh/_cdist | 2 +- docs/src/man1/cdist.rst | 7 ++++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/completions/bash/cdist-completion.bash b/completions/bash/cdist-completion.bash index 68f45327..1c4226c2 100644 --- a/completions/bash/cdist-completion.bash +++ b/completions/bash/cdist-completion.bash @@ -36,7 +36,7 @@ _cdist() return 0 ;; config|install) - opts="-h --help -d --debug -v --verbose -b --enable-beta \ + opts="-h --help -d --debug -v --verbose -b --beta \ -c --conf-dir -f --file -i --initial-manifest -j --jobs \ -n --dry-run -o --out-dir -p --parallel -s --sequential \ --remote-copy --remote-exec" diff --git a/completions/zsh/_cdist b/completions/zsh/_cdist index dc320224..001356d4 100644 --- a/completions/zsh/_cdist +++ b/completions/zsh/_cdist @@ -36,7 +36,7 @@ _cdist() esac ;; config|install) - opts=(-h --help -d --debug -v --verbose -b --enable-beta -c --conf-dir -f --file -i --initial-manifest -j --jobs -n --dry-run -o --out-dir -p --parallel -s --sequential --remote-copy --remote-exec) + opts=(-h --help -d --debug -v --verbose -b --beta -c --conf-dir -f --file -i --initial-manifest -j --jobs -n --dry-run -o --out-dir -p --parallel -s --sequential --remote-copy --remote-exec) compadd "$@" -- $opts ;; *) diff --git a/docs/src/man1/cdist.rst b/docs/src/man1/cdist.rst index 08c856b1..55901300 100644 --- a/docs/src/man1/cdist.rst +++ b/docs/src/man1/cdist.rst @@ -69,10 +69,11 @@ CONFIG/INSTALL -------------- Configure/install one or more hosts. -.. option:: -b, --enable-beta +.. option:: -b, --beta - Enable beta functionalities. Beta functionalities include the - following options: -j/--jobs. + Enable beta functionalities. + + Can also be enabled using CDIST_BETA env var. .. option:: -c CONF_DIR, --conf-dir CONF_DIR