From 095c5335c69a732bc54879a6a42e7162c59311bc Mon Sep 17 00:00:00 2001
From: Steven Armstrong <steven@icarus.ethz.ch>
Date: Thu, 16 Jan 2014 11:05:29 +0100
Subject: [PATCH 01/66] use default parameters

Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
---
 cdist/conf/type/__ssh_authorized_keys/manifest                | 2 +-
 cdist/conf/type/__ssh_authorized_keys/parameter/default/state | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 cdist/conf/type/__ssh_authorized_keys/parameter/default/state

diff --git a/cdist/conf/type/__ssh_authorized_keys/manifest b/cdist/conf/type/__ssh_authorized_keys/manifest
index 47cdf746..8b299d0a 100755
--- a/cdist/conf/type/__ssh_authorized_keys/manifest
+++ b/cdist/conf/type/__ssh_authorized_keys/manifest
@@ -19,7 +19,7 @@
 #
 
 owner="$(cat "$__object/parameter/owner" 2>/dev/null || echo "$__object_id")"
-state="$(cat "$__object/parameter/state" 2>/dev/null || echo "present")"
+state="$(cat "$__object/parameter/state" 2>/dev/null)"
 if [ -f "$__object/parameter/file" ]; then
    file="$(cat "$__object/parameter/file")"
 else
diff --git a/cdist/conf/type/__ssh_authorized_keys/parameter/default/state b/cdist/conf/type/__ssh_authorized_keys/parameter/default/state
new file mode 100644
index 00000000..e7f6134f
--- /dev/null
+++ b/cdist/conf/type/__ssh_authorized_keys/parameter/default/state
@@ -0,0 +1 @@
+present

From 3b072a7abb08bdd4896ad425a0ce98700b73ebb6 Mon Sep 17 00:00:00 2001
From: Steven Armstrong <steven@icarus.ethz.ch>
Date: Thu, 16 Jan 2014 11:09:51 +0100
Subject: [PATCH 02/66] use __block type to manage keys

Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
---
 .../type/__ssh_authorized_keys/explorer/entry | 45 ----------
 .../type/__ssh_authorized_keys/gencode-remote | 84 -------------------
 .../conf/type/__ssh_authorized_keys/manifest  | 23 +++--
 3 files changed, 10 insertions(+), 142 deletions(-)
 delete mode 100755 cdist/conf/type/__ssh_authorized_keys/explorer/entry
 delete mode 100755 cdist/conf/type/__ssh_authorized_keys/gencode-remote

diff --git a/cdist/conf/type/__ssh_authorized_keys/explorer/entry b/cdist/conf/type/__ssh_authorized_keys/explorer/entry
deleted file mode 100755
index 9992d32d..00000000
--- a/cdist/conf/type/__ssh_authorized_keys/explorer/entry
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh
-#
-# 2012 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 <http://www.gnu.org/licenses/>.
-#
-
-owner="$(cat "$__object/parameter/owner" 2>/dev/null || echo "$__object_id")"
-if [ -f "$__object/parameter/file" ]; then
-   file="$(cat "$__object/parameter/file")"
-else
-   home="$("$__type_explorer/passwd" | cut -d':' -f 6)"
-   file="$home/.ssh/authorized_keys"
-fi
-
-# no authorized_keys file, nothing we could do
-[ -f "$file" ] || exit 0
-
-# NOTE: keep variables in sync in manifest/explorer/gencode-*
-prefix="#cdist:$__object_name"
-suffix="#/cdist:$__object_name"
-awk -v prefix="$prefix" -v suffix="$suffix" '{
-   if (index($0,prefix)) {
-      triggered=1
-   }
-   if (triggered) {
-      if (index($0,suffix)) {
-            triggered=0
-      }
-      print
-   }
-}' "$file"
diff --git a/cdist/conf/type/__ssh_authorized_keys/gencode-remote b/cdist/conf/type/__ssh_authorized_keys/gencode-remote
deleted file mode 100755
index 7fcb59c6..00000000
--- a/cdist/conf/type/__ssh_authorized_keys/gencode-remote
+++ /dev/null
@@ -1,84 +0,0 @@
-#!/bin/sh
-#
-# 2012-2013 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 <http://www.gnu.org/licenses/>.
-#
-
-owner="$(cat "$__object/parameter/owner" 2>/dev/null || echo "$__object_id")"
-if [ -f "$__object/parameter/file" ]; then
-   file="$(cat "$__object/parameter/file")"
-else
-   home="$(cut -d':' -f 6 "$__object/explorer/passwd")"
-   file="$home/.ssh/authorized_keys"
-fi
-
-entry="$__object/files/entry"
-if [ ! -s "$__object/explorer/entry" ]; then
-   state_is='absent'
-else
-   state_is=$(diff -q "$entry" "$__object/explorer/entry" >/dev/null \
-      && echo present \
-      || echo changed
-   )
-fi
-
-state_should="$(cat "$__object/parameter/state" 2>/dev/null || echo present)"
-if [ "$state_should" = "$state_is" ]; then
-   # Nothing to do, move along
-   exit 0
-fi
-
-remove_entry() {
-   # NOTE: keep variables in sync in manifest/explorer/gencode-*
-   prefix="#cdist:$__object_name"
-   suffix="#/cdist:$__object_name"
-   cat << DONE
-tmpfile=\$(mktemp ${file}.cdist.XXXXXXXXXX)
-# preserve ownership and permissions by copying existing file over tmpfile
-cp -p "$file" "\$tmpfile"
-awk -v prefix="$prefix" -v suffix="$suffix" '
-{
-   if (index(\$0,prefix)) {
-      triggered=1
-   }
-   if (triggered) {
-      if (index(\$0,suffix)) {
-         triggered=0
-      }
-   } else {
-      print
-   }
-}' "$file" > "\$tmpfile"
-mv -f "\$tmpfile" "$file"
-DONE
-}
-
-case "$state_should" in
-   present)
-      if [ "$state_is" = "changed" ]; then
-         remove_entry
-      fi
-      cat << DONE
-cat >> "$file" << ${__type##*/}_DONE
-$(cat "$entry")
-${__type##*/}_DONE
-DONE
-   ;;
-   absent)
-      remove_entry
-   ;;
-esac
diff --git a/cdist/conf/type/__ssh_authorized_keys/manifest b/cdist/conf/type/__ssh_authorized_keys/manifest
index 8b299d0a..8631d042 100755
--- a/cdist/conf/type/__ssh_authorized_keys/manifest
+++ b/cdist/conf/type/__ssh_authorized_keys/manifest
@@ -56,19 +56,16 @@ if [ ! -f "$__object/parameter/noparent" -o ! -f "$__object/parameter/nofile" ];
    fi
 fi
 
-# NOTE: keep variables in sync in manifest/explorer/gencode-*
-prefix="#cdist:$__object_name"
-suffix="#/cdist:$__object_name"
-
-mkdir "$__object/files"
-
 # Generate entry for inclusion in authorized_keys file
-entry="$__object/files/entry"
-echo "$prefix" > "$entry"
+(
 if [ -f "$__object/parameter/comment" ]; then
-   echo "# $(cat "$__object/parameter/comment")" >> "$entry"
+   echo "# $(cat "$__object/parameter/comment")"
 fi
-cat "$__object/parameter/key" >> "$entry"
-# ensure we have a newline after keys
-echo >> "$entry"
-echo "$suffix" >> "$entry"
+cat "$__object/parameter/key"
+) | \
+__block "$__object_name" \
+   --file "$file" \
+   --prefix "#cdist:$__object_name" \
+   --suffix "#/cdist:$__object_name" \
+   --state "$state" \
+   --text -

From 0b7d9babf6f4f13e65f03819887e99d7809309b0 Mon Sep 17 00:00:00 2001
From: Steven Armstrong <steven@icarus.ethz.ch>
Date: Thu, 16 Jan 2014 11:11:00 +0100
Subject: [PATCH 03/66] whitespace--

Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
---
 cdist/conf/type/__ssh_authorized_keys/manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cdist/conf/type/__ssh_authorized_keys/manifest b/cdist/conf/type/__ssh_authorized_keys/manifest
index 8631d042..5a9cfbb3 100755
--- a/cdist/conf/type/__ssh_authorized_keys/manifest
+++ b/cdist/conf/type/__ssh_authorized_keys/manifest
@@ -39,7 +39,7 @@ if [ ! -f "$__object/parameter/noparent" -o ! -f "$__object/parameter/nofile" ];
    fi
 
    if [ ! -f "$__object/parameter/noparent" ]; then
-      # Ensure that the directory in which the authorized_keys shall be exists and 
+      # Ensure that the directory in which the authorized_keys shall be exists and
       # has the right permissions.
       ssh_directory="${file%/*}"
       __directory "$ssh_directory" --state present --parents \

From 36a330eb3c185efeedc35b4221ccae483340c027 Mon Sep 17 00:00:00 2001
From: Steven Armstrong <steven@icarus.ethz.ch>
Date: Thu, 16 Jan 2014 12:00:24 +0100
Subject: [PATCH 04/66] redirect stderr to /dev/null

Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
---
 cdist/conf/type/__mount/manifest | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cdist/conf/type/__mount/manifest b/cdist/conf/type/__mount/manifest
index ff891bb8..8a1fa234 100755
--- a/cdist/conf/type/__mount/manifest
+++ b/cdist/conf/type/__mount/manifest
@@ -26,9 +26,9 @@ if [ ! -f "$__object/parameter/nofstab" ]; then
    (
 printf "%s" "$(cat "$__object/parameter/device")"
 printf " %s" "$path"
-type="$(cat "$__object/parameter/type" || echo "auto")"
+type="$(cat "$__object/parameter/type" 2>/dev/null || echo "auto")"
 printf " %s" "$type"
-options="$(cat "$__object/parameter/options" || echo "defaults")"
+options="$(cat "$__object/parameter/options" 2>/dev/null || echo "defaults")"
 printf " %s" "$options"
 printf " %s" "$(cat "$__object/parameter/dump")"
 printf " %s\n" "$(cat "$__object/parameter/pass")"

From c4140a7c7bc0885f5d8581ba8b1097087494376f Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@bento.schottelius.org>
Date: Sat, 18 Jan 2014 15:57:39 +0100
Subject: [PATCH 05/66] ++changes(3.0.2)

Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
---
 docs/changelog | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog b/docs/changelog
index a12de32a..d9b1db51 100644
--- a/docs/changelog
+++ b/docs/changelog
@@ -9,6 +9,7 @@ Changelog
 	* New Type: __block (Steven Armstrong)
 	* New Type: __mount (Steven Armstrong)
 	* Type __cron: Replace existing entry when changing it (Daniel Heule)
+	* Type __ssh_authorized_keys: Use new type __block (Steven Armstrong)
 
 
 3.0.1: 2014-01-14

From f3b7fc15148058b51cf9f5bbea153123237a12ac Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@bento.schottelius.org>
Date: Sun, 19 Jan 2014 21:38:38 +0100
Subject: [PATCH 06/66] release 3.0.2

Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
---
 docs/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/changelog b/docs/changelog
index d9b1db51..ca9cc9cf 100644
--- a/docs/changelog
+++ b/docs/changelog
@@ -4,7 +4,7 @@ Changelog
 	* Changes are always commented with their author in (braces)
 	* Exception: No braces means author == Nico Schottelius
 
-3.0.2:
+3.0.2: 2014-01-19
 	* Documentation: Document all messages sent by types (Daniel Heule)
 	* New Type: __block (Steven Armstrong)
 	* New Type: __mount (Steven Armstrong)

From ce73cef4574dca1ad6dffa59d61c5546732df837 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@bento.schottelius.org>
Date: Sun, 19 Jan 2014 23:22:48 +0100
Subject: [PATCH 07/66] explain that a requirement caused the error, otherwise
 you search until you die

Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
---
 cdist/emulator.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/cdist/emulator.py b/cdist/emulator.py
index b70ef956..899a710f 100644
--- a/cdist/emulator.py
+++ b/cdist/emulator.py
@@ -194,7 +194,9 @@ class Emulator(object):
                 except core.cdist_type.NoSuchTypeError as e:
                     self.log.error("%s requires object %s, but type %s does not exist (definded at %s)"  % (self.cdist_object.name, requirement, e.name, self.object_source))
                     raise
-
+                except core.cdist_object.MissingObjectIdError as e:
+                    self.log.error("%s requires object %s (without object id), but type %s is not a singleton (definded at %s)"  % (self.cdist_object.name, requirement, e.type_name, self.object_source))
+                    raise
 
                 self.log.debug("Recording requirement: " + requirement)
 

From ac0c88fe9f477b598b2662b589f7a7337b870cfb Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@bento.schottelius.org>
Date: Sun, 19 Jan 2014 23:28:45 +0100
Subject: [PATCH 08/66] remove some old typos and omit type details that follow
 anyway

Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
---
 cdist/emulator.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cdist/emulator.py b/cdist/emulator.py
index 899a710f..63d3bbbc 100644
--- a/cdist/emulator.py
+++ b/cdist/emulator.py
@@ -192,10 +192,10 @@ class Emulator(object):
                 try:
                     cdist_object = self.cdist_object.object_from_name(requirement)
                 except core.cdist_type.NoSuchTypeError as e:
-                    self.log.error("%s requires object %s, but type %s does not exist (definded at %s)"  % (self.cdist_object.name, requirement, e.name, self.object_source))
+                    self.log.error("%s requires object %s, but type %s does not exist. Defined at %s"  % (self.cdist_object.name, requirement, e.name, self.object_source))
                     raise
                 except core.cdist_object.MissingObjectIdError as e:
-                    self.log.error("%s requires object %s (without object id), but type %s is not a singleton (definded at %s)"  % (self.cdist_object.name, requirement, e.type_name, self.object_source))
+                    self.log.error("%s requires object %s without object id. Defined at %s"  % (self.cdist_object.name, requirement, self.object_source))
                     raise
 
                 self.log.debug("Recording requirement: " + requirement)

From c47abb6af71ed9aa12f0be982f4277a9868e08aa Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@bento.schottelius.org>
Date: Sun, 19 Jan 2014 23:29:56 +0100
Subject: [PATCH 09/66] ++changes

Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
---
 docs/changelog | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/changelog b/docs/changelog
index ca9cc9cf..a3d5c4fd 100644
--- a/docs/changelog
+++ b/docs/changelog
@@ -4,6 +4,9 @@ Changelog
 	* Changes are always commented with their author in (braces)
 	* Exception: No braces means author == Nico Schottelius
 
+3.0.3:
+	* Core: Enhance error message when requirement is missing object id
+
 3.0.2: 2014-01-19
 	* Documentation: Document all messages sent by types (Daniel Heule)
 	* New Type: __block (Steven Armstrong)

From c790014cd59d65181d83a42d5f7b45ef2d2264c8 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@bento.schottelius.org>
Date: Mon, 20 Jan 2014 10:11:23 +0100
Subject: [PATCH 10/66] add scaled version of the cdist logo

Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
---
 docs/gfx/cdist-logo-1024-scaled.png | Bin 0 -> 2509 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 docs/gfx/cdist-logo-1024-scaled.png

diff --git a/docs/gfx/cdist-logo-1024-scaled.png b/docs/gfx/cdist-logo-1024-scaled.png
new file mode 100644
index 0000000000000000000000000000000000000000..4be8d4c96a9e6ff645fe08ceef4df9afb3f218c4
GIT binary patch
literal 2509
zcmYLLc{tQ-8-9K>%vjEhB}oR2WNT6!A|n|gWN8jUB~6kz31#2slcaD=*_YAaSVESL
zl6_8eWC>qnI~o%@(Lwet@{PZ~>w4bnzOVOs{&=4Ey|4Ru9#E}KaYE8U0Dv<$GqwTX
z<5846g66^3rHdXsz)&siOnA7nvr{nq<Rgy>`j}nt1rXk|dl1OXmf~Gv{miXQup9(0
zfEACcHn8BOT{Jf~v<n)UWm<TZs!PNqNU7h&u_|#Gvtb)@XPImAg>R`0@|1S*bA;SU
zEUC~CIZ*jd!RoBdk4T>ag7T-*J2Ol3aT)?q#Q#TK;%M2HGC%wDxwT==yMxZ2!oKw_
zJ+M9j-Kw9%*aF+31bJ|DOhDVSg<;Mc{hTm@{VD-Hd|Zu}f7Hz35_`5buP<b8PbMPl
zl3Sl5{*JUPZ<chDhJ|0eHtpE9Fgl1a^Zt9M!4?fsME8$EPB|iaXOI3c$K?Icj|(>n
z$VPEJ;Ps#L276|oWQ-*)3Nk|dPKDX>^Melml&K}3ifgcw;}Qnqi}+5C--U|jg!g$#
zMQI?c=AAx@a}Xg$PUNnxMW*0R)T)xG!Eat@1N{rax;tCAQ=WcVUjj{&VfEg3QKLT)
zhEWmXwTqOzK(ZRK_Nva-61@KJJq3=9aOZLFDOZErZQv-)J@tM|5q2M_w8Em3%<W}o
z@a2WmQk(FGNu)-37_SpJo|B0yz0#pJTH|3j{T0df{E4nuF9>oLVQ^9zO5Kc&4bEkc
zF2-EewT_3@sHM$T*Uw<3%Ms!hUJuns<@f9(-2%u5^9%ADG)*3j6k^FdY#VsGLsP*3
zGLJcUa7pyhquAIV2m!hhuqBGjidr$B8}A5tn(e|W(BoD&;g9ZZ(y|@c=Fj@~=j(6;
z4~C-E)+wsYJ8hgAo#FdJfdr<`hv!jYm(EZeYOg`7|EAi(Ok3%{y4zgg$*k|Ojzg5%
zCT>FAhoF!Gzge&z=#Q#E54B?GGT`e;Sytjq$2d(QNyM<VBXzkB$-ySpfoyDAA>mAh
z@0>#g%m=}py}0AAT@O<nrR76C?430~3M>Up$Uc{aGq<?+VKe@$Fcm@3_*e!K=P<E0
z8}v1vXap!EsqNUeKpPJ4nM5D$BIBcTl4ivr9fFGLj2q=c_x@IPCGO|Broi<J|M0Io
zK9{89XK`gp64rxdy?xdi%fq$^$Zo4Hx(5pK#W^LcU)q{RR6m3mC3-oRDr<*w`rEU^
z4lwU^Ce2pq>XnZm^E9~L8|=EEgQ)CWQ5TETHk{T-d@zQyyxshycRAa0do^P#;*vAa
zCAt4zM&2GXbGCE#8I4Ct%za9hhK3qGu!jXg=+*=^uq9%{tJC)bj;V<h2aNS8N}sRK
zD)B1LTz@lyL#Y0L)D&hd!>IRrT)SDZkQ5(f#O!S{t~%0WH4`@sAct^CnrP1r4>|gJ
zGlrNT3JQP~rrc1O0|_!Ex!w1y6|@*F)FA;(uR>&bB+FsKZA~939*77)iIblQ(oOl@
z)7%e*I8!?r`;zCXnL~$e@6=|$(yF}{$}4|W=8>yCS$3>kR1gHBST8!gm6Yz5t=dN<
zMf~xr(yP&{2T`$u<nT1PWv6f5$Nr5T@2g!5xJ7=XR91sE2{r;MJufGx$E<4rVIU7{
z7BbU+LAlP(g$?Hn{;BX_e`9s#k8gZwrY#|-;Rudfg`o{L<qBC4=+V=VJHkBnx6ulH
zU?u?4F`_!b|M^-J;b{6}QARxSQrotl3`<kVKQzgK;V)Ou(N+BGHf;sQ_ucelZ72Nr
z%)Ar!-jC#hj#<64O>4unuB~)zC=q~CtJ^3tFZohrK6@G>0uS-A`ydEIcT>T?Zd}qB
z6fkER@UtagFJpO(C?{IbU7KOCy6NA_8D6o{YqTs1OjUy}Xqv;dr%<2xJF^<(y~8s)
zgu6KES7XTI6c-e|0KC+~t)_q5E&-mLmi=r(&7zOq(I;w#)c-{wOL`Agug$%ZS&1pd
z`iwB`3ifoW(iNwchkZgbIB8H7QJztIis$O0>U-F&{gz0>y>TRKogb25Xf?~PWzMa}
zOSTf%d8}nNk5G4`Tfx~<1`Cy1kUv4WQS))-jH7f$i%4I*D6FAk*Y`mxA2)1~`V(Cl
z(q+ZYi=<15AuL<v8Pt}I3ySxdM1hd9vrh-K+6Y44UkXp=JD8dH3a5Z0ur3wPxVup=
zVwgn=&yH(q*V_nz0=xgb*0>H{AG$D8gMzq^KEE=lrz%6sGa&O)v6DR1=i=V(Ps6i0
z8Cf}KZY?sIEVBJ@N`QU^Bk*0Di*O}D6a5&^-a4%asqpHub7kLXRl{i)`vSiNSUcb3
zw<@x$uV%**+zf|N)!kZf(otVY?^&`=7czgBeD!Lg;0scI$9G0T)<>9k0?osR$Q0{D
zVGLc6`|@7LBFjz}Z=BKK)bm-F)HT75Y4pL<vjzn_jegD|<$wK-o7Qja$7s*Woq$m+
z`zE+R8IIU7iNT_%Lola_-!i8MBZ8#S$Rgh%V9<Y$w4Qb)tbYg1rKr~f&Y$^Hbo_e!
zHRf#_n=db_W}a|(!_zB%{^nxZQQjDiB2Fz>yr?*=^mRte<DZC|-i5&yd&T@k&KUT7
zQqeQ2a$5AbVq0ee_c@az{O(cRv+_lTPjhsn@QuHgV_EGR7D`2H*Xy$onkYpUr+i@k
zjy^QLQLvgkOc;*X1a=EB8dwe9DvB_BLexnYKNWcK{^4Ul52@<?R*kQ3uJV0`bH_e@
z5$J4s0~nbx7;0#9I~aOlg1&ueHq^^M?Fpa*^J?0?&A(^wH{GqAT?d5VYlf<Ip&U|u
zC62w_k#O(rzGurG4`YGoNeMOzxo7OFnA|1oUhizG)sK+8i;?IUMJ7yn^yO$u2dXHS
zy=$<N6@@r7MU+oXUW`~wIu!g*b#C^hSjaC|=s0LA`o5<<&b}m|R{O|XJMkkZnUK2=
zZFCzWPZU6q7QNf5d|63yZAhXjTBjfEdJiKbA|1rQYfCRdil0Tw-AmcZNI=y6^E)^~
z3^W_q@oCemZgwx7;ue{ngL;8wePf<~M*3(pyb1vq^!AEn0!~V@_QbcR0kbD&y(Onf
zg)r|31UHQO{!iDjbUm1qq_6jB;em^XE)-3LI`xHt;sztddTwrko?C@9wk(<^$4(JS
zwVv4>1j|K}w@!*}TscxO8t(OU@%=3WSl6IrrYmESN+s}(M$^X-hH#3cTs-3Q7An=*
u1T=dD5#pH`1I1ghC=c<5qI`zE;+rD*j_v!NkL&F&ZeVU=ZCrku7WF^fT1X!N

literal 0
HcmV?d00001


From 13001924c083f5a61a1060d0ac392edbdb750eff Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@bento.schottelius.org>
Date: Mon, 20 Jan 2014 10:52:28 +0100
Subject: [PATCH 11/66] do not touch a visible file during release process

Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
---
 Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 5910ab2e..1962c96e 100644
--- a/Makefile
+++ b/Makefile
@@ -175,10 +175,12 @@ freecode-release: $(FREECODE_FILE)
 ################################################################################
 # pypi
 #
-pypi-release: man $(PYTHON_VERSION)
+PYPI_FILE=.pypi-release
+$(PYPI_FILE): man $(PYTHON_VERSION)
 	python3 setup.py sdist upload
 	touch $@
 
+pypi-release: $(PYPI_FILE)
 ################################################################################
 # archlinux
 #

From 5279b7239ce0d34c6d0a504e2ae9dd84c354df29 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@bento.schottelius.org>
Date: Mon, 20 Jan 2014 13:47:45 +0100
Subject: [PATCH 12/66] import __hostname - Thanks, Steven!

Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
---
 cdist/conf/type/__hostname/gencode-remote     | 33 +++++++++++++
 cdist/conf/type/__hostname/man.text           | 47 +++++++++++++++++++
 cdist/conf/type/__hostname/manifest           | 42 +++++++++++++++++
 cdist/conf/type/__hostname/parameter/optional |  1 +
 cdist/conf/type/__hostname/singleton          |  0
 5 files changed, 123 insertions(+)
 create mode 100755 cdist/conf/type/__hostname/gencode-remote
 create mode 100644 cdist/conf/type/__hostname/man.text
 create mode 100755 cdist/conf/type/__hostname/manifest
 create mode 100644 cdist/conf/type/__hostname/parameter/optional
 create mode 100644 cdist/conf/type/__hostname/singleton

diff --git a/cdist/conf/type/__hostname/gencode-remote b/cdist/conf/type/__hostname/gencode-remote
new file mode 100755
index 00000000..88ee069a
--- /dev/null
+++ b/cdist/conf/type/__hostname/gencode-remote
@@ -0,0 +1,33 @@
+#!/bin/sh
+#
+# 2014 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 <http://www.gnu.org/licenses/>.
+#
+
+name="$(cat "$__object/parameter/name")"
+os=$(cat "$__global/explorer/os")
+
+echo "printf '%s\n' '$name' > /etc/hostname"
+
+case "$os" in
+   debian|ubuntu)
+      echo "hostname \"$name\""
+   ;;
+   archlinux)
+      echo "hostnamectl set-hostname \"$name\""
+   ;;
+esac
diff --git a/cdist/conf/type/__hostname/man.text b/cdist/conf/type/__hostname/man.text
new file mode 100644
index 00000000..07ec1083
--- /dev/null
+++ b/cdist/conf/type/__hostname/man.text
@@ -0,0 +1,47 @@
+cdist-type__hostname(7)
+=======================
+Steven Armstrong <steven-cdist--@--armstrong.cc>
+
+
+NAME
+----
+cdist-type__hostname - set the hostname
+
+
+DESCRIPTION
+-----------
+Set's the hostname on various operating systems.
+
+
+REQUIRED PARAMETERS
+-------------------
+None.
+
+OPTIONAL PARAMETERS
+-------------------
+name::
+   The hostname to set. Defaults to the first segment of __target_host 
+   (${__target_host%%.*})
+
+
+EXAMPLES
+--------
+
+--------------------------------------------------------------------------------
+# take hostname from __target_host
+__hostname
+
+# set hostname explicitly
+__hostname --name some-static-hostname
+--------------------------------------------------------------------------------
+
+
+SEE ALSO
+--------
+- cdist-type(7)
+
+
+COPYING
+-------
+Copyright \(C) 2012 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/__hostname/manifest b/cdist/conf/type/__hostname/manifest
new file mode 100755
index 00000000..3aa6de45
--- /dev/null
+++ b/cdist/conf/type/__hostname/manifest
@@ -0,0 +1,42 @@
+#!/bin/sh
+#
+# 2012 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 <http://www.gnu.org/licenses/>.
+#
+
+# set defaults
+name="$(cat "$__object/parameter/name" 2>/dev/null \
+   || echo "${__target_host%%.*}" | tee "$__object/parameter/name")"
+
+os=$(cat "$__global/explorer/os")
+
+not_supported() {
+   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
+}
+
+case "$os" in
+   archlinux|debian|ubuntu)
+      # handled in gencode-remote
+      # FIXED: hostname setup in archlinuz via rc.local ist outdated
+      :
+   ;;
+   *)
+      not_supported
+   ;;
+esac
diff --git a/cdist/conf/type/__hostname/parameter/optional b/cdist/conf/type/__hostname/parameter/optional
new file mode 100644
index 00000000..f121bdbf
--- /dev/null
+++ b/cdist/conf/type/__hostname/parameter/optional
@@ -0,0 +1 @@
+name
diff --git a/cdist/conf/type/__hostname/singleton b/cdist/conf/type/__hostname/singleton
new file mode 100644
index 00000000..e69de29b

From 29d4f910bcc61c9e16aa11d879fc3471bf93dffc Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@bento.schottelius.org>
Date: Mon, 20 Jan 2014 13:50:42 +0100
Subject: [PATCH 13/66] do not change parameters

Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
---
 cdist/conf/type/__hostname/gencode-remote | 8 +++++++-
 cdist/conf/type/__hostname/manifest       | 6 +-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/cdist/conf/type/__hostname/gencode-remote b/cdist/conf/type/__hostname/gencode-remote
index 88ee069a..ef8eda51 100755
--- a/cdist/conf/type/__hostname/gencode-remote
+++ b/cdist/conf/type/__hostname/gencode-remote
@@ -1,6 +1,7 @@
 #!/bin/sh
 #
 # 2014 Steven Armstrong (steven-cdist at armstrong.cc)
+# 2014 Nico Schottelius (nico-cdist at schottelius.org)
 #
 # This file is part of cdist.
 #
@@ -18,7 +19,12 @@
 # along with cdist. If not, see <http://www.gnu.org/licenses/>.
 #
 
-name="$(cat "$__object/parameter/name")"
+if [ -f "$__object/parameter/name" ]; then
+    name="$(cat "$__object/parameter/name")"
+else
+    name="$__target_host"
+fi
+
 os=$(cat "$__global/explorer/os")
 
 echo "printf '%s\n' '$name' > /etc/hostname"
diff --git a/cdist/conf/type/__hostname/manifest b/cdist/conf/type/__hostname/manifest
index 3aa6de45..0544a6f9 100755
--- a/cdist/conf/type/__hostname/manifest
+++ b/cdist/conf/type/__hostname/manifest
@@ -1,6 +1,7 @@
 #!/bin/sh
 #
 # 2012 Steven Armstrong (steven-cdist at armstrong.cc)
+# 2014 Nico Schottelius (nico-cdist at schottelius.org)
 #
 # This file is part of cdist.
 #
@@ -18,10 +19,6 @@
 # along with cdist. If not, see <http://www.gnu.org/licenses/>.
 #
 
-# set defaults
-name="$(cat "$__object/parameter/name" 2>/dev/null \
-   || echo "${__target_host%%.*}" | tee "$__object/parameter/name")"
-
 os=$(cat "$__global/explorer/os")
 
 not_supported() {
@@ -33,7 +30,6 @@ not_supported() {
 case "$os" in
    archlinux|debian|ubuntu)
       # handled in gencode-remote
-      # FIXED: hostname setup in archlinuz via rc.local ist outdated
       :
    ;;
    *)

From 9123940255d2dd0ceb908e47c63a0fdbcf439fc4 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@bento.schottelius.org>
Date: Mon, 20 Jan 2014 13:51:48 +0100
Subject: [PATCH 14/66] port selection of first part into gencode-remote

Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
---
 cdist/conf/type/__hostname/gencode-remote | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cdist/conf/type/__hostname/gencode-remote b/cdist/conf/type/__hostname/gencode-remote
index ef8eda51..6760507f 100755
--- a/cdist/conf/type/__hostname/gencode-remote
+++ b/cdist/conf/type/__hostname/gencode-remote
@@ -22,7 +22,7 @@
 if [ -f "$__object/parameter/name" ]; then
     name="$(cat "$__object/parameter/name")"
 else
-    name="$__target_host"
+    name="$(echo "${__target_host%%.*}")"
 fi
 
 os=$(cat "$__global/explorer/os")

From cd6abf379ac10588a0e21949545d60c3d2a2b021 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@bento.schottelius.org>
Date: Mon, 20 Jan 2014 13:52:49 +0100
Subject: [PATCH 15/66] allow hostname -f to fail and return empty output

Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
---
 cdist/conf/explorer/hostname | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cdist/conf/explorer/hostname b/cdist/conf/explorer/hostname
index 881c910a..e1017227 100755
--- a/cdist/conf/explorer/hostname
+++ b/cdist/conf/explorer/hostname
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# 2010-2011 Nico Schottelius (nico-cdist at schottelius.org)
+# 2010-2014 Nico Schottelius (nico-cdist at schottelius.org)
 # 2012 Steven Armstrong (steven-cdist at armstrong.cc)
 #
 # This file is part of cdist.
@@ -21,5 +21,5 @@
 #
 
 if command -v hostname >/dev/null; then
-   hostname -f
+   hostname -f 2>/dev/null || true
 fi

From aee97cffd662ac21991517b6933a84409ca900b0 Mon Sep 17 00:00:00 2001
From: Steven Armstrong <steven@icarus.ethz.ch>
Date: Mon, 20 Jan 2014 14:01:29 +0100
Subject: [PATCH 16/66] install proper packages

Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
---
 cdist/conf/type/__apt_ppa/man.text                         | 7 +++++--
 cdist/conf/type/__apt_ppa/manifest                         | 6 +++---
 cdist/conf/type/__apt_ppa/parameter/default/state          | 1 +
 cdist/conf/type/__apt_ppa/parameter/{required => optional} | 0
 4 files changed, 9 insertions(+), 5 deletions(-)
 create mode 100644 cdist/conf/type/__apt_ppa/parameter/default/state
 rename cdist/conf/type/__apt_ppa/parameter/{required => optional} (100%)

diff --git a/cdist/conf/type/__apt_ppa/man.text b/cdist/conf/type/__apt_ppa/man.text
index 6a5990d5..da18e9f0 100644
--- a/cdist/conf/type/__apt_ppa/man.text
+++ b/cdist/conf/type/__apt_ppa/man.text
@@ -16,7 +16,8 @@ This cdist type allows manage ubuntu ppa repositories.
 REQUIRED PARAMETERS
 -------------------
 state::
-   The state the ppa should be in, either "present" or "absent".
+   The state the ppa should be in, either 'present' or 'absent'.
+   Defaults to 'present'
 
 
 OPTIONAL PARAMETERS
@@ -29,6 +30,8 @@ EXAMPLES
 
 --------------------------------------------------------------------------------
 # Enable a ppa repository
+__apt_ppa ppa:sans-intern/missing-bits
+# same as
 __apt_ppa ppa:sans-intern/missing-bits --state present
 
 # Disable a ppa repository
@@ -43,5 +46,5 @@ SEE ALSO
 
 COPYING
 -------
-Copyright \(C) 2011 Steven Armstrong. Free use of this software is
+Copyright \(C) 2011-2014 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/__apt_ppa/manifest b/cdist/conf/type/__apt_ppa/manifest
index e7ad0c26..2d91942b 100755
--- a/cdist/conf/type/__apt_ppa/manifest
+++ b/cdist/conf/type/__apt_ppa/manifest
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# 2011 Steven Armstrong (steven-cdist at armstrong.cc)
+# 2011-2014 Steven Armstrong (steven-cdist at armstrong.cc)
 #
 # This file is part of cdist.
 #
@@ -20,9 +20,9 @@
 
 name="$__object_id"
 
-__package python-software-properties --state present
+__package software-properties-common
 
-require="__package/python-software-properties" \
+require="__package/software-properties-common" \
    __file /usr/local/bin/remove-apt-repository \
    --source "$__type/files/remove-apt-repository" \
    --mode 0755
diff --git a/cdist/conf/type/__apt_ppa/parameter/default/state b/cdist/conf/type/__apt_ppa/parameter/default/state
new file mode 100644
index 00000000..e7f6134f
--- /dev/null
+++ b/cdist/conf/type/__apt_ppa/parameter/default/state
@@ -0,0 +1 @@
+present
diff --git a/cdist/conf/type/__apt_ppa/parameter/required b/cdist/conf/type/__apt_ppa/parameter/optional
similarity index 100%
rename from cdist/conf/type/__apt_ppa/parameter/required
rename to cdist/conf/type/__apt_ppa/parameter/optional

From 8d5357107bda2b34b1ef55725bc0666d56ce6231 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@bento.schottelius.org>
Date: Mon, 20 Jan 2014 14:07:31 +0100
Subject: [PATCH 17/66] use uname -n in hostname explorer

Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
---
 cdist/conf/explorer/hostname | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cdist/conf/explorer/hostname b/cdist/conf/explorer/hostname
index e1017227..7715c6b0 100755
--- a/cdist/conf/explorer/hostname
+++ b/cdist/conf/explorer/hostname
@@ -20,6 +20,6 @@
 #
 #
 
-if command -v hostname >/dev/null; then
-   hostname -f 2>/dev/null || true
+if command -v uname >/dev/null; then
+   uname -n
 fi

From b6bae508a8641ee6a6bba0751bf57b2d8113b4bf Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@bento.schottelius.org>
Date: Mon, 20 Jan 2014 14:26:22 +0100
Subject: [PATCH 18/66] use hostnamectl, if available, else use /etc/hostname
 and hostname

Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
---
 .../type/__hostname/explorer/has_hostnamectl  | 24 ++++++++++++++
 .../type/__hostname/explorer/hostname_file    | 26 +++++++++++++++
 cdist/conf/type/__hostname/gencode-remote     | 33 ++++++++++++-------
 cdist/conf/type/__hostname/man.text           |  5 +++
 4 files changed, 77 insertions(+), 11 deletions(-)
 create mode 100755 cdist/conf/type/__hostname/explorer/has_hostnamectl
 create mode 100755 cdist/conf/type/__hostname/explorer/hostname_file

diff --git a/cdist/conf/type/__hostname/explorer/has_hostnamectl b/cdist/conf/type/__hostname/explorer/has_hostnamectl
new file mode 100755
index 00000000..9040023d
--- /dev/null
+++ b/cdist/conf/type/__hostname/explorer/has_hostnamectl
@@ -0,0 +1,24 @@
+#!/bin/sh
+#
+# 2014 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 <http://www.gnu.org/licenses/>.
+#
+#
+# Check whether system has hostnamectl
+#
+
+command -v hostnamectl || true
diff --git a/cdist/conf/type/__hostname/explorer/hostname_file b/cdist/conf/type/__hostname/explorer/hostname_file
new file mode 100755
index 00000000..ed28c8a8
--- /dev/null
+++ b/cdist/conf/type/__hostname/explorer/hostname_file
@@ -0,0 +1,26 @@
+#!/bin/sh
+#
+# 2014 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 <http://www.gnu.org/licenses/>.
+#
+#
+# Retrieve the contents of /etc/hostname
+#
+
+if [ -f /etc/hostname ]; then
+    cat /etc/hostname
+fi
diff --git a/cdist/conf/type/__hostname/gencode-remote b/cdist/conf/type/__hostname/gencode-remote
index 6760507f..3d208cbe 100755
--- a/cdist/conf/type/__hostname/gencode-remote
+++ b/cdist/conf/type/__hostname/gencode-remote
@@ -20,20 +20,31 @@
 #
 
 if [ -f "$__object/parameter/name" ]; then
-    name="$(cat "$__object/parameter/name")"
+    name_should="$(cat "$__object/parameter/name")"
 else
-    name="$(echo "${__target_host%%.*}")"
+    name_should="$(echo "${__target_host%%.*}")"
 fi
 
 os=$(cat "$__global/explorer/os")
+name_running=$(cat "$__global/explorer/hostname")
+name_config=$(cat "$__object/explorer/hostname_file")
+has_hostnamectl=$(cat "$__object/explorer/has_hostnamectl")
 
-echo "printf '%s\n' '$name' > /etc/hostname"
+################################################################################
+# If everything is ok -> exit
+#
+if [ "$name_config" = "$name_should" -a "$name_running" = "$name_should" ]; then
+    exit 0
+fi
 
-case "$os" in
-   debian|ubuntu)
-      echo "hostname \"$name\""
-   ;;
-   archlinux)
-      echo "hostnamectl set-hostname \"$name\""
-   ;;
-esac
+################################################################################
+# Setup hostname
+#
+echo changed >> "$__messages_out"
+
+if [ "$has_hostnamectl" ]; then
+    echo "hostnamectl set-hostname '$name_should'"
+else
+    echo "hostname '$name_should'"
+    echo "printf '%s\n' '$name_should' > /etc/hostname"
+fi
diff --git a/cdist/conf/type/__hostname/man.text b/cdist/conf/type/__hostname/man.text
index 07ec1083..ac44d426 100644
--- a/cdist/conf/type/__hostname/man.text
+++ b/cdist/conf/type/__hostname/man.text
@@ -24,6 +24,11 @@ name::
    (${__target_host%%.*})
 
 
+MESSAGES
+--------
+changed::
+    Changed the hostname
+
 EXAMPLES
 --------
 

From f7c44378732ff98954ae94a8c8fe74cf632f91ed Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@bento.schottelius.org>
Date: Mon, 20 Jan 2014 14:27:26 +0100
Subject: [PATCH 19/66] ++changes

Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
---
 docs/changelog | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/changelog b/docs/changelog
index a3d5c4fd..f43131a1 100644
--- a/docs/changelog
+++ b/docs/changelog
@@ -6,6 +6,8 @@ Changelog
 
 3.0.3:
 	* Core: Enhance error message when requirement is missing object id
+	* Explorer hostname: Return host name by using uname -n
+	* New Type: __hostname (Steven Armstrong)
 
 3.0.2: 2014-01-19
 	* Documentation: Document all messages sent by types (Daniel Heule)

From e40fde92fc95bed5e97e0715413b6a21f5780a42 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@bento.schottelius.org>
Date: Mon, 20 Jan 2014 14:40:54 +0100
Subject: [PATCH 20/66] allow releases from non-master branch, if the person
 knows what he does

Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
---
 bin/build-helper | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/bin/build-helper b/bin/build-helper
index b97528f1..389e7696 100755
--- a/bin/build-helper
+++ b/bin/build-helper
@@ -207,7 +207,13 @@ eof
         # Ensure we are on the master branch
         if [ "$(git rev-parse --abbrev-ref HEAD)" != "master" ]; then
             echo "Releases are happening from the master branch, aborting"
-            exit 1
+
+            echo "Enter the magic word to release anyway"
+            read magicword
+
+            if [ "$magicword" != "iknowwhatido" ]; then
+                exit 1
+            fi
         fi
 
         # Ensure version branch exists

From f034ed60279370314fe4d2c063a45e59f5ca3c34 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@bento.schottelius.org>
Date: Mon, 20 Jan 2014 14:43:48 +0100
Subject: [PATCH 21/66] do not merge, if not coming from the master branch

Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
---
 bin/build-helper | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/bin/build-helper b/bin/build-helper
index 389e7696..6210b907 100755
--- a/bin/build-helper
+++ b/bin/build-helper
@@ -205,25 +205,30 @@ eof
         fi
 
         # Ensure we are on the master branch
+        masterbranch=yes
         if [ "$(git rev-parse --abbrev-ref HEAD)" != "master" ]; then
             echo "Releases are happening from the master branch, aborting"
 
             echo "Enter the magic word to release anyway"
             read magicword
 
-            if [ "$magicword" != "iknowwhatido" ]; then
+            if [ "$magicword" = "iknowwhatido" ]; then
+                masterbranch=no
+            else
                 exit 1
             fi
         fi
 
-        # Ensure version branch exists
-        if ! git rev-parse --verify refs/heads/$target_branch 2>/dev/null; then
-            git branch "$target_branch"
-        fi
+        if [ "$masterbranch" = yes ]; then
+            # Ensure version branch exists
+            if ! git rev-parse --verify refs/heads/$target_branch 2>/dev/null; then
+                git branch "$target_branch"
+            fi
 
-        # Merge master branch into version branch
-        git checkout "$target_branch"
-        git merge master
+            # Merge master branch into version branch
+            git checkout "$target_branch"
+            git merge master
+        fi
 
         # Verify that after the merge everything works
         "$0" check-date

From 8ed5f85f9d5559f55ea41357d61217d3405c0610 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@bento.schottelius.org>
Date: Mon, 20 Jan 2014 14:48:05 +0100
Subject: [PATCH 22/66] do not change to the masterbranch...

Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
---
 bin/build-helper | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/bin/build-helper b/bin/build-helper
index 6210b907..bfd7d31c 100755
--- a/bin/build-helper
+++ b/bin/build-helper
@@ -247,8 +247,10 @@ eof
         "$0" release-git-tag
 
         # Also merge back the version branch
-        git checkout master
-        git merge "$target_branch"
+        if [ "$masterbranch" = yes ]; then
+            git checkout master
+            git merge "$target_branch"
+        fi
 
         # Publish git changes
         make pub

From 7eabdc3cf9af4552cca183c5c4cc4e540b7a1494 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@bento.schottelius.org>
Date: Mon, 20 Jan 2014 14:56:41 +0100
Subject: [PATCH 23/66] ignore pypi-release marker

Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 63f8076a..baf9b6f2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,3 +30,4 @@ build
 .lock-*
 .git-current-branch
 .lock*
+.pypi-release

From 4bd6158260f21b3da8b355edeb5cb2a8c7e19022 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@bento.schottelius.org>
Date: Mon, 20 Jan 2014 16:19:41 +0100
Subject: [PATCH 24/66] add log from today

Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
---
 docs/dev/logs/2014-01-20.environments | 44 +++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 docs/dev/logs/2014-01-20.environments

diff --git a/docs/dev/logs/2014-01-20.environments b/docs/dev/logs/2014-01-20.environments
new file mode 100644
index 00000000..88fe42b9
--- /dev/null
+++ b/docs/dev/logs/2014-01-20.environments
@@ -0,0 +1,44 @@
+raw quote from irc
+
+16:00 < sar> telmich: btw, ich denke nicht dass man install schon zu gross bewerben 
+             sollte
+16:00 < telmich> sar: ack
+16:00 < sar> telmich: imho sollten wir erst die cdist environments implementieren, 
+             install waere dann eines davon
+16:00 < sar> config ein anderes
+16:01 < sar> foobar noch ein anderes
+16:01 < sar> es macht einfach keinen sinn auf type ebene install vs nicht-install zu 
+             unterscheiden
+16:02 < telmich> sar: environments sind bei mir noch nicht ganz im gehirn (ganicht?) 
+                 angelangt - hast du (nochmal?) kurz eine idee, was du damit meinst?
+16:02 < sar> telmich: wenn man cdist anschaut, dann macht es eigentlich folgendes:
+16:03 < sar> - definiere objekte mit hilfe von types
+16:03 < sar> - deps zwischen objekten
+16:03 < sar> - queue von objekten abarbeiten und auf $etwas anwenden
+16:03 < sar> das ist alles
+16:04 < sar> telmich: das ist eigentlich ziemlich generisch
+16:04 < sar> telmich: fuer mich wuerde es sich hier anbieten das auch so zu 
+             abstrahieren
+16:05 < sar> telmich: ein environment (nenn das mal so weil kein besserer name zzt) 
+             koennte das wie $objekt auf $etwas bestimmen
+16:05 < sar> telmich: und auch was fuer types es in diesem environment gibt
+16:06 < telmich> sar: klingt gut
+16:06 < sar> telmich: e.g. es gibt ein environment fuer config -> was wir jetzt haben
+16:06 < sar> eins fuer install -> += was im install branch ist (nur die types), den 
+             python code brauchts nacher nicht mehr
+16:07 < sar> eins fuer cisco-switch -> hat types um mit cisco zu spielen
+16:07 < sar> usw
+16:07 < sar> ein environment hat auch eigene remote-{exec,copy} scripte
+16:08 < sar> und vielleicht globale explorer, vielleicht auch nicht
+16:08 < sar> ein enviroment ist ein cconfig style directory
+16:09 < sar> wo man cdist drueber laufen laesst
+16:09 < sar> so was in der art
+16:13 < telmich> sar: hmmja...klingt gut
+16:15 < telmich> vielleicht etwas für cdist 4 oder cdist 5 :-)
+16:15 < telmich> aber ich denke auf jeden fall als grundgedanke behaltbar
+16:16 < telmich> ok für dich, wenn ich den chat ins docs/dev/logs kopiere als 
+                 erinnerungs
+16:16 < telmich> s/s$/?/?
+16:16 < telmich> s/?$//
+16:20 < sar> klar
+

From 64f4cff3cb60eccb05eb385ec7e6b09f2292ff20 Mon Sep 17 00:00:00 2001
From: Daniel Heule <hda@sfs.biz>
Date: Mon, 20 Jan 2014 20:30:37 +0100
Subject: [PATCH 25/66] Shell selection support via ENV CDIST_LOCAL_SHELL for
 local scripts CDIST_REMOTE_SHELL for remote scripts

---
 cdist/exec/local.py      |  2 +-
 cdist/exec/remote.py     |  2 +-
 cdist/shell.py           |  5 +----
 docs/man/man1/cdist.text | 14 ++++++++++----
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/cdist/exec/local.py b/cdist/exec/local.py
index 4233b874..2f75ffd4 100644
--- a/cdist/exec/local.py
+++ b/cdist/exec/local.py
@@ -188,7 +188,7 @@ class Local(object):
         Return the output as a string.
 
         """
-        command = ["/bin/sh", "-e"]
+        command = [ os.environ.get('CDIST_LOCAL_SHELL',"/bin/sh") , "-e"]
         command.append(script)
 
         return self.run(command=command, env=env, return_output=return_output, message_prefix=message_prefix)
diff --git a/cdist/exec/remote.py b/cdist/exec/remote.py
index 7c807092..9b7d5d1c 100644
--- a/cdist/exec/remote.py
+++ b/cdist/exec/remote.py
@@ -113,7 +113,7 @@ class Remote(object):
 
         """
 
-        command = ["/bin/sh", "-e"]
+        command = [ os.environ.get('CDIST_REMOTE_SHELL',"/bin/sh") , "-e"]
         command.append(script)
 
         return self.run(command, env, return_output)
diff --git a/cdist/shell.py b/cdist/shell.py
index ebf9f434..8ca68115 100644
--- a/cdist/shell.py
+++ b/cdist/shell.py
@@ -45,10 +45,7 @@ class Shell(object):
         """Select shell to execute, if not specified by user"""
 
         if not self.shell:
-            if 'SHELL' in os.environ:
-                self.shell = os.environ['SHELL']
-            else:
-                self.shell = "/bin/sh"
+            self.shell = os.environ.get('SHELL',"/bin/sh")
 
     def _init_files_dirs(self):
         self.local.create_files_dirs()
diff --git a/docs/man/man1/cdist.text b/docs/man/man1/cdist.text
index de50a4ce..e8c12991 100644
--- a/docs/man/man1/cdist.text
+++ b/docs/man/man1/cdist.text
@@ -127,10 +127,16 @@ usage: __git --source SOURCE [--state STATE] [--branch BRANCH]
 ENVIRONMENT
 -----------
 TMPDIR, TEMP, TMP::
-   Setup the base directory for the temporary directory.
-   See http://docs.python.org/py3k/library/tempfile.html for
-   more information. This is rather useful, if the standard
-   directory used does not allow executables.
+    Setup the base directory for the temporary directory.
+    See http://docs.python.org/py3k/library/tempfile.html for
+    more information. This is rather useful, if the standard
+    directory used does not allow executables.
+
+CDIST_LOCAL_SHELL::
+    Selects shell for local script execution, defaults to /bin/sh
+
+CDIST_REMOTE_SHELL::
+    Selects shell for remote scirpt execution, defaults to /bin/sh
 
 
 EXIT STATUS

From 6746ba827911b20e0f841ac53127ee4458b80d2c Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@bento.schottelius.org>
Date: Tue, 21 Jan 2014 09:16:45 +0100
Subject: [PATCH 26/66] ++changes

Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
---
 docs/changelog | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog b/docs/changelog
index f43131a1..74220980 100644
--- a/docs/changelog
+++ b/docs/changelog
@@ -6,6 +6,7 @@ Changelog
 
 3.0.3:
 	* Core: Enhance error message when requirement is missing object id
+	* Core: Add environment variable to select shell for executing scripts (Daniel Heule)
 	* Explorer hostname: Return host name by using uname -n
 	* New Type: __hostname (Steven Armstrong)
 

From 51c96624750a39c3498bc742b67d4ede5ac3cf18 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@bento.schottelius.org>
Date: Tue, 21 Jan 2014 16:41:34 +0100
Subject: [PATCH 27/66] DO NOT USE ECHO WHEN SOMETHING MAY CONTAIN A
 B-A-C-K-S-L-A-S-H

Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
---
 cdist/conf/type/__line/gencode-remote | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cdist/conf/type/__line/gencode-remote b/cdist/conf/type/__line/gencode-remote
index d4796965..1fadf454 100755
--- a/cdist/conf/type/__line/gencode-remote
+++ b/cdist/conf/type/__line/gencode-remote
@@ -58,7 +58,7 @@ case "$state_should" in
 
         # Only replace ' with '"'"' and keep \ as they are
         line_sanitised=$(cat "$__object/parameter/line" | sed -e "s/'/'\"'\"'/g")
-        echo "printf '%s\n' '$line_sanitised' >> $file"
+        printf '%s' "printf '%s\n' '$line_sanitised' >> $file"
 
     ;;
     absent)

From 520bcc29a79b7173dcd5c505e94a3a3a173210cb Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@bento.schottelius.org>
Date: Tue, 21 Jan 2014 16:43:02 +0100
Subject: [PATCH 28/66] ++changes

Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
---
 docs/changelog | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog b/docs/changelog
index 74220980..242f92b0 100644
--- a/docs/changelog
+++ b/docs/changelog
@@ -9,6 +9,7 @@ Changelog
 	* Core: Add environment variable to select shell for executing scripts (Daniel Heule)
 	* Explorer hostname: Return host name by using uname -n
 	* New Type: __hostname (Steven Armstrong)
+	* Type __line: Use printf instead of echo for printing user input
 
 3.0.2: 2014-01-19
 	* Documentation: Document all messages sent by types (Daniel Heule)

From 92e67182a65c9421dc1a65e5de545c18bca46606 Mon Sep 17 00:00:00 2001
From: Daniel Heule <hda@sfs.biz>
Date: Tue, 21 Jan 2014 22:24:35 +0100
Subject: [PATCH 29/66] parameter default handling in __cdist type corrected

---
 cdist/conf/type/__cdist/manifest               | 18 +++---------------
 .../conf/type/__cdist/parameter/default/branch |  1 +
 .../conf/type/__cdist/parameter/default/source |  1 +
 .../type/__cdist/parameter/default/username    |  1 +
 4 files changed, 6 insertions(+), 15 deletions(-)
 create mode 100644 cdist/conf/type/__cdist/parameter/default/branch
 create mode 100644 cdist/conf/type/__cdist/parameter/default/source
 create mode 100644 cdist/conf/type/__cdist/parameter/default/username

diff --git a/cdist/conf/type/__cdist/manifest b/cdist/conf/type/__cdist/manifest
index 44d62f6c..7c0ae60e 100755
--- a/cdist/conf/type/__cdist/manifest
+++ b/cdist/conf/type/__cdist/manifest
@@ -27,23 +27,11 @@ else
    shell=""
 fi
 
-if [ -f "$__object/parameter/username" ]; then
-   username="$(cat "$__object/parameter/username")"
-else
-   username="cdist"
-fi
+username="$(cat "$__object/parameter/username")"
 
-if [ -f "$__object/parameter/branch" ]; then
-   branch="$(cat "$__object/parameter/branch")"
-else
-   branch="master"
-fi
+branch="$(cat "$__object/parameter/branch")"
 
-if [ -f "$__object/parameter/source" ]; then
-   source="$(cat "$__object/parameter/source")"
-else
-   source="git://github.com/telmich/cdist.git"
-fi
+source="$(cat "$__object/parameter/source")"
 
 # Currently hardcoded - if anyone cares, make a parameter
 # out of it
diff --git a/cdist/conf/type/__cdist/parameter/default/branch b/cdist/conf/type/__cdist/parameter/default/branch
new file mode 100644
index 00000000..1f7391f9
--- /dev/null
+++ b/cdist/conf/type/__cdist/parameter/default/branch
@@ -0,0 +1 @@
+master
diff --git a/cdist/conf/type/__cdist/parameter/default/source b/cdist/conf/type/__cdist/parameter/default/source
new file mode 100644
index 00000000..d669308f
--- /dev/null
+++ b/cdist/conf/type/__cdist/parameter/default/source
@@ -0,0 +1 @@
+git://github.com/telmich/cdist.git
diff --git a/cdist/conf/type/__cdist/parameter/default/username b/cdist/conf/type/__cdist/parameter/default/username
new file mode 100644
index 00000000..a585e141
--- /dev/null
+++ b/cdist/conf/type/__cdist/parameter/default/username
@@ -0,0 +1 @@
+cdist

From 02c3fe49887d75d28d581221cf51eeaf00e66379 Mon Sep 17 00:00:00 2001
From: Daniel Heule <hda@sfs.biz>
Date: Tue, 21 Jan 2014 22:33:10 +0100
Subject: [PATCH 30/66] parameter default handling in __qemu_img type corrected

---
 cdist/conf/type/__qemu_img/gencode-remote           | 6 ++----
 cdist/conf/type/__qemu_img/manifest                 | 6 ++----
 cdist/conf/type/__qemu_img/parameter/default/format | 1 +
 cdist/conf/type/__qemu_img/parameter/default/state  | 1 +
 cdist/conf/type/__qemu_img/parameter/optional       | 1 +
 5 files changed, 7 insertions(+), 8 deletions(-)
 create mode 100644 cdist/conf/type/__qemu_img/parameter/default/format
 create mode 100644 cdist/conf/type/__qemu_img/parameter/default/state

diff --git a/cdist/conf/type/__qemu_img/gencode-remote b/cdist/conf/type/__qemu_img/gencode-remote
index 2a76cf8f..6e4bb4d0 100644
--- a/cdist/conf/type/__qemu_img/gencode-remote
+++ b/cdist/conf/type/__qemu_img/gencode-remote
@@ -2,8 +2,7 @@
 # State: absent is handled by manifest - we need only to do stuff if image is
 # not existing and state != absent
 #
-state="present"
-[ -f "$__object/parameter/state" ] && state="$(cat "$__object/parameter/state")"
+state="$(cat "$__object/parameter/state")"
 [ "$state" = "absent" ] && exit 0
 
 exists="$(cat "$__object/explorer/exists")"
@@ -13,8 +12,7 @@ exists="$(cat "$__object/explorer/exists")"
 # Still there? Create image
 #
 
-format=qcow2
-[ -f "$__object/parameter/format" ] && format="$(cat "$__object/parameter/format")"
+format="$(cat "$__object/parameter/format")"
 size="$(cat "$__object/parameter/size")"
 diskimage="/$__object_id"
 
diff --git a/cdist/conf/type/__qemu_img/manifest b/cdist/conf/type/__qemu_img/manifest
index b835301d..6d50037f 100644
--- a/cdist/conf/type/__qemu_img/manifest
+++ b/cdist/conf/type/__qemu_img/manifest
@@ -2,10 +2,8 @@
 # Default settings
 #
 
-format=qcow2
-state=present
-[ -f "$__object/parameter/format" ] && format="$(cat "$__object/parameter/format")"
-[ -f "$__object/parameter/state" ] && state="$(cat "$__object/parameter/state")"
+format="$(cat "$__object/parameter/format")"
+state="$(cat "$__object/parameter/state")"
 
 diskimage="/$__object_id"
 
diff --git a/cdist/conf/type/__qemu_img/parameter/default/format b/cdist/conf/type/__qemu_img/parameter/default/format
new file mode 100644
index 00000000..e0a90ab9
--- /dev/null
+++ b/cdist/conf/type/__qemu_img/parameter/default/format
@@ -0,0 +1 @@
+qcow2
diff --git a/cdist/conf/type/__qemu_img/parameter/default/state b/cdist/conf/type/__qemu_img/parameter/default/state
new file mode 100644
index 00000000..e7f6134f
--- /dev/null
+++ b/cdist/conf/type/__qemu_img/parameter/default/state
@@ -0,0 +1 @@
+present
diff --git a/cdist/conf/type/__qemu_img/parameter/optional b/cdist/conf/type/__qemu_img/parameter/optional
index 0e8469e7..71b9a32b 100644
--- a/cdist/conf/type/__qemu_img/parameter/optional
+++ b/cdist/conf/type/__qemu_img/parameter/optional
@@ -1 +1,2 @@
 format
+state

From 08b8270739b7a17778d5e5427d6635b65ba1484a Mon Sep 17 00:00:00 2001
From: Daniel Heule <hda@sfs.biz>
Date: Tue, 21 Jan 2014 22:45:35 +0100
Subject: [PATCH 31/66] parameter default handling in __zypper_service type
 corrected

---
 cdist/conf/type/__zypper_service/gencode-remote | 13 ++-----------
 cdist/conf/type/__zypper_service/manifest       |  6 +-----
 2 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/cdist/conf/type/__zypper_service/gencode-remote b/cdist/conf/type/__zypper_service/gencode-remote
index d11749ae..df8d1660 100644
--- a/cdist/conf/type/__zypper_service/gencode-remote
+++ b/cdist/conf/type/__zypper_service/gencode-remote
@@ -39,17 +39,8 @@ else
    uri="$__object_id"
 fi
 
-if [ -f "$__object/parameter/state" ]; then
-   state_should="$(cat "$__object/parameter/state")"
-else
-   state_should="present"
-fi
-
-if [ -f "$__object/parameter/type" ]; then
-   stype="$(cat "$__object/parameter/type")"
-else
-   stype="ris"
-fi
+state_should="$(cat "$__object/parameter/state")"
+stype="$(cat "$__object/parameter/type")"
 
 exp_uri="$(cat "$__object/explorer/service_uri")"
 exp_id="$(cat "$__object/explorer/service_id")"
diff --git a/cdist/conf/type/__zypper_service/manifest b/cdist/conf/type/__zypper_service/manifest
index d8773605..aa4a39a3 100644
--- a/cdist/conf/type/__zypper_service/manifest
+++ b/cdist/conf/type/__zypper_service/manifest
@@ -33,11 +33,7 @@ else
    uri="$__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")"
 
 exp_uri="$(cat "$__object/explorer/service_uri")"
 

From 360b42e89219d088b4bfb24db610672111f7b9bd Mon Sep 17 00:00:00 2001
From: Daniel Heule <hda@sfs.biz>
Date: Tue, 21 Jan 2014 22:57:06 +0100
Subject: [PATCH 32/66] parameter default handling in __zypper_repo type
 corrected

---
 cdist/conf/type/__zypper_repo/gencode-remote | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/cdist/conf/type/__zypper_repo/gencode-remote b/cdist/conf/type/__zypper_repo/gencode-remote
index 4d834c47..f678552b 100644
--- a/cdist/conf/type/__zypper_repo/gencode-remote
+++ b/cdist/conf/type/__zypper_repo/gencode-remote
@@ -45,11 +45,7 @@ else
    id="$__object_id"
 fi
 
-if [ -f "$__object/parameter/state" ]; then
-   state="$(cat "$__object/parameter/state")"
-else
-   state="present"
-fi
+state="$(cat "$__object/parameter/state")"
 
 repo_id="$(cat "$__object/explorer/repo_id")"
 

From b75481a4d41cb45c25cccdf2bfb053a10e7b9ede Mon Sep 17 00:00:00 2001
From: Daniel Heule <hda@sfs.biz>
Date: Tue, 21 Jan 2014 23:18:10 +0100
Subject: [PATCH 33/66] parameter default handling in __key_value type
 corrected

---
 cdist/conf/type/__key_value/gencode-remote          | 4 ++--
 cdist/conf/type/__key_value/manifest                | 3 +--
 cdist/conf/type/__key_value/parameter/default/state | 1 +
 3 files changed, 4 insertions(+), 4 deletions(-)
 create mode 100644 cdist/conf/type/__key_value/parameter/default/state

diff --git a/cdist/conf/type/__key_value/gencode-remote b/cdist/conf/type/__key_value/gencode-remote
index ec91894f..b79d9688 100755
--- a/cdist/conf/type/__key_value/gencode-remote
+++ b/cdist/conf/type/__key_value/gencode-remote
@@ -21,8 +21,8 @@
 
 key="$__object_id"
 [ -f "$__object/parameter/key" ] && key="$(cat "$__object/parameter/key")"
-state_should=present
-[ -f "$__object/parameter/state" ] && state_should="$(cat "$__object/parameter/state")"
+
+state_should="$(cat "$__object/parameter/state")"
 
 file="$(cat "$__object/parameter/file")"
 delimiter="$(cat "$__object/parameter/delimiter")"
diff --git a/cdist/conf/type/__key_value/manifest b/cdist/conf/type/__key_value/manifest
index 8ed9cc9c..56f4c874 100755
--- a/cdist/conf/type/__key_value/manifest
+++ b/cdist/conf/type/__key_value/manifest
@@ -19,8 +19,7 @@
 # along with cdist. If not, see <http://www.gnu.org/licenses/>.
 #
 
-state_should=present
-[ -f "$__object/parameter/state" ] && state_should="$(cat "$__object/parameter/state")"
+state_should="$(cat "$__object/parameter/state")"
 
 if [ "$state_should" = "present" -a ! -f "$__object/parameter/value" ]; then
    echo "Missing required parameter 'value'" >&2
diff --git a/cdist/conf/type/__key_value/parameter/default/state b/cdist/conf/type/__key_value/parameter/default/state
new file mode 100644
index 00000000..e7f6134f
--- /dev/null
+++ b/cdist/conf/type/__key_value/parameter/default/state
@@ -0,0 +1 @@
+present

From 0e49ccbf4369acc66b351b984685ad35a064de3e Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@bento.schottelius.org>
Date: Wed, 22 Jan 2014 00:44:56 +0100
Subject: [PATCH 34/66] ++changes

Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
---
 docs/changelog | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/changelog b/docs/changelog
index 242f92b0..4addc772 100644
--- a/docs/changelog
+++ b/docs/changelog
@@ -9,7 +9,12 @@ Changelog
 	* Core: Add environment variable to select shell for executing scripts (Daniel Heule)
 	* Explorer hostname: Return host name by using uname -n
 	* New Type: __hostname (Steven Armstrong)
+	* Type __cdist: Use default paremeters (Daniel Heule)
+	* Type __key_value: Use default paremeters (Daniel Heule)
 	* Type __line: Use printf instead of echo for printing user input
+	* Type __qemu_img: Use default paremeters (Daniel Heule)
+	* Type __zypper_repo: Use default paremeters (Daniel Heule)
+	* Type __zypper_service: Use default paremeters (Daniel Heule)
 
 3.0.2: 2014-01-19
 	* Documentation: Document all messages sent by types (Daniel Heule)

From 87d72dfc1a7b6c4a8c2d0bbd77c6188dac8555fa Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@bento.schottelius.org>
Date: Wed, 22 Jan 2014 00:46:35 +0100
Subject: [PATCH 35/66] release: 3.0.3

Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
---
 docs/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/changelog b/docs/changelog
index 4addc772..d4100898 100644
--- a/docs/changelog
+++ b/docs/changelog
@@ -4,7 +4,7 @@ Changelog
 	* Changes are always commented with their author in (braces)
 	* Exception: No braces means author == Nico Schottelius
 
-3.0.3:
+3.0.3: 2014-01-22
 	* Core: Enhance error message when requirement is missing object id
 	* Core: Add environment variable to select shell for executing scripts (Daniel Heule)
 	* Explorer hostname: Return host name by using uname -n

From 7a0b3cd7b7d416d16ff34f03402110b6327cf8a0 Mon Sep 17 00:00:00 2001
From: Steven Armstrong <steven@icarus.ethz.ch>
Date: Wed, 22 Jan 2014 21:21:34 +0100
Subject: [PATCH 36/66] python-software-properties still needed for older
 ubuntu versions

Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
---
 cdist/conf/type/__apt_ppa/manifest | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/cdist/conf/type/__apt_ppa/manifest b/cdist/conf/type/__apt_ppa/manifest
index 2d91942b..1d90e9c4 100755
--- a/cdist/conf/type/__apt_ppa/manifest
+++ b/cdist/conf/type/__apt_ppa/manifest
@@ -21,8 +21,9 @@
 name="$__object_id"
 
 __package software-properties-common
+__package python-software-properties
 
-require="__package/software-properties-common" \
+require="__package/software-properties-common __package/python-software-properties" \
    __file /usr/local/bin/remove-apt-repository \
    --source "$__type/files/remove-apt-repository" \
    --mode 0755

From a62e4aade352cc4786a1240ef8b5912234e1c856 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@bento.schottelius.org>
Date: Wed, 22 Jan 2014 22:07:12 +0100
Subject: [PATCH 37/66] ++changes

Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
---
 docs/changelog | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/changelog b/docs/changelog
index d4100898..d8af2cf3 100644
--- a/docs/changelog
+++ b/docs/changelog
@@ -4,6 +4,9 @@ Changelog
 	* Changes are always commented with their author in (braces)
 	* Exception: No braces means author == Nico Schottelius
 
+3.0.4:
+	* Type __apt_ppa: Install required software (Steven Armstrong)
+
 3.0.3: 2014-01-22
 	* Core: Enhance error message when requirement is missing object id
 	* Core: Add environment variable to select shell for executing scripts (Daniel Heule)

From 78be159eb789dfef83421cff5703d0b54f25c904 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@bento.schottelius.org>
Date: Mon, 27 Jan 2014 14:15:41 +0100
Subject: [PATCH 38/66] update reference: we also do not touch 'files' in the
 object

Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
---
 docs/man/cdist-reference.text.sh | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/docs/man/cdist-reference.text.sh b/docs/man/cdist-reference.text.sh
index a72452eb..5c9f603c 100755
--- a/docs/man/cdist-reference.text.sh
+++ b/docs/man/cdist-reference.text.sh
@@ -131,7 +131,8 @@ confdir/type/<name>/explorer::
 
 confdir/type/<name>/files::
     This directory is reserved for user data and will not be used
-    by cdist at any time
+    by cdist at any time. It can be used for storing supplementary
+    files (like scripts to act as a template or configuration files).
 
 out/::
     This directory contains output of cdist and is usually located
@@ -175,9 +176,16 @@ OBJECTS
 For object to object communication and tests, the following paths are
 usable within a object directory:
 
+files::
+    This directory is reserved for user data and will not be used
+    by cdist at any time. It can be used freely by the type 
+    (for instance to store template results).
 changed::
     This empty file exists in an object directory, if the object has
     code to be excuted (either remote or local)
+stdin::
+    This file exists and contains data, if data was provided on stdin 
+    when the type was called.
 
 
 ENVIRONMENT VARIABLES

From 9049a1421cfd5b5e8f4ee72e79178ab90dce681c Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@bento.schottelius.org>
Date: Mon, 27 Jan 2014 14:17:51 +0100
Subject: [PATCH 39/66] support --file - in __debconf_set_selections

Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
---
 .../conf/type/__debconf_set_selections/gencode-remote  | 10 ++++++++--
 cdist/conf/type/__debconf_set_selections/man.text      |  7 ++++++-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/cdist/conf/type/__debconf_set_selections/gencode-remote b/cdist/conf/type/__debconf_set_selections/gencode-remote
index 62be6a12..4892ec25 100755
--- a/cdist/conf/type/__debconf_set_selections/gencode-remote
+++ b/cdist/conf/type/__debconf_set_selections/gencode-remote
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# 2011 Nico Schottelius (nico-cdist at schottelius.org)
+# 2011-2014 Nico Schottelius (nico-cdist at schottelius.org)
 #
 # This file is part of cdist.
 #
@@ -21,6 +21,12 @@
 # Setup selections
 #
 
+filename"$(cat "$__object/parameter/file")"
+
+if [ "$filename" = "-" ]; then
+    filename="$__object/stdin"
+fi
+
 echo "debconf-set-selections << __file-eof"
-cat "$(cat "$__object/parameter/file")"
+cat "$(cat "$filename")"
 echo "__file-eof"
diff --git a/cdist/conf/type/__debconf_set_selections/man.text b/cdist/conf/type/__debconf_set_selections/man.text
index f1e13a8e..e36ebaa3 100644
--- a/cdist/conf/type/__debconf_set_selections/man.text
+++ b/cdist/conf/type/__debconf_set_selections/man.text
@@ -18,6 +18,7 @@ REQUIRED PARAMETERS
 -------------------
 file::
    Use the given filename as input for debconf-set-selections(1)
+   If filename is "-", read from stdin.
 
 
 EXAMPLES
@@ -29,6 +30,10 @@ __debconf_set_selections nslcd --file /path/to/file
 
 # Setup configuration for nslcd from another type
 __debconf_set_selections nslcd --file "$__type/files/preseed/nslcd"
+
+__debconf_set_selections nslcd --file - << eof
+gitolite gitolite/gituser string git
+eof
 --------------------------------------------------------------------------------
 
 
@@ -41,5 +46,5 @@ SEE ALSO
 
 COPYING
 -------
-Copyright \(C) 2011-2013 Nico Schottelius. Free use of this software is
+Copyright \(C) 2011-2014 Nico Schottelius. Free use of this software is
 granted under the terms of the GNU General Public License version 3 (GPLv3).

From 565e11b16dc53c0d887c4060940c7bffb2e581d5 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@bento.schottelius.org>
Date: Mon, 27 Jan 2014 14:18:56 +0100
Subject: [PATCH 40/66] ++changes

Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
---
 docs/changelog | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/changelog b/docs/changelog
index d8af2cf3..d9c2c8b5 100644
--- a/docs/changelog
+++ b/docs/changelog
@@ -5,7 +5,10 @@ Changelog
 	* Exception: No braces means author == Nico Schottelius
 
 3.0.4:
+	* Documentation: Update reference (files path in object space)
 	* Type __apt_ppa: Install required software (Steven Armstrong)
+	* Type __debconf_set_selections: Support --file - to read from stdin
+
 
 3.0.3: 2014-01-22
 	* Core: Enhance error message when requirement is missing object id
@@ -19,6 +22,7 @@ Changelog
 	* Type __zypper_repo: Use default paremeters (Daniel Heule)
 	* Type __zypper_service: Use default paremeters (Daniel Heule)
 
+
 3.0.2: 2014-01-19
 	* Documentation: Document all messages sent by types (Daniel Heule)
 	* New Type: __block (Steven Armstrong)

From 4ef55ef13f9172ab6bb045d5a6bfb7acec982758 Mon Sep 17 00:00:00 2001
From: Daniel Heule <hda@sfs.biz>
Date: Mon, 27 Jan 2014 16:19:01 +0100
Subject: [PATCH 41/66] allow object overrides with CDIST_ALLOW_OVERRIDE=true

---
 cdist/core/cdist_object.py        |  6 ++++--
 cdist/emulator.py                 |  5 ++++-
 docs/man/man7/cdist-manifest.text | 24 ++++++++++++++++++++++++
 3 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/cdist/core/cdist_object.py b/cdist/core/cdist_object.py
index 45b5e3ff..9ead71c7 100644
--- a/cdist/core/cdist_object.py
+++ b/cdist/core/cdist_object.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.
 #
@@ -215,9 +216,10 @@ class CdistObject(object):
         """Create this cdist object on the filesystem.
         """
         try:
-            os.makedirs(self.absolute_path, exist_ok=False)
+            cdexist_ok = True if os.environ.get('CDIST_ALLOW_OVERRIDE',"false") == 'true' else False
+            os.makedirs(self.absolute_path, exist_ok=cdexist_ok)
             absolute_parameter_path = os.path.join(self.base_path, self.parameter_path)
-            os.makedirs(absolute_parameter_path, exist_ok=False)
+            os.makedirs(absolute_parameter_path, exist_ok=cdexist_ok)
         except EnvironmentError as error:
             raise cdist.Error('Error creating directories for cdist object: %s: %s' % (self, error))
 
diff --git a/cdist/emulator.py b/cdist/emulator.py
index 63d3bbbc..0693eb35 100644
--- a/cdist/emulator.py
+++ b/cdist/emulator.py
@@ -2,6 +2,7 @@
 #
 # 2011-2013 Nico Schottelius (nico-cdist at schottelius.org)
 # 2012 Steven Armstrong (steven-cdist at armstrong.cc)
+# 2014 Daniel Heule (hda at sfs.biz)
 #
 # This file is part of cdist.
 #
@@ -144,12 +145,14 @@ class Emulator(object):
             if value is not None:
                 self.parameters[key] = value
 
-        if self.cdist_object.exists:
+        if self.cdist_object.exists and os.environ.get('CDIST_ALLOW_OVERRIDE',"false") != 'true':
             if self.cdist_object.parameters != self.parameters:
                 raise cdist.Error("Object %s already exists with conflicting parameters:\n%s: %s\n%s: %s"
                     % (self.cdist_object.name, " ".join(self.cdist_object.source), self.cdist_object.parameters, self.object_source, self.parameters)
             )
         else:
+            if self.cdist_object.exists:
+                self.log.debug('Object %s override forced with CDIST_ALLOW_OVERRIDE=true',self.cdist_object.name)
             self.cdist_object.create()
             self.cdist_object.parameters = self.parameters
 
diff --git a/docs/man/man7/cdist-manifest.text b/docs/man/man7/cdist-manifest.text
index 92d0b897..84dc36ae 100644
--- a/docs/man/man7/cdist-manifest.text
+++ b/docs/man/man7/cdist-manifest.text
@@ -161,6 +161,30 @@ __package lighttpd --state present
 require="__package/lighttpd" __package munin --state present
 --------------------------------------------------------------------------------
 
+OVERRIDES
+---------
+In some special cases, you would like to create an allready defined object 
+with different parameters. In normal situations this leads to an error in cdist.
+If you whish, you can mark this second definition of an object with 
+CDIST_ALLOW_OVERRIDE=true to tell cdist, that this object override is 
+wanted and should be accepted.
+
+--------------------------------------------------------------------------------
+# for example in the inial manifest
+
+# reate user account foobar with some hash for password
+__user foobar --password 'some_fancy_hash'
+
+# ... many statements and includes in the manifest later ...
+# somewhere in a conditionaly sourced manifest 
+# (e.g. for example only sourced if a special application is on the target host)
+
+# this leads to an error ...
+__user foobar --password 'some_other_hash' 
+
+# this tells cdist, that you know that this is an override and should be accepted
+CDIST_ALLOW_OVERRIDE=true __user foobar --password 'some_other_hash'
+--------------------------------------------------------------------------------
 
 
 SEE ALSO

From 723be34bca37e97cb7cf3d94367d5e224ec7b325 Mon Sep 17 00:00:00 2001
From: Jake Guffey <jake.guffey@eprotex.com>
Date: Mon, 27 Jan 2014 13:22:03 -0500
Subject: [PATCH 42/66] Fixed typo

Was assigning jaildir=$object/parameter/name, fixed to $object/parameter/jaildir
---
 cdist/conf/type/__jail/gencode-local  | 2 +-
 cdist/conf/type/__jail/gencode-remote | 2 +-
 cdist/conf/type/__jail/manifest       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cdist/conf/type/__jail/gencode-local b/cdist/conf/type/__jail/gencode-local
index 075a6ef1..d6384156 100755
--- a/cdist/conf/type/__jail/gencode-local
+++ b/cdist/conf/type/__jail/gencode-local
@@ -23,7 +23,7 @@
 #
 
 if [ -f "$__object/parameter/jaildir" ]; then
-   jaildir="$(cat "$__object/parameter/name")"
+   jaildir="$(cat "$__object/parameter/jaildir")"
 else
    jaildir="/usr/jail"
 fi
diff --git a/cdist/conf/type/__jail/gencode-remote b/cdist/conf/type/__jail/gencode-remote
index b044e4b0..afbb81a5 100755
--- a/cdist/conf/type/__jail/gencode-remote
+++ b/cdist/conf/type/__jail/gencode-remote
@@ -85,7 +85,7 @@ if [ -f "$__object/parameter/onboot" ]; then
 fi
 
 if [ -f "$__object/parameter/jaildir" ]; then
-   jaildir="$(cat "$__object/parameter/name")"
+   jaildir="$(cat "$__object/parameter/jaildir")"
 else
    jaildir="/usr/jail"
 fi
diff --git a/cdist/conf/type/__jail/manifest b/cdist/conf/type/__jail/manifest
index 0570d62d..cf5b7938 100755
--- a/cdist/conf/type/__jail/manifest
+++ b/cdist/conf/type/__jail/manifest
@@ -34,7 +34,7 @@ if [ ! "$os" = "freebsd" ]; then
 fi
 
 if [ -f "$__object/parameter/jaildir" ]; then
-   jaildir="$(cat "$__object/parameter/name")"
+   jaildir="$(cat "$__object/parameter/jaildir")"
 else
    jaildir="/usr/jail"
 fi

From e52a059adfbb2152d33f0cb9e7c1516db9e00188 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@bento.schottelius.org>
Date: Mon, 27 Jan 2014 19:38:26 +0100
Subject: [PATCH 43/66] ++changes

Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
---
 docs/changelog | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog b/docs/changelog
index d9c2c8b5..34e44913 100644
--- a/docs/changelog
+++ b/docs/changelog
@@ -8,6 +8,7 @@ Changelog
 	* Documentation: Update reference (files path in object space)
 	* Type __apt_ppa: Install required software (Steven Armstrong)
 	* Type __debconf_set_selections: Support --file - to read from stdin
+	* Type __jail: Fix jaildir parameter handling (Jake Guffey)
 
 
 3.0.3: 2014-01-22

From aa3e92f07b9ff91b298064ba8b6173ad0a1dcea6 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@bento.schottelius.org>
Date: Wed, 29 Jan 2014 21:08:22 +0100
Subject: [PATCH 44/66] use directory files/, not templates

Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
---
 docs/man/man7/cdist-best-practice.text | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/man/man7/cdist-best-practice.text b/docs/man/man7/cdist-best-practice.text
index e6685cad..a818be60 100644
--- a/docs/man/man7/cdist-best-practice.text
+++ b/docs/man/man7/cdist-best-practice.text
@@ -164,8 +164,8 @@ For more details consult sudoers(5)
 
 TEMPLATING
 ----------
-* create directory templates/ in your type (convention)
-* create the template as an executable file like templates/basic.conf.sh, it will output text using shell variables for the values
+* create directory files/ in your type (convention)
+* create the template as an executable file like files/basic.conf.sh, it will output text using shell variables for the values
 
 --------------------------------------------------------------------------------
 #!/bin/sh
@@ -191,7 +191,7 @@ EOF
   export ROOT='/var/www/test'
 # render the template
   mkdir -p "$__object/files"
-  "$__type/templates/basic.conf.sh" > "$__object/files/basic.conf"
+  "$__type/files/basic.conf.sh" > "$__object/files/basic.conf"
 # send the rendered template
   __file /etc/nginx/sites-available/test.conf  \
     --state present

From 16d51b3cf11b445b24189bf225d2c9b37013a4a5 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@bento.schottelius.org>
Date: Wed, 29 Jan 2014 22:40:59 +0100
Subject: [PATCH 45/66] backport ignoring install types in config mode from
 install_integration branch

Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
---
 cdist/config.py          | 6 +++++-
 cdist/core/cdist_type.py | 5 +++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/cdist/config.py b/cdist/config.py
index 3f8a7fc6..73ba4710 100644
--- a/cdist/config.py
+++ b/cdist/config.py
@@ -163,7 +163,11 @@ class Config(object):
         """Short name for object list retrieval"""
         for cdist_object in core.CdistObject.list_objects(self.local.object_path,
                                                          self.local.type_path):
-            yield cdist_object
+            if cdist_object.cdist_type.is_install:
+                self.log.debug("Running in config mode, ignoring install object: {0}".format(cdist_object))
+            else:
+                yield cdist_object
+
 
     def iterate_once(self):
         """
diff --git a/cdist/core/cdist_type.py b/cdist/core/cdist_type.py
index 46e126f9..ff1ebaec 100644
--- a/cdist/core/cdist_type.py
+++ b/cdist/core/cdist_type.py
@@ -101,6 +101,11 @@ class CdistType(object):
         """Check whether a type is a singleton."""
         return os.path.isfile(os.path.join(self.absolute_path, "singleton"))
 
+    @property
+    def is_install(self):
+        """Check whether a type is used for installation (if not: for configuration)"""
+        return os.path.isfile(os.path.join(self.absolute_path, "install"))
+
     @property
     def explorers(self):
         """Return a list of available explorers"""

From 228ed4dbd2608fc39a9dd878b44faed3b8cb5b58 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@bento.schottelius.org>
Date: Wed, 29 Jan 2014 23:19:07 +0100
Subject: [PATCH 46/66] fix typos in __debconf_set_selections

Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
---
 cdist/conf/type/__debconf_set_selections/gencode-remote | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cdist/conf/type/__debconf_set_selections/gencode-remote b/cdist/conf/type/__debconf_set_selections/gencode-remote
index 4892ec25..bb719c46 100755
--- a/cdist/conf/type/__debconf_set_selections/gencode-remote
+++ b/cdist/conf/type/__debconf_set_selections/gencode-remote
@@ -21,12 +21,12 @@
 # Setup selections
 #
 
-filename"$(cat "$__object/parameter/file")"
+filename="$(cat "$__object/parameter/file")"
 
 if [ "$filename" = "-" ]; then
     filename="$__object/stdin"
 fi
 
 echo "debconf-set-selections << __file-eof"
-cat "$(cat "$filename")"
+cat "$filename"
 echo "__file-eof"

From d5f04b26c8e2f8f9a64a0a362695f3685a4c9b4d Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@bento.schottelius.org>
Date: Wed, 29 Jan 2014 23:19:18 +0100
Subject: [PATCH 47/66] ++changes(3.0.4)

Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
---
 docs/changelog | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/changelog b/docs/changelog
index 34e44913..32b4e42e 100644
--- a/docs/changelog
+++ b/docs/changelog
@@ -4,8 +4,10 @@ Changelog
 	* Changes are always commented with their author in (braces)
 	* Exception: No braces means author == Nico Schottelius
 
-3.0.4:
+3.0.4: 2014-01-29
+	* Core: Ignore install types in config mode
 	* Documentation: Update reference (files path in object space)
+	* Documentation: Update best practise: Replaces templates/ with files/
 	* Type __apt_ppa: Install required software (Steven Armstrong)
 	* Type __debconf_set_selections: Support --file - to read from stdin
 	* Type __jail: Fix jaildir parameter handling (Jake Guffey)

From 197fabf40ac3c84f8bed89e3576b82672496bb61 Mon Sep 17 00:00:00 2001
From: Daniel Heule <hda@sfs.biz>
Date: Fri, 31 Jan 2014 17:56:55 +0100
Subject: [PATCH 48/66] added some ideas from asteven and a bit more
 description about the order in the manpage

---
 cdist/core/cdist_object.py        | 7 +++----
 cdist/emulator.py                 | 4 +++-
 docs/man/man7/cdist-manifest.text | 5 ++++-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/cdist/core/cdist_object.py b/cdist/core/cdist_object.py
index 9ead71c7..b17bd339 100644
--- a/cdist/core/cdist_object.py
+++ b/cdist/core/cdist_object.py
@@ -212,14 +212,13 @@ class CdistObject(object):
         """Checks wether this cdist object exists on the file systems."""
         return os.path.exists(self.absolute_path)
 
-    def create(self):
+    def create(self, allow_overwrite=False):
         """Create this cdist object on the filesystem.
         """
         try:
-            cdexist_ok = True if os.environ.get('CDIST_ALLOW_OVERRIDE',"false") == 'true' else False
-            os.makedirs(self.absolute_path, exist_ok=cdexist_ok)
+            os.makedirs(self.absolute_path, exist_ok=allow_overwrite)
             absolute_parameter_path = os.path.join(self.base_path, self.parameter_path)
-            os.makedirs(absolute_parameter_path, exist_ok=cdexist_ok)
+            os.makedirs(absolute_parameter_path, exist_ok=allow_overwrite)
         except EnvironmentError as error:
             raise cdist.Error('Error creating directories for cdist object: %s: %s' % (self, error))
 
diff --git a/cdist/emulator.py b/cdist/emulator.py
index 0693eb35..e32f12e0 100644
--- a/cdist/emulator.py
+++ b/cdist/emulator.py
@@ -153,7 +153,9 @@ class Emulator(object):
         else:
             if self.cdist_object.exists:
                 self.log.debug('Object %s override forced with CDIST_ALLOW_OVERRIDE=true',self.cdist_object.name)
-            self.cdist_object.create()
+                self.cdist_object.create(True)
+            else
+                self.cdist_object.create()
             self.cdist_object.parameters = self.parameters
 
         # Record / Append source
diff --git a/docs/man/man7/cdist-manifest.text b/docs/man/man7/cdist-manifest.text
index 84dc36ae..d9bcb893 100644
--- a/docs/man/man7/cdist-manifest.text
+++ b/docs/man/man7/cdist-manifest.text
@@ -163,11 +163,14 @@ require="__package/lighttpd" __package munin --state present
 
 OVERRIDES
 ---------
-In some special cases, you would like to create an allready defined object 
+In some special cases, you would like to create an already defined object 
 with different parameters. In normal situations this leads to an error in cdist.
 If you whish, you can mark this second definition of an object with 
 CDIST_ALLOW_OVERRIDE=true to tell cdist, that this object override is 
 wanted and should be accepted.
+ATTENTION: Only use this feature if you are 100% sure in which order 
+cdist encounter the affected objects, otherwhise this results 
+into an undefined situation. 
 
 --------------------------------------------------------------------------------
 # for example in the inial manifest

From 5fbac8d0baa85197216ed1e3cb3fa7262415fb40 Mon Sep 17 00:00:00 2001
From: Daniel Heule <hda@sfs.biz>
Date: Fri, 31 Jan 2014 17:59:56 +0100
Subject: [PATCH 49/66] forgot the : after the else ...

---
 cdist/emulator.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cdist/emulator.py b/cdist/emulator.py
index e32f12e0..ed846e6d 100644
--- a/cdist/emulator.py
+++ b/cdist/emulator.py
@@ -154,7 +154,7 @@ class Emulator(object):
             if self.cdist_object.exists:
                 self.log.debug('Object %s override forced with CDIST_ALLOW_OVERRIDE=true',self.cdist_object.name)
                 self.cdist_object.create(True)
-            else
+            else:
                 self.cdist_object.create()
             self.cdist_object.parameters = self.parameters
 

From 99dedc493349f25dbc6ca191c78d395472a779c8 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@bento.schottelius.org>
Date: Fri, 31 Jan 2014 21:48:09 +0100
Subject: [PATCH 50/66] examples are always the last section

Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
---
 docs/man/man7/cdist-manifest.text | 58 +++++++++++++++----------------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/docs/man/man7/cdist-manifest.text b/docs/man/man7/cdist-manifest.text
index d9bcb893..af86b7ee 100644
--- a/docs/man/man7/cdist-manifest.text
+++ b/docs/man/man7/cdist-manifest.text
@@ -129,6 +129,35 @@ from the type that is calling them. This is called "autorequirement" in
 cdist jargon.
 
 
+OVERRIDES
+---------
+In some special cases, you would like to create an already defined object 
+with different parameters. In normal situations this leads to an error in cdist.
+If you whish, you can mark this second definition of an object with 
+CDIST_ALLOW_OVERRIDE=true to tell cdist, that this object override is 
+wanted and should be accepted.
+ATTENTION: Only use this feature if you are 100% sure in which order 
+cdist encounter the affected objects, otherwhise this results 
+into an undefined situation. 
+
+--------------------------------------------------------------------------------
+# for example in the inial manifest
+
+# reate user account foobar with some hash for password
+__user foobar --password 'some_fancy_hash'
+
+# ... many statements and includes in the manifest later ...
+# somewhere in a conditionaly sourced manifest 
+# (e.g. for example only sourced if a special application is on the target host)
+
+# this leads to an error ...
+__user foobar --password 'some_other_hash' 
+
+# this tells cdist, that you know that this is an override and should be accepted
+CDIST_ALLOW_OVERRIDE=true __user foobar --password 'some_other_hash'
+--------------------------------------------------------------------------------
+
+
 EXAMPLES
 --------
 The initial manifest may for instance contain the following code:
@@ -161,35 +190,6 @@ __package lighttpd --state present
 require="__package/lighttpd" __package munin --state present
 --------------------------------------------------------------------------------
 
-OVERRIDES
----------
-In some special cases, you would like to create an already defined object 
-with different parameters. In normal situations this leads to an error in cdist.
-If you whish, you can mark this second definition of an object with 
-CDIST_ALLOW_OVERRIDE=true to tell cdist, that this object override is 
-wanted and should be accepted.
-ATTENTION: Only use this feature if you are 100% sure in which order 
-cdist encounter the affected objects, otherwhise this results 
-into an undefined situation. 
-
---------------------------------------------------------------------------------
-# for example in the inial manifest
-
-# reate user account foobar with some hash for password
-__user foobar --password 'some_fancy_hash'
-
-# ... many statements and includes in the manifest later ...
-# somewhere in a conditionaly sourced manifest 
-# (e.g. for example only sourced if a special application is on the target host)
-
-# this leads to an error ...
-__user foobar --password 'some_other_hash' 
-
-# this tells cdist, that you know that this is an override and should be accepted
-CDIST_ALLOW_OVERRIDE=true __user foobar --password 'some_other_hash'
---------------------------------------------------------------------------------
-
-
 SEE ALSO
 --------
 - cdist-tutorial(7)

From dc1a5dfd6dff5fbaeb544680e511246d653a792d Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@bento.schottelius.org>
Date: Fri, 31 Jan 2014 21:50:32 +0100
Subject: [PATCH 51/66] update override documentation

Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
---
 docs/man/man7/cdist-manifest.text | 38 +++++++++++++++++--------------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/docs/man/man7/cdist-manifest.text b/docs/man/man7/cdist-manifest.text
index af86b7ee..7292a64f 100644
--- a/docs/man/man7/cdist-manifest.text
+++ b/docs/man/man7/cdist-manifest.text
@@ -140,23 +140,7 @@ ATTENTION: Only use this feature if you are 100% sure in which order
 cdist encounter the affected objects, otherwhise this results 
 into an undefined situation. 
 
---------------------------------------------------------------------------------
-# for example in the inial manifest
-
-# reate user account foobar with some hash for password
-__user foobar --password 'some_fancy_hash'
-
-# ... many statements and includes in the manifest later ...
-# somewhere in a conditionaly sourced manifest 
-# (e.g. for example only sourced if a special application is on the target host)
-
-# this leads to an error ...
-__user foobar --password 'some_other_hash' 
-
-# this tells cdist, that you know that this is an override and should be accepted
-CDIST_ALLOW_OVERRIDE=true __user foobar --password 'some_other_hash'
---------------------------------------------------------------------------------
-
+THIS IS A BETA FEATURE AND MAY BE REMOVED AT ANY TIME.
 
 EXAMPLES
 --------
@@ -190,6 +174,26 @@ __package lighttpd --state present
 require="__package/lighttpd" __package munin --state present
 --------------------------------------------------------------------------------
 
+How to override objects:
+
+--------------------------------------------------------------------------------
+# for example in the inital manifest
+
+# reate user account foobar with some hash for password
+__user foobar --password 'some_fancy_hash'
+
+# ... many statements and includes in the manifest later ...
+# somewhere in a conditionaly sourced manifest 
+# (e.g. for example only sourced if a special application is on the target host)
+
+# this leads to an error ...
+__user foobar --password 'some_other_hash' 
+
+# this tells cdist, that you know that this is an override and should be accepted
+CDIST_ALLOW_OVERRIDE=true __user foobar --password 'some_other_hash'
+--------------------------------------------------------------------------------
+
+
 SEE ALSO
 --------
 - cdist-tutorial(7)

From ab3b15191884428689b6dd7379bea4278dd13ccd Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@bento.schottelius.org>
Date: Fri, 31 Jan 2014 21:52:43 +0100
Subject: [PATCH 52/66] ++changes

Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
---
 docs/changelog | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/changelog b/docs/changelog
index 32b4e42e..bd52bd78 100644
--- a/docs/changelog
+++ b/docs/changelog
@@ -4,6 +4,10 @@ Changelog
 	* Changes are always commented with their author in (braces)
 	* Exception: No braces means author == Nico Schottelius
 
+3.0.5:
+	* Core: Introduce override concept (Daniel Heule)
+
+
 3.0.4: 2014-01-29
 	* Core: Ignore install types in config mode
 	* Documentation: Update reference (files path in object space)

From 3a57367e7e895d3d4fe9fd761f0264df80aed0e3 Mon Sep 17 00:00:00 2001
From: Steven Armstrong <steven@icarus.ethz.ch>
Date: Sat, 1 Feb 2014 22:46:36 +0100
Subject: [PATCH 53/66] bugfix: make type actually work with --state absent

Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
---
 cdist/conf/type/__process/gencode-remote        | 17 +++++++----------
 .../conf/type/__process/parameter/default/state |  1 +
 2 files changed, 8 insertions(+), 10 deletions(-)
 create mode 100644 cdist/conf/type/__process/parameter/default/state

diff --git a/cdist/conf/type/__process/gencode-remote b/cdist/conf/type/__process/gencode-remote
index 41bc5381..639940d9 100755
--- a/cdist/conf/type/__process/gencode-remote
+++ b/cdist/conf/type/__process/gencode-remote
@@ -1,6 +1,7 @@
 #!/bin/sh
 #
 # 2011-2012 Nico Schottelius (nico-cdist at schottelius.org)
+# 2014 Steven Armstrong (steven-cdist at armstrong.cc)
 #
 # This file is part of cdist.
 #
@@ -17,7 +18,6 @@
 # You should have received a copy of the GNU General Public License
 # along with cdist. If not, see <http://www.gnu.org/licenses/>.
 #
-#
 
 if [ -f "$__object/parameter/name" ]; then
     name="$(cat "$__object/parameter/name")"
@@ -25,21 +25,18 @@ else
     name="$__object_id"
 fi
 
-parameter_state="$__object/parameter/state"
-if [ -f "$_parameter_state" ]; then
-    state_should=$(cat "$__object/parameter/state")
-else
-    state_should="present"
-fi
+state_should="$(cat "$__object/parameter/state")"
 
-runs="$(cat "$__object/explorer/runs")"
-if [ "$runs" ]; then
+if [ -s "$__object/explorer/runs" ]; then
     state_is="present"
 else
     state_is="absent"
 fi
 
-[ "$state_is" = "$state_should" ] && exit 0
+if [ "$state_is" = "$state_should" ]; then
+   # nothing to do
+   exit 0
+fi
 
 case "$state_should" in
     present)
diff --git a/cdist/conf/type/__process/parameter/default/state b/cdist/conf/type/__process/parameter/default/state
new file mode 100644
index 00000000..e7f6134f
--- /dev/null
+++ b/cdist/conf/type/__process/parameter/default/state
@@ -0,0 +1 @@
+present

From 1b455e810b449aa2dc3771595f90cfcd298ac501 Mon Sep 17 00:00:00 2001
From: Daniel Heule <hda@sfs.biz>
Date: Sun, 2 Feb 2014 20:29:41 +0100
Subject: [PATCH 54/66] clarify in the example that override don't touch
 parameter witch are not present in the 2nd call

---
 docs/man/man7/cdist-manifest.text | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/man/man7/cdist-manifest.text b/docs/man/man7/cdist-manifest.text
index 7292a64f..aa146267 100644
--- a/docs/man/man7/cdist-manifest.text
+++ b/docs/man/man7/cdist-manifest.text
@@ -180,7 +180,7 @@ How to override objects:
 # for example in the inital manifest
 
 # reate user account foobar with some hash for password
-__user foobar --password 'some_fancy_hash'
+__user foobar --password 'some_fancy_hash' --home /home/foobarexample
 
 # ... many statements and includes in the manifest later ...
 # somewhere in a conditionaly sourced manifest 
@@ -191,6 +191,8 @@ __user foobar --password 'some_other_hash'
 
 # this tells cdist, that you know that this is an override and should be accepted
 CDIST_ALLOW_OVERRIDE=true __user foobar --password 'some_other_hash'
+# its only an override, means the parameter --home is not touched 
+# and stay at the original value of /home/foobarexample
 --------------------------------------------------------------------------------
 
 

From 03ce5a28286eaf1c7bb876b0a11b51280ad6357c Mon Sep 17 00:00:00 2001
From: Steven Armstrong <steven@icarus.ethz.ch>
Date: Tue, 4 Feb 2014 12:24:10 +0100
Subject: [PATCH 55/66] import __apt_* types from private repo

Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
---
 cdist/conf/type/__apt_key/explorer/state      | 32 +++++++++
 cdist/conf/type/__apt_key/gencode-remote      | 42 +++++++++++
 cdist/conf/type/__apt_key/man.text            | 60 ++++++++++++++++
 .../__apt_key/parameter/default/keyserver     |  1 +
 .../type/__apt_key/parameter/default/state    |  1 +
 cdist/conf/type/__apt_key/parameter/optional  |  3 +
 cdist/conf/type/__apt_key_uri/explorer/state  | 32 +++++++++
 cdist/conf/type/__apt_key_uri/gencode-remote  | 45 ++++++++++++
 cdist/conf/type/__apt_key_uri/man.text        | 51 ++++++++++++++
 cdist/conf/type/__apt_key_uri/manifest        | 21 ++++++
 .../__apt_key_uri/parameter/default/state     |  1 +
 .../type/__apt_key_uri/parameter/optional     |  2 +
 .../type/__apt_key_uri/parameter/required     |  1 +
 cdist/conf/type/__apt_norecommends/man.text   | 42 +++++++++++
 cdist/conf/type/__apt_norecommends/manifest   | 40 +++++++++++
 cdist/conf/type/__apt_norecommends/singleton  |  0
 .../__apt_source/files/source.list.template   | 15 ++++
 cdist/conf/type/__apt_source/man.text         | 69 +++++++++++++++++++
 cdist/conf/type/__apt_source/manifest         | 58 ++++++++++++++++
 .../conf/type/__apt_source/parameter/boolean  |  1 +
 .../type/__apt_source/parameter/default/state |  1 +
 .../conf/type/__apt_source/parameter/optional |  4 ++
 .../conf/type/__apt_source/parameter/required |  1 +
 23 files changed, 523 insertions(+)
 create mode 100755 cdist/conf/type/__apt_key/explorer/state
 create mode 100755 cdist/conf/type/__apt_key/gencode-remote
 create mode 100644 cdist/conf/type/__apt_key/man.text
 create mode 100644 cdist/conf/type/__apt_key/parameter/default/keyserver
 create mode 100644 cdist/conf/type/__apt_key/parameter/default/state
 create mode 100644 cdist/conf/type/__apt_key/parameter/optional
 create mode 100755 cdist/conf/type/__apt_key_uri/explorer/state
 create mode 100755 cdist/conf/type/__apt_key_uri/gencode-remote
 create mode 100644 cdist/conf/type/__apt_key_uri/man.text
 create mode 100755 cdist/conf/type/__apt_key_uri/manifest
 create mode 100644 cdist/conf/type/__apt_key_uri/parameter/default/state
 create mode 100644 cdist/conf/type/__apt_key_uri/parameter/optional
 create mode 100644 cdist/conf/type/__apt_key_uri/parameter/required
 create mode 100644 cdist/conf/type/__apt_norecommends/man.text
 create mode 100755 cdist/conf/type/__apt_norecommends/manifest
 create mode 100644 cdist/conf/type/__apt_norecommends/singleton
 create mode 100755 cdist/conf/type/__apt_source/files/source.list.template
 create mode 100644 cdist/conf/type/__apt_source/man.text
 create mode 100755 cdist/conf/type/__apt_source/manifest
 create mode 100644 cdist/conf/type/__apt_source/parameter/boolean
 create mode 100644 cdist/conf/type/__apt_source/parameter/default/state
 create mode 100644 cdist/conf/type/__apt_source/parameter/optional
 create mode 100644 cdist/conf/type/__apt_source/parameter/required

diff --git a/cdist/conf/type/__apt_key/explorer/state b/cdist/conf/type/__apt_key/explorer/state
new file mode 100755
index 00000000..f7940741
--- /dev/null
+++ b/cdist/conf/type/__apt_key/explorer/state
@@ -0,0 +1,32 @@
+#!/bin/sh
+#
+# 2011-2014 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 <http://www.gnu.org/licenses/>.
+#
+#
+# Get the current state of the apt key.
+#
+
+if [ -f "$__object/parameter/keyid" ]; then
+   keyid="$(cat "$__object/parameter/keyid")"
+else
+   keyid="$__object_id"
+fi
+
+apt-key export "$keyid" | head -n 1 | grep -Fqe "BEGIN PGP PUBLIC KEY BLOCK" \
+   && echo present \
+   || echo absent
diff --git a/cdist/conf/type/__apt_key/gencode-remote b/cdist/conf/type/__apt_key/gencode-remote
new file mode 100755
index 00000000..c6ead91c
--- /dev/null
+++ b/cdist/conf/type/__apt_key/gencode-remote
@@ -0,0 +1,42 @@
+#!/bin/sh
+#
+# 2011-2014 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 <http://www.gnu.org/licenses/>.
+#
+
+if [ -f "$__object/parameter/keyid" ]; then
+   keyid="$(cat "$__object/parameter/keyid")"
+else
+   keyid="$__object_id"
+fi
+state_should="$(cat "$__object/parameter/state")"
+state_is="$(cat "$__object/explorer/state")"
+
+if [ "$state_should" = "$state_is" ]; then
+   # nothing to do
+   exit 0
+fi
+
+case "$state_should" in
+   present)
+      keyserver="$(cat "$__object/parameter/keyserver")"
+      echo "apt-key adv --keyserver \"$keyserver\" --recv-keys \"$keyid\""
+   ;;
+   absent)
+      echo "apt-key del \"$keyid\""
+   ;;
+esac
diff --git a/cdist/conf/type/__apt_key/man.text b/cdist/conf/type/__apt_key/man.text
new file mode 100644
index 00000000..d571a633
--- /dev/null
+++ b/cdist/conf/type/__apt_key/man.text
@@ -0,0 +1,60 @@
+cdist-type__apt_key(7)
+======================
+Steven Armstrong <steven-cdist--@--armstrong.cc>
+
+
+NAME
+----
+cdist-type__apt_key - manage the list of keys used by apt
+
+
+DESCRIPTION
+-----------
+Manages the list of keys used by apt to authenticate packages.
+
+
+REQUIRED PARAMETERS
+-------------------
+None.
+
+
+OPTIONAL PARAMETERS
+-------------------
+state::
+   'present' or 'absent'. Defaults to 'present'
+
+keyid::
+   the id of the key to add. Defaults to __object_id
+
+keyserver::
+   the keyserver from which to fetch the key. If omitted a sane default is used.
+
+
+EXAMPLES
+--------
+
+--------------------------------------------------------------------------------
+# Add Ubuntu Archive Automatic Signing Key
+__apt_key 437D05B5
+# Same thing
+__apt_key 437D05B5 --state present
+# Get rid of it
+__apt_key 437D05B5 --state absent
+
+# same thing with human readable name and explicit keyid
+__apt_key UbuntuArchiveKey --keyid 437D05B5
+
+# same thing with other keyserver
+__apt_key UbuntuArchiveKey --keyid 437D05B5 --keyserver keyserver.ubuntu.com
+--------------------------------------------------------------------------------
+
+
+SEE ALSO
+--------
+- cdist-type(7)
+
+
+COPYING
+-------
+Copyright \(C) 2011-2014 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/__apt_key/parameter/default/keyserver b/cdist/conf/type/__apt_key/parameter/default/keyserver
new file mode 100644
index 00000000..f851282c
--- /dev/null
+++ b/cdist/conf/type/__apt_key/parameter/default/keyserver
@@ -0,0 +1 @@
+subkeys.pgp.net
diff --git a/cdist/conf/type/__apt_key/parameter/default/state b/cdist/conf/type/__apt_key/parameter/default/state
new file mode 100644
index 00000000..e7f6134f
--- /dev/null
+++ b/cdist/conf/type/__apt_key/parameter/default/state
@@ -0,0 +1 @@
+present
diff --git a/cdist/conf/type/__apt_key/parameter/optional b/cdist/conf/type/__apt_key/parameter/optional
new file mode 100644
index 00000000..18cf2586
--- /dev/null
+++ b/cdist/conf/type/__apt_key/parameter/optional
@@ -0,0 +1,3 @@
+state
+keyid
+keyserver
diff --git a/cdist/conf/type/__apt_key_uri/explorer/state b/cdist/conf/type/__apt_key_uri/explorer/state
new file mode 100755
index 00000000..15d6e653
--- /dev/null
+++ b/cdist/conf/type/__apt_key_uri/explorer/state
@@ -0,0 +1,32 @@
+#!/bin/sh
+#
+# 2011-2014 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 <http://www.gnu.org/licenses/>.
+#
+#
+# Get the current state of the apt key.
+#
+
+if [ -f "$__object/parameter/name" ]; then
+   name="$(cat "$__object/parameter/name")"
+else
+   name="$__object_id"
+fi
+
+apt-key list | grep -Fqe "$name" \
+   && echo present \
+   || echo absent
diff --git a/cdist/conf/type/__apt_key_uri/gencode-remote b/cdist/conf/type/__apt_key_uri/gencode-remote
new file mode 100755
index 00000000..07af92ac
--- /dev/null
+++ b/cdist/conf/type/__apt_key_uri/gencode-remote
@@ -0,0 +1,45 @@
+#!/bin/sh
+#
+# 2011-2014 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 <http://www.gnu.org/licenses/>.
+#
+
+if [ -f "$__object/parameter/name" ]; then
+   name="$(cat "$__object/parameter/name")"
+else
+   name="$__object_id"
+fi
+state_should="$(cat "$__object/parameter/state")"
+state_is="$(cat "$__object/explorer/state")"
+
+if [ "$state_should" = "$state_is" ]; then
+   # nothing to do
+   exit 0
+fi
+
+case "$state_should" in
+   present)
+      uri="$(cat "$__object/parameter/uri")"
+      echo "wget -q \"$uri\" -O - | apt-key add -"
+   ;;
+   absent)
+      cat << DONE
+keyid=\$(apt-key list | grep -B1 "$name" | awk '/pub/ { print \$2 }' | cut -d'/' -f 2)
+apt-key del \$keyid
+DONE
+   ;;
+esac
diff --git a/cdist/conf/type/__apt_key_uri/man.text b/cdist/conf/type/__apt_key_uri/man.text
new file mode 100644
index 00000000..fe9c3a25
--- /dev/null
+++ b/cdist/conf/type/__apt_key_uri/man.text
@@ -0,0 +1,51 @@
+cdist-type__apt_key_uri(7)
+==========================
+Steven Armstrong <steven-cdist--@--armstrong.cc>
+
+
+NAME
+----
+cdist-type__apt_key_uri - add apt key from uri
+
+
+DESCRIPTION
+-----------
+Download a key from an uri and add it to the apt keyring.
+
+
+REQUIRED PARAMETERS
+-------------------
+uri::
+   the uri from which to download the key
+
+
+OPTIONAL PARAMETERS
+-------------------
+state::
+   'present' or 'absent', defaults to 'present'
+
+name::
+   a name for this key, used when testing if it is already installed.
+   Defaults to __object_id
+
+
+EXAMPLES
+--------
+
+--------------------------------------------------------------------------------
+__apt_key_uri rabbitmq \
+   --name 'RabbitMQ Release Signing Key <info@rabbitmq.com>' \
+   --uri http://www.rabbitmq.com/rabbitmq-signing-key-public.asc \
+   --state present
+--------------------------------------------------------------------------------
+
+
+SEE ALSO
+--------
+- cdist-type(7)
+
+
+COPYING
+-------
+Copyright \(C) 2011-2014 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/__apt_key_uri/manifest b/cdist/conf/type/__apt_key_uri/manifest
new file mode 100755
index 00000000..5dae37a7
--- /dev/null
+++ b/cdist/conf/type/__apt_key_uri/manifest
@@ -0,0 +1,21 @@
+#!/bin/sh
+#
+# 2013-2014 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 <http://www.gnu.org/licenses/>.
+#
+
+__package wget
diff --git a/cdist/conf/type/__apt_key_uri/parameter/default/state b/cdist/conf/type/__apt_key_uri/parameter/default/state
new file mode 100644
index 00000000..e7f6134f
--- /dev/null
+++ b/cdist/conf/type/__apt_key_uri/parameter/default/state
@@ -0,0 +1 @@
+present
diff --git a/cdist/conf/type/__apt_key_uri/parameter/optional b/cdist/conf/type/__apt_key_uri/parameter/optional
new file mode 100644
index 00000000..72c84b88
--- /dev/null
+++ b/cdist/conf/type/__apt_key_uri/parameter/optional
@@ -0,0 +1,2 @@
+state
+name
diff --git a/cdist/conf/type/__apt_key_uri/parameter/required b/cdist/conf/type/__apt_key_uri/parameter/required
new file mode 100644
index 00000000..c7954952
--- /dev/null
+++ b/cdist/conf/type/__apt_key_uri/parameter/required
@@ -0,0 +1 @@
+uri
diff --git a/cdist/conf/type/__apt_norecommends/man.text b/cdist/conf/type/__apt_norecommends/man.text
new file mode 100644
index 00000000..3b65e72f
--- /dev/null
+++ b/cdist/conf/type/__apt_norecommends/man.text
@@ -0,0 +1,42 @@
+cdist-type__apt_norecommends(7)
+===============================
+Steven Armstrong <steven-cdist--@--armstrong.cc>
+
+
+NAME
+----
+cdist-type__apt_norecommends - configure apt to not install recommended packages
+
+
+DESCRIPTION
+-----------
+Configure apt to not install any recommended or suggested packages.
+
+
+REQUIRED PARAMETERS
+-------------------
+None.
+
+
+OPTIONAL PARAMETERS
+-------------------
+None.
+
+
+EXAMPLES
+--------
+
+--------------------------------------------------------------------------------
+__apt_norecommends
+--------------------------------------------------------------------------------
+
+
+SEE ALSO
+--------
+- cdist-type(7)
+
+
+COPYING
+-------
+Copyright \(C) 2014 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/__apt_norecommends/manifest b/cdist/conf/type/__apt_norecommends/manifest
new file mode 100755
index 00000000..8058d52e
--- /dev/null
+++ b/cdist/conf/type/__apt_norecommends/manifest
@@ -0,0 +1,40 @@
+#!/bin/sh
+#
+# 2014 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 <http://www.gnu.org/licenses/>.
+#
+
+
+os=$(cat "$__global/explorer/os")
+
+case "$os" in
+   ubuntu|debian)
+      # No stinking recommends thank you very much.
+      # If I want something installed I will do so myself.
+      __file /etc/apt/apt.conf.d/99-no-recommends \
+         --owner root --group root --mode 644 \
+         --source - << DONE
+APT::Install-Recommends "0";
+APT::Install-Suggests "0";
+DONE
+   ;;
+   *)
+      echo "This type (${__type##*/}) makes no sense on your operating system ($os)." >&2
+      echo "If you think otherwise please submit a patch." >&2
+      exit 1
+   ;;
+esac
diff --git a/cdist/conf/type/__apt_norecommends/singleton b/cdist/conf/type/__apt_norecommends/singleton
new file mode 100644
index 00000000..e69de29b
diff --git a/cdist/conf/type/__apt_source/files/source.list.template b/cdist/conf/type/__apt_source/files/source.list.template
new file mode 100755
index 00000000..d4420e96
--- /dev/null
+++ b/cdist/conf/type/__apt_source/files/source.list.template
@@ -0,0 +1,15 @@
+#!/bin/sh
+set -u
+
+entry="$uri $distribution $component"
+cat << DONE
+# Created by cdist ${__type##*/}
+# Do not change. Changes will be overwritten.
+#
+
+# $name
+deb ${forcedarch} $entry
+DONE
+if [ -f "$__object/parameter/include-src" ]; then
+   echo "deb-src $entry"
+fi
diff --git a/cdist/conf/type/__apt_source/man.text b/cdist/conf/type/__apt_source/man.text
new file mode 100644
index 00000000..fe40a91e
--- /dev/null
+++ b/cdist/conf/type/__apt_source/man.text
@@ -0,0 +1,69 @@
+cdist-type__apt_source(7)
+=========================
+Steven Armstrong <steven-cdist--@--armstrong.cc>
+
+
+NAME
+----
+cdist-type__apt_source - manage apt sources
+
+
+DESCRIPTION
+-----------
+This cdist type allows you to manage apt sources.
+
+
+REQUIRED PARAMETERS
+-------------------
+uri::
+   the uri to the apt repository
+
+
+OPTIONAL PARAMETERS
+-------------------
+arch::
+   set this if you need to force and specific arch (ubuntu specific)
+
+state::
+   'present' or 'absent', defaults to 'present'
+
+distribution::
+   the distribution codename to use. Defaults to DISTRIB_CODENAME from
+   the targets /etc/lsb-release
+
+component::
+   space delimited list of components to enable. Defaults to 'main'.
+
+
+BOOLEAN PARAMETERS
+------------------
+include-src::
+   include deb-src entries
+
+
+EXAMPLES
+--------
+
+--------------------------------------------------------------------------------
+__apt_source rabbitmq \
+   --uri http://www.rabbitmq.com/debian/ \
+   --distribution testing \
+   --component main \
+   --include-src \
+   --state present
+
+__apt_source canonical_partner \
+   --uri http://archive.canonical.com/ \
+   --component partner --state present
+--------------------------------------------------------------------------------
+
+
+SEE ALSO
+--------
+- cdist-type(7)
+
+
+COPYING
+-------
+Copyright \(C) 2011-2014 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/__apt_source/manifest b/cdist/conf/type/__apt_source/manifest
new file mode 100755
index 00000000..b4d72a71
--- /dev/null
+++ b/cdist/conf/type/__apt_source/manifest
@@ -0,0 +1,58 @@
+#!/bin/sh
+#
+# 2011-2013 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 <http://www.gnu.org/licenses/>.
+#
+
+name="$__object_id"
+state="$(cat "$__object/parameter/state")"
+uri="$(cat "$__object/parameter/uri")"
+
+if [ -f "$__object/parameter/distribution" ]; then
+   distribution="$(cat "$__object/parameter/distribution")"
+else
+   distribution="$(cat "$__global/explorer/lsb_codename")"
+fi
+if [ -f "$__object/parameter/component" ]; then
+   component="$(cat "$__object/parameter/component")"
+else
+   # FIXME: nead to omit this for http://stat.ethz.ch/CRAN//bin/linux/ubuntu, investigate side-effects
+   #component="main"
+   component=""
+fi
+if [ -f "$__object/parameter/arch" ]; then
+   forcedarch="[arch=$(cat "$__object/parameter/arch")]"
+else
+   forcedarch=""
+fi
+
+# export variables for use in template
+export name
+export uri
+export distribution
+export component
+export forcedarch
+
+# generate file from template
+mkdir "$__object/files"
+"$__type/files/source.list.template" > "$__object/files/source.list"
+__file "/etc/apt/sources.list.d/${name}.list" \
+   --source "$__object/files/source.list" \
+   --owner root --group root --mode 0644 \
+   --state "$state"
+
+require="$__object_name" __apt_update_index
diff --git a/cdist/conf/type/__apt_source/parameter/boolean b/cdist/conf/type/__apt_source/parameter/boolean
new file mode 100644
index 00000000..8fa49177
--- /dev/null
+++ b/cdist/conf/type/__apt_source/parameter/boolean
@@ -0,0 +1 @@
+include-src
diff --git a/cdist/conf/type/__apt_source/parameter/default/state b/cdist/conf/type/__apt_source/parameter/default/state
new file mode 100644
index 00000000..e7f6134f
--- /dev/null
+++ b/cdist/conf/type/__apt_source/parameter/default/state
@@ -0,0 +1 @@
+present
diff --git a/cdist/conf/type/__apt_source/parameter/optional b/cdist/conf/type/__apt_source/parameter/optional
new file mode 100644
index 00000000..87537335
--- /dev/null
+++ b/cdist/conf/type/__apt_source/parameter/optional
@@ -0,0 +1,4 @@
+state
+distribution
+component
+arch
\ No newline at end of file
diff --git a/cdist/conf/type/__apt_source/parameter/required b/cdist/conf/type/__apt_source/parameter/required
new file mode 100644
index 00000000..c7954952
--- /dev/null
+++ b/cdist/conf/type/__apt_source/parameter/required
@@ -0,0 +1 @@
+uri

From 2363cdda47289fbefbcb9647af549829ddbc28d0 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@bento.schottelius.org>
Date: Wed, 5 Feb 2014 20:50:23 +0100
Subject: [PATCH 56/66] ++changes

Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
---
 docs/changelog | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog b/docs/changelog
index bd52bd78..f638f2a5 100644
--- a/docs/changelog
+++ b/docs/changelog
@@ -6,6 +6,7 @@ Changelog
 
 3.0.5:
 	* Core: Introduce override concept (Daniel Heule)
+	* Type __process: Make --state absent work (Steven Armstrong)
 
 
 3.0.4: 2014-01-29

From d1cc8a69999cafbce9dc91cbb81399c0f324abf5 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@bento.schottelius.org>
Date: Wed, 5 Feb 2014 20:50:59 +0100
Subject: [PATCH 57/66] document environment variables that influence cdist

Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
---
 docs/man/cdist-reference.text.sh | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/docs/man/cdist-reference.text.sh b/docs/man/cdist-reference.text.sh
index 5c9f603c..4b1906b4 100755
--- a/docs/man/cdist-reference.text.sh
+++ b/docs/man/cdist-reference.text.sh
@@ -188,8 +188,10 @@ stdin::
     when the type was called.
 
 
-ENVIRONMENT VARIABLES
----------------------
+ENVIRONMENT VARIABLES (FOR READING)
+-----------------------------------
+The following environment variables are exported by cdist:
+
 __explorer::
     Directory that contains all global explorers.
     Available for: initial manifest, explorer, type explorer, shell
@@ -227,6 +229,12 @@ __type_explorer::
     Directory that contains the type explorers.
     Available for: type explorer
 
+ENVIRONMENT VARIABLES (FOR WRITING)
+-----------------------------------
+The following environment variables influence the behaviour of cdist:
+
+CDIST_ALLOW_OVERRIDE::
+    Allow overwriting type parameters (see cdist-manifest(7))
 
 SEE ALSO
 --------

From 65b3f6c75ab7c28c725c741c403682cfb15e86f1 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@bento.schottelius.org>
Date: Wed, 5 Feb 2014 20:52:35 +0100
Subject: [PATCH 58/66] also document require variable

Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
---
 docs/man/cdist-reference.text.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/man/cdist-reference.text.sh b/docs/man/cdist-reference.text.sh
index 4b1906b4..5de59eab 100755
--- a/docs/man/cdist-reference.text.sh
+++ b/docs/man/cdist-reference.text.sh
@@ -233,6 +233,9 @@ ENVIRONMENT VARIABLES (FOR WRITING)
 -----------------------------------
 The following environment variables influence the behaviour of cdist:
 
+require::
+    Setup dependencies between objects (see cdist-manifest(7))
+
 CDIST_ALLOW_OVERRIDE::
     Allow overwriting type parameters (see cdist-manifest(7))
 

From f928072f746ed12125b20acd87251852e4366d86 Mon Sep 17 00:00:00 2001
From: Steven Armstrong <steven@icarus.ethz.ch>
Date: Wed, 5 Feb 2014 21:07:33 +0100
Subject: [PATCH 59/66] let the user decide what is sane and what not

Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
---
 cdist/conf/type/__apt_key/man.text | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/cdist/conf/type/__apt_key/man.text b/cdist/conf/type/__apt_key/man.text
index d571a633..1a33e732 100644
--- a/cdist/conf/type/__apt_key/man.text
+++ b/cdist/conf/type/__apt_key/man.text
@@ -27,7 +27,8 @@ keyid::
    the id of the key to add. Defaults to __object_id
 
 keyserver::
-   the keyserver from which to fetch the key. If omitted a sane default is used.
+   the keyserver from which to fetch the key. If omitted the default set in
+   ./parameter/default/keyserver is used.
 
 
 EXAMPLES

From 34f2f7f0389b32c1c46763eda556bd7c98abcbff Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@bento.schottelius.org>
Date: Wed, 5 Feb 2014 21:09:24 +0100
Subject: [PATCH 60/66] setting up CDIST_ALLOW_OVERRIDE to any value is ok - do
 not depend on true/yes/ja

Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
---
 cdist/emulator.py                 | 4 ++--
 docs/changelog                    | 1 +
 docs/man/man7/cdist-manifest.text | 6 +++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/cdist/emulator.py b/cdist/emulator.py
index ed846e6d..4f91cd8e 100644
--- a/cdist/emulator.py
+++ b/cdist/emulator.py
@@ -145,14 +145,14 @@ class Emulator(object):
             if value is not None:
                 self.parameters[key] = value
 
-        if self.cdist_object.exists and os.environ.get('CDIST_ALLOW_OVERRIDE',"false") != 'true':
+        if self.cdist_object.exists and not 'CDIST_ALLOW_OVERRIDE' in os.environ:
             if self.cdist_object.parameters != self.parameters:
                 raise cdist.Error("Object %s already exists with conflicting parameters:\n%s: %s\n%s: %s"
                     % (self.cdist_object.name, " ".join(self.cdist_object.source), self.cdist_object.parameters, self.object_source, self.parameters)
             )
         else:
             if self.cdist_object.exists:
-                self.log.debug('Object %s override forced with CDIST_ALLOW_OVERRIDE=true',self.cdist_object.name)
+                self.log.debug('Object %s override forced with CDIST_ALLOW_OVERRIDE',self.cdist_object.name)
                 self.cdist_object.create(True)
             else:
                 self.cdist_object.create()
diff --git a/docs/changelog b/docs/changelog
index f638f2a5..14e34b3d 100644
--- a/docs/changelog
+++ b/docs/changelog
@@ -7,6 +7,7 @@ Changelog
 3.0.5:
 	* Core: Introduce override concept (Daniel Heule)
 	* Type __process: Make --state absent work (Steven Armstrong)
+	* Documentation: Add documentation for influencing variables
 
 
 3.0.4: 2014-01-29
diff --git a/docs/man/man7/cdist-manifest.text b/docs/man/man7/cdist-manifest.text
index aa146267..7f1b95dc 100644
--- a/docs/man/man7/cdist-manifest.text
+++ b/docs/man/man7/cdist-manifest.text
@@ -133,8 +133,8 @@ OVERRIDES
 ---------
 In some special cases, you would like to create an already defined object 
 with different parameters. In normal situations this leads to an error in cdist.
-If you whish, you can mark this second definition of an object with 
-CDIST_ALLOW_OVERRIDE=true to tell cdist, that this object override is 
+If you whish, you can setup the environment variable CDIST_ALLOW_OVERRIDE
+(any value or even empty is ok) to tell cdist, that this object override is 
 wanted and should be accepted.
 ATTENTION: Only use this feature if you are 100% sure in which order 
 cdist encounter the affected objects, otherwhise this results 
@@ -190,7 +190,7 @@ __user foobar --password 'some_fancy_hash' --home /home/foobarexample
 __user foobar --password 'some_other_hash' 
 
 # this tells cdist, that you know that this is an override and should be accepted
-CDIST_ALLOW_OVERRIDE=true __user foobar --password 'some_other_hash'
+CDIST_ALLOW_OVERRIDE=yes __user foobar --password 'some_other_hash'
 # its only an override, means the parameter --home is not touched 
 # and stay at the original value of /home/foobarexample
 --------------------------------------------------------------------------------

From 14a112fcce283d38a43cd9a94575f61e68aa195a Mon Sep 17 00:00:00 2001
From: Steven Armstrong <steven@icarus.ethz.ch>
Date: Wed, 5 Feb 2014 21:12:22 +0100
Subject: [PATCH 61/66] /wget/curl/

Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
---
 cdist/conf/type/__apt_key_uri/gencode-remote | 2 +-
 cdist/conf/type/__apt_key_uri/manifest       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cdist/conf/type/__apt_key_uri/gencode-remote b/cdist/conf/type/__apt_key_uri/gencode-remote
index 07af92ac..078b8695 100755
--- a/cdist/conf/type/__apt_key_uri/gencode-remote
+++ b/cdist/conf/type/__apt_key_uri/gencode-remote
@@ -34,7 +34,7 @@ fi
 case "$state_should" in
    present)
       uri="$(cat "$__object/parameter/uri")"
-      echo "wget -q \"$uri\" -O - | apt-key add -"
+      printf 'curl -s -L "%s" | apt-key add -\n' "$uri"
    ;;
    absent)
       cat << DONE
diff --git a/cdist/conf/type/__apt_key_uri/manifest b/cdist/conf/type/__apt_key_uri/manifest
index 5dae37a7..8dddde56 100755
--- a/cdist/conf/type/__apt_key_uri/manifest
+++ b/cdist/conf/type/__apt_key_uri/manifest
@@ -18,4 +18,4 @@
 # along with cdist. If not, see <http://www.gnu.org/licenses/>.
 #
 
-__package wget
+__package curl

From 7686a5ac5e14f4368b81a7d00b7dc5b46f21ae10 Mon Sep 17 00:00:00 2001
From: Steven Armstrong <steven@icarus.ethz.ch>
Date: Wed, 5 Feb 2014 21:17:15 +0100
Subject: [PATCH 62/66] be nice to them users

Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
---
 cdist/conf/type/__apt_norecommends/manifest | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/cdist/conf/type/__apt_norecommends/manifest b/cdist/conf/type/__apt_norecommends/manifest
index 8058d52e..881c2427 100755
--- a/cdist/conf/type/__apt_norecommends/manifest
+++ b/cdist/conf/type/__apt_norecommends/manifest
@@ -33,8 +33,10 @@ APT::Install-Suggests "0";
 DONE
    ;;
    *)
-      echo "This type (${__type##*/}) makes no sense on your operating system ($os)." >&2
-      echo "If you think otherwise please submit a patch." >&2
+      cat >&2 << DONE
+The developer of this type (${__type##*/}) did not think your operating system
+($os) would have any use for it. If you think otherwise please submit a patch.
+DONE
       exit 1
    ;;
 esac

From 6f0459f3c57607bb4b37ca6ae579f54ffd83c419 Mon Sep 17 00:00:00 2001
From: Steven Armstrong <steven@icarus.ethz.ch>
Date: Wed, 5 Feb 2014 21:18:47 +0100
Subject: [PATCH 63/66] remove legacy FIXME

Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
---
 cdist/conf/type/__apt_source/man.text | 2 +-
 cdist/conf/type/__apt_source/manifest | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/cdist/conf/type/__apt_source/man.text b/cdist/conf/type/__apt_source/man.text
index fe40a91e..03b2b311 100644
--- a/cdist/conf/type/__apt_source/man.text
+++ b/cdist/conf/type/__apt_source/man.text
@@ -32,7 +32,7 @@ distribution::
    the targets /etc/lsb-release
 
 component::
-   space delimited list of components to enable. Defaults to 'main'.
+   space delimited list of components to enable. Defaults to an empty string.
 
 
 BOOLEAN PARAMETERS
diff --git a/cdist/conf/type/__apt_source/manifest b/cdist/conf/type/__apt_source/manifest
index b4d72a71..0e782716 100755
--- a/cdist/conf/type/__apt_source/manifest
+++ b/cdist/conf/type/__apt_source/manifest
@@ -30,8 +30,6 @@ fi
 if [ -f "$__object/parameter/component" ]; then
    component="$(cat "$__object/parameter/component")"
 else
-   # FIXME: nead to omit this for http://stat.ethz.ch/CRAN//bin/linux/ubuntu, investigate side-effects
-   #component="main"
    component=""
 fi
 if [ -f "$__object/parameter/arch" ]; then

From c663d87ba6e8db478b86478193b48364dc349428 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@bento.schottelius.org>
Date: Wed, 5 Feb 2014 22:53:45 +0100
Subject: [PATCH 64/66] release 3.0.5

Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
---
 docs/changelog | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/changelog b/docs/changelog
index 14e34b3d..5ce2e288 100644
--- a/docs/changelog
+++ b/docs/changelog
@@ -4,10 +4,11 @@ Changelog
 	* Changes are always commented with their author in (braces)
 	* Exception: No braces means author == Nico Schottelius
 
-3.0.5:
+
+3.0.5: 2014-02-05
 	* Core: Introduce override concept (Daniel Heule)
 	* Type __process: Make --state absent work (Steven Armstrong)
-	* Documentation: Add documentation for influencing variables
+	* Documentation: Update documentation for environment variables
 
 
 3.0.4: 2014-01-29

From 2e6a8275130a1cb7657c0ed21b8651776e1006b6 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@bento.schottelius.org>
Date: Wed, 5 Feb 2014 23:15:56 +0100
Subject: [PATCH 65/66] ++changes

Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
---
 docs/changelog | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/docs/changelog b/docs/changelog
index 5ce2e288..9c222384 100644
--- a/docs/changelog
+++ b/docs/changelog
@@ -5,6 +5,13 @@ Changelog
 	* Exception: No braces means author == Nico Schottelius
 
 
+3.0.6:
+	* New Type: __apt_key (Steven Armstrong)
+	* New Type: __apt_key_uri (Steven Armstrong)
+	* New Type: __apt_norecommends (Steven Armstrong)
+	* New Type: __apt_source (Steven Armstrong)
+
+
 3.0.5: 2014-02-05
 	* Core: Introduce override concept (Daniel Heule)
 	* Type __process: Make --state absent work (Steven Armstrong)

From 294285c164fdb212ea2fc6277c97fc877e889cb2 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@bento.schottelius.org>
Date: Thu, 6 Feb 2014 00:08:40 +0100
Subject: [PATCH 66/66] import __ccollect_source type

Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
---
 .../type/__ccollect_source/explorer/cksum     | 34 +++++++
 .../conf/type/__ccollect_source/explorer/stat | 47 ++++++++++
 .../conf/type/__ccollect_source/explorer/type | 33 +++++++
 .../type/__ccollect_source/gencode-remote     | 93 +++++++++++++++++++
 cdist/conf/type/__ccollect_source/man.text    | 64 +++++++++++++
 cdist/conf/type/__ccollect_source/manifest    | 53 +++++++++++
 .../type/__ccollect_source/parameter/boolean  |  1 +
 .../parameter/default/ccollectconf            |  1 +
 .../__ccollect_source/parameter/default/state |  1 +
 .../type/__ccollect_source/parameter/optional |  2 +
 .../parameter/optional_multiple               |  1 +
 .../type/__ccollect_source/parameter/required |  2 +
 12 files changed, 332 insertions(+)
 create mode 100755 cdist/conf/type/__ccollect_source/explorer/cksum
 create mode 100755 cdist/conf/type/__ccollect_source/explorer/stat
 create mode 100755 cdist/conf/type/__ccollect_source/explorer/type
 create mode 100755 cdist/conf/type/__ccollect_source/gencode-remote
 create mode 100644 cdist/conf/type/__ccollect_source/man.text
 create mode 100755 cdist/conf/type/__ccollect_source/manifest
 create mode 100644 cdist/conf/type/__ccollect_source/parameter/boolean
 create mode 100644 cdist/conf/type/__ccollect_source/parameter/default/ccollectconf
 create mode 100644 cdist/conf/type/__ccollect_source/parameter/default/state
 create mode 100644 cdist/conf/type/__ccollect_source/parameter/optional
 create mode 100644 cdist/conf/type/__ccollect_source/parameter/optional_multiple
 create mode 100644 cdist/conf/type/__ccollect_source/parameter/required

diff --git a/cdist/conf/type/__ccollect_source/explorer/cksum b/cdist/conf/type/__ccollect_source/explorer/cksum
new file mode 100755
index 00000000..335e4e7a
--- /dev/null
+++ b/cdist/conf/type/__ccollect_source/explorer/cksum
@@ -0,0 +1,34 @@
+#!/bin/sh
+#
+# 2011-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 <http://www.gnu.org/licenses/>.
+#
+#
+# Retrieve the md5sum of a file to be created, if it is already existing.
+#
+
+destination="/$__object_id"
+
+if [ -e "$destination" ]; then
+    if [ -f  "$destination" ]; then
+        cksum < "$destination"
+    else
+        echo "NO REGULAR FILE"
+    fi
+else
+    echo "NO FILE FOUND, NO CHECKSUM CALCULATED."
+fi
diff --git a/cdist/conf/type/__ccollect_source/explorer/stat b/cdist/conf/type/__ccollect_source/explorer/stat
new file mode 100755
index 00000000..298221b7
--- /dev/null
+++ b/cdist/conf/type/__ccollect_source/explorer/stat
@@ -0,0 +1,47 @@
+#!/bin/sh
+#
+# 2013 Steven Armstrong (steven-cdist 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 <http://www.gnu.org/licenses/>.
+#
+
+destination="/$__object_id"
+
+# nothing to work with, nothing we could do
+[ -e "$destination" ] || exit 0
+
+os=$("$__explorer/os")
+case "$os" in
+   "freebsd")
+      # FIXME: should be something like this based on man page, but can not test
+      stat -f "type: %ST
+owner: %Du %Su
+group: %Dg %Sg
+mode: %Op %Sp
+size: %Dz
+links: %Dl
+" "$destination"
+   ;;
+   *)
+      stat --printf="type: %F
+owner: %u %U
+group: %g %G
+mode: %a %A
+size: %s
+links: %h
+" "$destination"
+   ;;
+esac
diff --git a/cdist/conf/type/__ccollect_source/explorer/type b/cdist/conf/type/__ccollect_source/explorer/type
new file mode 100755
index 00000000..e723047c
--- /dev/null
+++ b/cdist/conf/type/__ccollect_source/explorer/type
@@ -0,0 +1,33 @@
+#!/bin/sh
+#
+# 2013 Steven Armstrong (steven-cdist 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 <http://www.gnu.org/licenses/>.
+#
+
+destination="/$__object_id"
+
+if [ ! -e "$destination" ]; then
+   echo none
+elif [ -h "$destination" ]; then
+   echo symlink
+elif [ -f "$destination" ]; then
+   echo file
+elif [ -d "$destination" ]; then
+   echo directory
+else
+   echo unknown
+fi
diff --git a/cdist/conf/type/__ccollect_source/gencode-remote b/cdist/conf/type/__ccollect_source/gencode-remote
new file mode 100755
index 00000000..c41b5179
--- /dev/null
+++ b/cdist/conf/type/__ccollect_source/gencode-remote
@@ -0,0 +1,93 @@
+#!/bin/sh
+#
+# 2014 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 <http://www.gnu.org/licenses/>.
+#
+
+destination="/$__object_id"
+state_should="$(cat "$__object/parameter/state")"
+type="$(cat "$__object/explorer/type")"
+stat_file="$__object/explorer/stat"
+
+
+get_current_value() {
+    if [ -s "$stat_file" ]; then
+        _name="$1"
+        _value="$2"
+        case "$_value" in
+            [0-9]*)
+                _index=2
+            ;;
+            *)
+                _index=3
+            ;;
+        esac
+        awk '/'"$_name"':/ { print $'$_index' }' "$stat_file"
+        unset _name _value _index
+    fi
+}
+
+set_group() {
+    echo chgrp \"$1\" \"$destination\"
+    echo chgrp $1 >> "$__messages_out"
+}
+
+set_owner() {
+    echo chown \"$1\" \"$destination\"
+    echo chown $1 >> "$__messages_out"
+}
+
+set_mode() {
+   echo chmod \"$1\" \"$destination\"
+   echo chmod $1 >> "$__messages_out"
+}
+
+set_attributes=
+case "$state_should" in
+    present|exists)
+    # Note: Mode - needs to happen last as a chown/chgrp can alter mode by
+    #  clearing S_ISUID and S_ISGID bits (see chown(2))
+    for attribute in group owner mode; do
+        if [ -f "$__object/parameter/$attribute" ]; then
+            value_should="$(cat "$__object/parameter/$attribute")"
+
+            # change 0xxx format to xxx format => same as stat returns
+            if [ "$attribute" = mode ]; then
+                value_should="$(echo $value_should | sed 's/^0\(...\)/\1/')"
+            fi
+            
+            value_is="$(get_current_value "$attribute" "$value_should")"
+            if [ -f "$__object/files/set-attributes" -o "$value_should" != "$value_is" ]; then
+                "set_$attribute" "$value_should"
+            fi
+        fi
+    done
+
+    ;;
+
+    absent)
+        if [ "$type" = "file" ]; then
+            echo rm -f \"$destination\"
+            echo remove >> "$__messages_out"
+        fi
+    ;;
+
+    *)
+        echo "Unknown state: $state_should" >&2
+        exit 1
+    ;;
+esac
diff --git a/cdist/conf/type/__ccollect_source/man.text b/cdist/conf/type/__ccollect_source/man.text
new file mode 100644
index 00000000..32a7467e
--- /dev/null
+++ b/cdist/conf/type/__ccollect_source/man.text
@@ -0,0 +1,64 @@
+cdist-type__ccollect_source(7)
+==============================
+Nico Schottelius <nico-cdist--@--schottelius.org>
+
+
+NAME
+----
+cdist-type__ccollect_source - Manage ccollect sources
+
+
+DESCRIPTION
+-----------
+This cdist type allows you to create or delete ccollect sources.
+
+REQUIRED PARAMETERS
+-------------------
+source::
+    The source from which to backup
+destination::
+    The destination directory
+
+
+OPTIONAL PARAMETERS
+-------------------
+state::
+    'present' or 'absent', defaults to 'present'
+ccollectconf::
+    The CCOLLECT_CONF directory. Defaults to /etc/ccollect.
+
+
+OPTIONAL MULTIPLE PARAMETERS
+----------------------------
+exclude::
+    Paths to exclude of backup
+
+BOOLEAN PARAMETERS
+------------------
+verbose::
+    Whether to report backup verbosely
+
+EXAMPLES
+--------
+
+--------------------------------------------------------------------------------
+__ccollect_source doc.ungleich.ch \
+    --source doc.ungleich.ch:/ \
+    --destination /backup/doc.ungleich.ch \
+    --exclude '/proc/*' --exclude '/sys/*' \
+    --verbose
+
+--------------------------------------------------------------------------------
+
+
+SEE ALSO
+--------
+- cdist-type(7)
+- ccollect(1)
+- http://www.nico.schottelius.org/software/ccollect/
+
+
+COPYING
+-------
+Copyright \(C) 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/__ccollect_source/manifest b/cdist/conf/type/__ccollect_source/manifest
new file mode 100755
index 00000000..89c2ef2b
--- /dev/null
+++ b/cdist/conf/type/__ccollect_source/manifest
@@ -0,0 +1,53 @@
+#!/bin/sh
+#
+# 2014 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 <http://www.gnu.org/licenses/>.
+#
+
+name="$__object_id"
+state="$(cat "$__object/parameter/state")"
+source="$(cat "$__object/parameter/source")"
+destination="$(cat "$__object/parameter/destination")"
+ccollectconf="$(cat "$__object/parameter/ccollectconf" | sed 's,/$,,')"
+
+sourcedir="$ccollectconf/sources"
+basedir="$sourcedir/$name"
+
+destination_file="$basedir/destination"
+source_file="$basedir/source"
+exclude_file="$basedir/exclude"
+verbose_file="$basedir/verbose"
+
+__directory "$basedir" --state "$state"
+
+export require="__directory$basedir"
+echo "$destination" | __file "$destination_file" --source - --state "$state"
+echo "$source" | __file "$source_file" --source - --state "$state"
+
+################################################################################
+# Booleans
+if [ -f "$__object/parameter/verbose" ]; then
+    verbosestate="present"
+else
+    verbosestate="absent"
+fi
+__file "$verbose_file" --state "$verbosestate"
+
+if [ -f "$__object/parameter/exclude" ]; then
+    __file "$exclude_file" --source - --state "$state" \
+        < "$__object/parameter/exclude"
+fi
diff --git a/cdist/conf/type/__ccollect_source/parameter/boolean b/cdist/conf/type/__ccollect_source/parameter/boolean
new file mode 100644
index 00000000..c00ee94a
--- /dev/null
+++ b/cdist/conf/type/__ccollect_source/parameter/boolean
@@ -0,0 +1 @@
+verbose
diff --git a/cdist/conf/type/__ccollect_source/parameter/default/ccollectconf b/cdist/conf/type/__ccollect_source/parameter/default/ccollectconf
new file mode 100644
index 00000000..a9fda009
--- /dev/null
+++ b/cdist/conf/type/__ccollect_source/parameter/default/ccollectconf
@@ -0,0 +1 @@
+/etc/ccollect
diff --git a/cdist/conf/type/__ccollect_source/parameter/default/state b/cdist/conf/type/__ccollect_source/parameter/default/state
new file mode 100644
index 00000000..e7f6134f
--- /dev/null
+++ b/cdist/conf/type/__ccollect_source/parameter/default/state
@@ -0,0 +1 @@
+present
diff --git a/cdist/conf/type/__ccollect_source/parameter/optional b/cdist/conf/type/__ccollect_source/parameter/optional
new file mode 100644
index 00000000..0249d11e
--- /dev/null
+++ b/cdist/conf/type/__ccollect_source/parameter/optional
@@ -0,0 +1,2 @@
+ccollectconf
+state
diff --git a/cdist/conf/type/__ccollect_source/parameter/optional_multiple b/cdist/conf/type/__ccollect_source/parameter/optional_multiple
new file mode 100644
index 00000000..9ba870ea
--- /dev/null
+++ b/cdist/conf/type/__ccollect_source/parameter/optional_multiple
@@ -0,0 +1 @@
+exclude
diff --git a/cdist/conf/type/__ccollect_source/parameter/required b/cdist/conf/type/__ccollect_source/parameter/required
new file mode 100644
index 00000000..9239646e
--- /dev/null
+++ b/cdist/conf/type/__ccollect_source/parameter/required
@@ -0,0 +1,2 @@
+source
+destination