From fe143d57b87ad0fce0b59b08dd255ecdde511778 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Wed, 5 Dec 2012 23:43:24 +0100 Subject: [PATCH 01/14] add new type: __rbenv Signed-off-by: Nico Schottelius --- cdist/conf/type/__rbenv/explorer/homedir | 25 +++++++++++++ cdist/conf/type/__rbenv/man.text | 43 ++++++++++++++++++++++ cdist/conf/type/__rbenv/manifest | 34 +++++++++++++++++ cdist/conf/type/__rbenv/parameter/optional | 1 + 4 files changed, 103 insertions(+) create mode 100755 cdist/conf/type/__rbenv/explorer/homedir create mode 100644 cdist/conf/type/__rbenv/man.text create mode 100644 cdist/conf/type/__rbenv/manifest create mode 100644 cdist/conf/type/__rbenv/parameter/optional diff --git a/cdist/conf/type/__rbenv/explorer/homedir b/cdist/conf/type/__rbenv/explorer/homedir new file mode 100755 index 00000000..8dc25535 --- /dev/null +++ b/cdist/conf/type/__rbenv/explorer/homedir @@ -0,0 +1,25 @@ +#!/bin/sh +# +# 2012 Nico Schottelius (nico-cdist at schottelius.org) +# +# 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 . +# +# +# Check whether repository exists +# + +user="$__object_id" +su - "$user" -c "pwd -P" diff --git a/cdist/conf/type/__rbenv/man.text b/cdist/conf/type/__rbenv/man.text new file mode 100644 index 00000000..bee57f76 --- /dev/null +++ b/cdist/conf/type/__rbenv/man.text @@ -0,0 +1,43 @@ +cdist-type__rbenv(7) +==================== +Nico Schottelius + + +NAME +---- +cdist-type__rbenv - Manage rbenv installation + + +DESCRIPTION +----------- +This cdist type allows you to manage rbenv installations. +It also installs ruby-build. + + +OPTIONAL PARAMETERS +------------------- +state:: + Either "present" or "absent", defaults to "present" + + +EXAMPLES +-------- + +-------------------------------------------------------------------------------- +# Install rbenv including ruby-build for nico +__rbenv nico + +# Bastian does not need rbenv anymore, he began to code C99 +__rbenv bastian --state absent +-------------------------------------------------------------------------------- + + +SEE ALSO +-------- +- cdist-type(7) + + +COPYING +------- +Copyright \(C) 2012 Nico Schottelius. 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/__rbenv/manifest b/cdist/conf/type/__rbenv/manifest new file mode 100644 index 00000000..2e8769a4 --- /dev/null +++ b/cdist/conf/type/__rbenv/manifest @@ -0,0 +1,34 @@ +#!/bin/sh +# +# 2012 Nico Schottelius (nico-cdist at schottelius.org) +# +# 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 . +# +# + +homedir="$(cat "$__object/explorer/homedir")" +state_should=present +[ -f "$__object/parameter/state" ] && state_should="$(cat "$__object/parameter/state")" + +rbenvdir="$homedir/.rbenv" +rubybuilddir="$rbenvdir/plugins/ruby-build" + +__git "$rbenvdir" --source git://github.com/sstephenson/rbenv.git \ + --state "$state_should" + +require="__git/$rbendir" __git "$rubybuilddir" \ + --source git://github.com/sstephenson/ruby-build.git \ + --state "$state_should" diff --git a/cdist/conf/type/__rbenv/parameter/optional b/cdist/conf/type/__rbenv/parameter/optional new file mode 100644 index 00000000..ff72b5c7 --- /dev/null +++ b/cdist/conf/type/__rbenv/parameter/optional @@ -0,0 +1 @@ +state From ed7b6d1a68a68e9b12bb9740fc86842c167f21a7 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Thu, 6 Dec 2012 00:01:01 +0100 Subject: [PATCH 02/14] add linebreak, add broken require Signed-off-by: Nico Schottelius --- cdist/conf/type/__rbenv/manifest | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/cdist/conf/type/__rbenv/manifest b/cdist/conf/type/__rbenv/manifest index 2e8769a4..8f912861 100644 --- a/cdist/conf/type/__rbenv/manifest +++ b/cdist/conf/type/__rbenv/manifest @@ -26,9 +26,13 @@ state_should=present rbenvdir="$homedir/.rbenv" rubybuilddir="$rbenvdir/plugins/ruby-build" -__git "$rbenvdir" --source git://github.com/sstephenson/rbenv.git \ +__git "$rbenvdir" \ + --source git://github.com/sstephenson/rbenv.git \ + --owner "$__object_id" \ --state "$state_should" -require="__git/$rbendir" __git "$rubybuilddir" \ +#__git "$rubybuilddir" \ +require="__git/$rbenvdir" __git "$rubybuilddir" \ --source git://github.com/sstephenson/ruby-build.git \ + --owner "$__object_id" \ --state "$state_should" From 7df1f26c9aa37b50d240a65fb49220de4f1c9426 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Thu, 3 Jan 2013 13:01:34 +0100 Subject: [PATCH 03/14] +deps issue description Signed-off-by: Nico Schottelius --- docs/dev/logs/2013-01-03.dependency-issue | 27 +++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 docs/dev/logs/2013-01-03.dependency-issue diff --git a/docs/dev/logs/2013-01-03.dependency-issue b/docs/dev/logs/2013-01-03.dependency-issue new file mode 100644 index 00000000..91db9425 --- /dev/null +++ b/docs/dev/logs/2013-01-03.dependency-issue @@ -0,0 +1,27 @@ + +Problem shown by using __rbenv: + +__rbenv/nicotest + __git /home/nico/.rbenv + __package git + __directory /home/nico/.rbenv + + require="__git/home/nico/.rbenv" + __git /home/nico/.rbenv/plugins/ruby-build + __package git + __directory /home/nico/.rbenv/plugins/ruby-build + + +1) if children do NOT automatically depend on their parents requiremnts + + __directory /home/nico/.rbenv/plugins/ruby-build fails: + because __directory /home/nico/.rbenv/plugins is created by + __git /home/nico/.rbenv, but __directory /home/nico/.rbenv/plugins/ruby-build + does not depend on __git /home/nico/.rbenv + +2) if children DO automatically depend on their parents requiremnts + __package git from __git /home/nico/.rbenv/plugins/ruby-build depends on __git /home/nico/.rbenv. + + __git /home/nico/.rbenv depends on __package git (via autorequire) + + => circular dependency, they depend on each other From 95b1ac0706d0e6f127b78235dd89236053a92efe Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Fri, 14 Feb 2014 20:34:24 +0100 Subject: [PATCH 04/14] update rbenv type to cdist 3.0 style Signed-off-by: Nico Schottelius --- cdist/conf/type/__rbenv/explorer/homedir | 25 ------------------- cdist/conf/type/__rbenv/man.text | 12 ++++++--- cdist/conf/type/__rbenv/manifest | 14 +++++------ .../conf/type/__rbenv/parameter/default/state | 1 + cdist/conf/type/__rbenv/parameter/required | 1 + 5 files changed, 18 insertions(+), 35 deletions(-) delete mode 100755 cdist/conf/type/__rbenv/explorer/homedir create mode 100644 cdist/conf/type/__rbenv/parameter/default/state create mode 100644 cdist/conf/type/__rbenv/parameter/required diff --git a/cdist/conf/type/__rbenv/explorer/homedir b/cdist/conf/type/__rbenv/explorer/homedir deleted file mode 100755 index 8dc25535..00000000 --- a/cdist/conf/type/__rbenv/explorer/homedir +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh -# -# 2012 Nico Schottelius (nico-cdist at schottelius.org) -# -# 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 . -# -# -# Check whether repository exists -# - -user="$__object_id" -su - "$user" -c "pwd -P" diff --git a/cdist/conf/type/__rbenv/man.text b/cdist/conf/type/__rbenv/man.text index bee57f76..c6ed5de2 100644 --- a/cdist/conf/type/__rbenv/man.text +++ b/cdist/conf/type/__rbenv/man.text @@ -19,16 +19,22 @@ OPTIONAL PARAMETERS state:: Either "present" or "absent", defaults to "present" +owner:: + Which user should own the rbenv installation, defaults to root + EXAMPLES -------- -------------------------------------------------------------------------------- # Install rbenv including ruby-build for nico -__rbenv nico +__rbenv /home/nico + +# Install rbenv including ruby-build for nico +__rbenv /home/nico --owner nico # Bastian does not need rbenv anymore, he began to code C99 -__rbenv bastian --state absent +__rbenv /home/bastian --state absent -------------------------------------------------------------------------------- @@ -39,5 +45,5 @@ SEE ALSO COPYING ------- -Copyright \(C) 2012 Nico Schottelius. Free use of this software is +Copyright \(C) 2012-2014 Nico Schottelius. 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/__rbenv/manifest b/cdist/conf/type/__rbenv/manifest index 8f912861..767abdba 100644 --- a/cdist/conf/type/__rbenv/manifest +++ b/cdist/conf/type/__rbenv/manifest @@ -1,6 +1,6 @@ #!/bin/sh # -# 2012 Nico Schottelius (nico-cdist at schottelius.org) +# 2012-2014 Nico Schottelius (nico-cdist at schottelius.org) # # This file is part of cdist. # @@ -19,20 +19,20 @@ # # -homedir="$(cat "$__object/explorer/homedir")" -state_should=present -[ -f "$__object/parameter/state" ] && state_should="$(cat "$__object/parameter/state")" +homedir="$__object_id" + +state_should="$(cat "$__object/parameter/state")" +owner="$(cat "$__object/parameter/owner")" rbenvdir="$homedir/.rbenv" rubybuilddir="$rbenvdir/plugins/ruby-build" __git "$rbenvdir" \ --source git://github.com/sstephenson/rbenv.git \ - --owner "$__object_id" \ + --owner "$owner" \ --state "$state_should" -#__git "$rubybuilddir" \ require="__git/$rbenvdir" __git "$rubybuilddir" \ --source git://github.com/sstephenson/ruby-build.git \ - --owner "$__object_id" \ + --owner "$owner" \ --state "$state_should" diff --git a/cdist/conf/type/__rbenv/parameter/default/state b/cdist/conf/type/__rbenv/parameter/default/state new file mode 100644 index 00000000..e7f6134f --- /dev/null +++ b/cdist/conf/type/__rbenv/parameter/default/state @@ -0,0 +1 @@ +present diff --git a/cdist/conf/type/__rbenv/parameter/required b/cdist/conf/type/__rbenv/parameter/required new file mode 100644 index 00000000..7ee3bde8 --- /dev/null +++ b/cdist/conf/type/__rbenv/parameter/required @@ -0,0 +1 @@ +owner From d288ee1cde8dcc5c2d6886e1f6690e0a32152183 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Tue, 11 Mar 2014 15:40:44 +0100 Subject: [PATCH 05/14] ++changes Signed-off-by: Nico Schottelius --- docs/changelog | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/docs/changelog b/docs/changelog index e7ac935d..9477d8d0 100644 --- a/docs/changelog +++ b/docs/changelog @@ -6,11 +6,12 @@ Changelog next: - * Type __git: Pass onwer/group/mode values to __directory - * Type __ssh_authorized_keys: Allow managing existing keys (Steven Armstrong) - * Type __iptable_rule: Fix example documentation (Antoine Catton) * Type __file: Enhance OpenBSD Support (og) + * Type __git: Pass onwer/group/mode values to __directory + * Type __iptable_rule: Fix example documentation (Antoine Catton) + * Type __key_value: Add messaging support * Type __package_pkg_openbsd: Allow to change PKG_PATH (og) + * Type __ssh_authorized_keys: Allow managing existing keys (Steven Armstrong) * Type __user: Enhance OpenBSD Support (og) From 2b03ccd776a37bd0bfe0a3ccd7e9ef42ea6b9756 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Wed, 19 Mar 2014 18:57:11 +0100 Subject: [PATCH 06/14] changes for 3.1.0 Signed-off-by: Nico Schottelius --- cdist/conf/type/__ssh_authorized_keys/manifest | 1 + docs/changelog | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/cdist/conf/type/__ssh_authorized_keys/manifest b/cdist/conf/type/__ssh_authorized_keys/manifest index efcd2d7a..1c9df208 100755 --- a/cdist/conf/type/__ssh_authorized_keys/manifest +++ b/cdist/conf/type/__ssh_authorized_keys/manifest @@ -58,6 +58,7 @@ if [ ! -f "$__object/parameter/noparent" -o ! -f "$__object/parameter/nofile" ]; fi # Remove legacy blocks created by old versions of this type +# FIXME: remove me in 3.2+ __block "$__object_name" \ --file "$file" \ --prefix "#cdist:$__object_name" \ diff --git a/docs/changelog b/docs/changelog index 9477d8d0..df23d39f 100644 --- a/docs/changelog +++ b/docs/changelog @@ -5,7 +5,8 @@ Changelog * Exception: No braces means author == Nico Schottelius -next: +3.1.0: 2014-03-19 + * New Type: __rbenv * Type __file: Enhance OpenBSD Support (og) * Type __git: Pass onwer/group/mode values to __directory * Type __iptable_rule: Fix example documentation (Antoine Catton) @@ -14,7 +15,6 @@ next: * Type __ssh_authorized_keys: Allow managing existing keys (Steven Armstrong) * Type __user: Enhance OpenBSD Support (og) - 3.0.9: 2014-02-14 * Core: Ignore order dependencies if override is set (Daniel Heule) * Core: Improve Mac OS X support for unit tests (Steven Armstrong) From 9a79cec140ce76230e078e3c47abcad83950145c Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Wed, 19 Mar 2014 18:58:54 +0100 Subject: [PATCH 07/14] remove useless error in build script Signed-off-by: Nico Schottelius --- bin/build-helper | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/build-helper b/bin/build-helper index 1de2eb94..93401d3b 100755 --- a/bin/build-helper +++ b/bin/build-helper @@ -175,7 +175,7 @@ eof release-git-tag) target_version=$($0 changelog-version) - if git rev-parse --verify refs/tags/$target_version; then + if git rev-parse --verify refs/tags/$target_version 2>/dev/null; then echo "Tag for $target_version exists, aborting" exit 1 fi From 10a71eb35a8aa9cfa356e6bc79f42ff12ddfa34a Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Wed, 19 Mar 2014 19:00:39 +0100 Subject: [PATCH 08/14] notes for 3.0 -> 3.1 update Signed-off-by: Nico Schottelius --- docs/web/cdist/update.mdwn | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/web/cdist/update.mdwn b/docs/web/cdist/update.mdwn index 2e3e9b92..28f41da7 100644 --- a/docs/web/cdist/update.mdwn +++ b/docs/web/cdist/update.mdwn @@ -55,6 +55,11 @@ To upgrade to the lastet version do ## General Update Instructions +### Updating from 3.0 to 3.1 + +The type **\_\_ssh_authorized_keys** now also manages existing keys, +not only the ones added by cdist. + ### Updating from 2.3 to 3.0 The **changed** attribute of objects has been removed. From 5ef27191fca6b60f6a02664cb7799e45de052674 Mon Sep 17 00:00:00 2001 From: Daniel Heule Date: Thu, 20 Mar 2014 13:52:12 +0100 Subject: [PATCH 09/14] implementing the $__object and $__object_id on the local and remote execution call, to allow read access to parameter files --- cdist/core/code.py | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/cdist/core/code.py b/cdist/core/code.py index f128697f..6abfb393 100644 --- a/cdist/core/code.py +++ b/cdist/core/code.py @@ -123,15 +123,27 @@ class Code(object): self.remote.mkdir(destination) self.remote.transfer(source, destination) - def _run_code(self, cdist_object, which): + def _run_code(self, cdist_object, which, env=None): which_exec = getattr(self, which) script = os.path.join(which_exec.object_path, getattr(cdist_object, 'code_%s_path' % which)) - return which_exec.run_script(script) + return which_exec.run_script(script, env=env) def run_code_local(self, cdist_object): """Run the code-local script for the given cdist object.""" - return self._run_code(cdist_object, 'local') + # Put some env vars, to allow read only access to the parameters over $__object + env = os.environ.copy() + env.update(self.env) + env.update({ + '__object': cdist_object.absolute_path, + '__object_id': cdist_object.object_id, + }) + return self._run_code(cdist_object, 'local', env=env) def run_code_remote(self, cdist_object): """Run the code-remote script for the given cdist object on the remote side.""" - return self._run_code(cdist_object, 'remote') + # Put some env vars, to allow read only access to the parameters over $__object which is already on the remote side + env = { + '__object': os.path.join(self.remote.object_path, cdist_object.path), + '__object_id': cdist_object.object_id, + } + return self._run_code(cdist_object, 'remote', env=env) From b87b5eab31d38c1685e3c30056c7c18fd55531ff Mon Sep 17 00:00:00 2001 From: Daniel Heule Date: Thu, 20 Mar 2014 16:23:28 +0100 Subject: [PATCH 10/14] documentation to __object in execution run --- docs/man/cdist-reference.text.sh | 14 ++++++++------ docs/man/man7/cdist-type.text | 21 +++++++++++++++++++++ 2 files changed, 29 insertions(+), 6 deletions(-) diff --git a/docs/man/cdist-reference.text.sh b/docs/man/cdist-reference.text.sh index 62614c55..6552bf82 100755 --- a/docs/man/cdist-reference.text.sh +++ b/docs/man/cdist-reference.text.sh @@ -157,13 +157,13 @@ TYPES The following types are available: eof - -for type in man7/cdist-type__*.text; do +set -x +for type in man7/cdist-type__*.html; do no_dir="${type#man7/}"; no_type="${no_dir#cdist-type}"; - name="${no_type%.text}"; + name="${no_type%.html}"; name_no_underline="$(echo $name | sed 's/^__/\\__/g')" - man="${no_dir%.text}(7)" + man="${no_dir%.html}(7)" echo "- $name_no_underline" "($man)" done @@ -209,10 +209,12 @@ __messages_out:: Available for: initial manifest, type manifest, type gencode __object:: Directory that contains the current object. - Available for: type manifest, type explorer, type gencode + Available for: type manifest, type explorer, type gencode and + at the execution of the gencode scripts __object_id:: The type unique object id. - Available for: type manifest, type explorer, type gencode + Available for: type manifest, type explorer, type gencode and + at the execution of the gencode scripts Note: The leading and the trailing "/" will always be stripped (caused by the filesystem database and ensured by the core). Note: Double slashes ("//") will not be fixed and result in an error. diff --git a/docs/man/man7/cdist-type.text b/docs/man/man7/cdist-type.text index 8415f991..06026542 100644 --- a/docs/man/man7/cdist-type.text +++ b/docs/man/man7/cdist-type.text @@ -252,6 +252,27 @@ echo "touch /etc/cdist-configured" -------------------------------------------------------------------------------- +VARIABLE ACCESS FROM THE GENERATED SCRIPTS +------------------------------------------ +In the generated scripts, you have access to the following cdist variables + +- __object +- __object_id + +but only for read operations, means there is no back copy of this +files after the script execution. + +So when you generate a script with the following content, it will work: + +-------------------------------------------------------------------------------- +if [ -f "$__object/parameter/name" ]; then + name="$(cat "$__object/parameter/name")" +else + name="$__object_id" +fi +-------------------------------------------------------------------------------- + + HINTS FOR TYPEWRITERS ---------------------- It must be assumed that the target is pretty dumb and thus does not have high From f36dc1160153558f1d83d8490fc091186e193619 Mon Sep 17 00:00:00 2001 From: Daniel Heule Date: Thu, 20 Mar 2014 17:22:07 +0100 Subject: [PATCH 11/14] forgot myself to the headers .. --- cdist/core/code.py | 1 + 1 file changed, 1 insertion(+) diff --git a/cdist/core/code.py b/cdist/core/code.py index 6abfb393..5374bcdf 100644 --- a/cdist/core/code.py +++ b/cdist/core/code.py @@ -2,6 +2,7 @@ # # 2011 Steven Armstrong (steven-cdist at armstrong.cc) # 2011-2013 Nico Schottelius (nico-cdist at schottelius.org) +# 2014 Daniel Heule (hda at sfs.biz) # # This file is part of cdist. # From b5b1a25e4ff00b6a8dd9531f567447ffeb096aac Mon Sep 17 00:00:00 2001 From: Daniel Heule Date: Thu, 20 Mar 2014 18:53:19 +0100 Subject: [PATCH 12/14] fixed some formulations and removed a debug statement --- docs/man/cdist-reference.text.sh | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/docs/man/cdist-reference.text.sh b/docs/man/cdist-reference.text.sh index 6552bf82..28c46fa6 100755 --- a/docs/man/cdist-reference.text.sh +++ b/docs/man/cdist-reference.text.sh @@ -1,6 +1,7 @@ #!/bin/sh # # 2010-2013 Nico Schottelius (nico-cdist at schottelius.org) +# 2014 Daniel Heule (hda at sfs.biz) # # This file is part of cdist. # @@ -157,7 +158,7 @@ TYPES The following types are available: eof -set -x + for type in man7/cdist-type__*.html; do no_dir="${type#man7/}"; no_type="${no_dir#cdist-type}"; @@ -209,12 +210,10 @@ __messages_out:: Available for: initial manifest, type manifest, type gencode __object:: Directory that contains the current object. - Available for: type manifest, type explorer, type gencode and - at the execution of the gencode scripts + Available for: type manifest, type explorer, type gencode and code scripts __object_id:: The type unique object id. - Available for: type manifest, type explorer, type gencode and - at the execution of the gencode scripts + Available for: type manifest, type explorer, type gencode and code scripts Note: The leading and the trailing "/" will always be stripped (caused by the filesystem database and ensured by the core). Note: Double slashes ("//") will not be fixed and result in an error. From e1766aa070de2c7de99b52428758be60d0137a10 Mon Sep 17 00:00:00 2001 From: Daniel Heule Date: Thu, 20 Mar 2014 19:04:09 +0100 Subject: [PATCH 13/14] reverted the change to .html in generating the reference, since I have fooled myself ... --- docs/man/cdist-reference.text.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/man/cdist-reference.text.sh b/docs/man/cdist-reference.text.sh index 28c46fa6..cff0f9c7 100755 --- a/docs/man/cdist-reference.text.sh +++ b/docs/man/cdist-reference.text.sh @@ -159,12 +159,12 @@ The following types are available: eof -for type in man7/cdist-type__*.html; do +for type in man7/cdist-type__*.text; do no_dir="${type#man7/}"; no_type="${no_dir#cdist-type}"; - name="${no_type%.html}"; + name="${no_type%.text}"; name_no_underline="$(echo $name | sed 's/^__/\\__/g')" - man="${no_dir%.html}(7)" + man="${no_dir%.text}(7)" echo "- $name_no_underline" "($man)" done From 6e4533cb145165a88f8bec1ffbf347fb0f20a774 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Thu, 20 Mar 2014 20:40:04 +0100 Subject: [PATCH 14/14] ++changes Signed-off-by: Nico Schottelius --- docs/changelog | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/changelog b/docs/changelog index df23d39f..7db43304 100644 --- a/docs/changelog +++ b/docs/changelog @@ -5,6 +5,9 @@ Changelog * Exception: No braces means author == Nico Schottelius +3.1.1: + * Core: Make __object and __object available to code (Daniel Heule) + 3.1.0: 2014-03-19 * New Type: __rbenv * Type __file: Enhance OpenBSD Support (og)