Merge branch 'master' into 4.0-pre-not-stable

Makefile

@@ -99,7 +99,7 @@ man-dist: man check-date
 	cp ${MAN7DSTDIR}/*.html ${MAN7DSTDIR}/*.css ${MANWEBDIR}/man7
 	cd ${MANWEBDIR} && git add . && git commit -m "cdist manpages update: $(CHANGELOG_VERSION)" || true
 
-man-fix-link: web-pub
+man-latest-link: web-pub
 	# Fix ikiwiki, which does not like symlinks for pseudo security
 	ssh tee.schottelius.org \
     	"cd /home/services/www/nico/www.nico.schottelius.org/www/software/cdist/man && rm -f latest && ln -sf "$(CHANGELOG_VERSION)" latest"
@@ -146,7 +146,8 @@ web-dist: web-blog web-doc
 web-pub: web-dist man-dist speeches-dist
 	cd "${WEBDIR}" && make pub
 
-web-release-all: man-fix-link
+web-release-all: man-latest-link
+web-release-all-no-latest: web-pub
 
 ################################################################################
 # Release: Mailinglist

bin/build-helper

@@ -256,7 +256,11 @@ eof
         make pub
 
         # publish man, speeches, website
-        make web-release-all
+        if [ "$masterbranch" = yes ]; then
+            make web-release-all
+        else
+            make web-release-all-no-latest
+        fi
 
         # Ensure that pypi release has the right version
         "$0" version

cdist/conf/type/__git/manifest

@@ -24,6 +24,9 @@
 __package git --state present
 
 state_should="$(cat "$__object/parameter/state")"
+owner="$(cat "$__object/parameter/owner")"
+group="$(cat "$__object/parameter/group")"
+mode="$(cat "$__object/parameter/mode")"
 
 # Let __directory handle removal of git repos
 
@@ -33,7 +36,10 @@ case "$state_should" in
     ;;
 
     absent)
-        __directory "$__object_id" --state absent
+        __directory "$__object_id" --state absent \
+            --owner "$owner" \
+            --group "$group" \
+            --mode "$mode"
     ;;
 
     *)

docs/changelog

@@ -12,6 +12,9 @@ Changelog
 	* Core: Integrate initial preos support
 
 
+3.0.10:
+	* Type __git: Pass onwer/group/mode values to __directory
+
 3.0.9: 2014-02-14
 	* Core: Ignore order dependencies if override is set (Daniel Heule)
 	* Core: Improve Mac OS X support for unit tests (Steven Armstrong)

docs/dev/logs/2014-02-13.discussion

@@ -0,0 +1,86 @@
+With Steven
+
+t marker .cdist breaks
+    - use random marker that starts with .cdist-
+    - has fixed number of following characters (like 6 or 10)
+    - write marker name to $__global/marker
+    - export $__global/marker path as $__marker 
+    - document variable in cdist-reference
+        - also document the pattern how the marker is built
+          so that other people may be able to dig into the structure
+          from outside
+
+t save method
+    - in $__global/method
+    - values
+        - config
+        - install
+    - document path and description in cdist-reference
+
+t save whole runtime in cache
+    - missing items
+        - initial manifest may be specified on commandline
+            - always save the initial manifest to $__global/initial-manifest
+                - currently it is a lost tempfile
+        - remote exec / remote copy
+            - save to $__global/remote_exec
+            - save to $__global/remote_copy
+    - stdout and stderr of everything
+        - need to implement Steven's patch of stderr/stdout capturing
+    - exit code of cdist
+    - if it is complete, we can use it for replay / reconfigure
+
+- new idea: replay / reconfig / reinstall
+    - --from-cache?
+
+t stderr/stdout
+    - capture all messages
+    - prefix with target_host
+    - implementation exists in one of Steven's branches
+        - ping steven for updated pull request
+
+x on error dump all information about the failing object
+    - where created
+    - stderr
+    - stdout
+    - parameter (+values)
+    - everything known [tm]
+
+t multiple versions of cache
+    - see #298
+
+t absolute path of types, explorer
+    - resolve instead of using the temporary link name
+    - #305
+
+t report command
+    - from cache?
+    - #306
+
+t add session to "run directories"
+    - instead of /var/lib/cdist (remote)
+    - instead of static dir in cache 
+    - same id remote and local
+    - maybe timestamp
+        - in or excluding the pid of cdist?
+
+- cache
+    - also save when cdist fails
+    - save exit code
+    - be able to restore config
+
+- new command: cdist clean-cache
+    - --since
+    - --keep-versions --keep-lala $num
+
+- cdist 4.0.0pre2
+    - cleanup in preos
+
+- logging for types
+    cdist log ...?
+
+    - cdist logserver
+        - $__global/log.socket
+        - fifo?
+        echo into logpipe?
+