.gitattributes

@@ -1,8 +0,0 @@
-.gitignore export-ignore
-.gitattributes export-ignore
-.gitkeep export-ignore
-docs/speeches export-ignore
-docs/video export-ignore
-docs/src/man7 export-ignore
-bin/build-helper export-ignore
-README-maintainers export-ignore

.gitignore

@@ -1,22 +1,5 @@
 # -vim
-# Swap
+.*.swp
-[._]*.s[a-v][a-z]
-[._]*.sw[a-p]
-[._]s[a-rt-v][a-z]
-[._]ss[a-gi-z]
-[._]sw[a-p]
-
-# Session
-Session.vim
-
-# Temporary
-.netrwhist
-*~
-*.tmp
-# Auto-generated tag files
-tags
-# Persistent undo
-[._]*.un~
 
 # Ignore generated manpages
 docs/src/.marker
@@ -44,7 +27,6 @@ _build/
 docs/dist
 
 # Ignore temp files used for signing
-cdist-*.tar
 cdist-*.tar.gz
 cdist-*.tar.gz.asc
 

Makefile

@@ -18,30 +18,31 @@
 #
 #
 
-.PHONY: help
+helper=./bin/build-helper
-help:
-	@echo "Please use \`make <target>' where <target> is one of"
-	@echo "man             build only man user documentation"
-	@echo "html            build only html user documentation"
-	@echo "docs            build both man and html user documentation"
-	@echo "dotman          build man pages for types in your ~/.cdist directory"
-	@echo "speeches        build speeches pdf files"
-	@echo "install         install in the system site-packages directory"
-	@echo "install-user    install in the user site-packages directory"
-	@echo "docs-clean      clean documentation"
-	@echo "clean           clean"
 
-DOCS_SRC_DIR=./docs/src
+DOCS_SRC_DIR=docs/src
-SPEECHDIR=./docs/speeches
+SPEECHDIR=docs/speeches
-TYPEDIR=./cdist/conf/type
+TYPEDIR=cdist/conf/type
+
+WEBSRCDIR=docs/web
+
+WEBDIR=$$HOME/vcs/www.nico.schottelius.org
+WEBBLOG=$(WEBDIR)/blog
+WEBBASE=$(WEBDIR)/software/cdist
+WEBPAGE=$(WEBBASE).mdwn
+
+CHANGELOG_VERSION=$(shell $(helper) changelog-version)
+CHANGELOG_FILE=docs/changelog
+
+PYTHON_VERSION=cdist/version.py
 
 SPHINXM=make -C $(DOCS_SRC_DIR) man
 SPHINXH=make -C $(DOCS_SRC_DIR) html
 SPHINXC=make -C $(DOCS_SRC_DIR) clean
-
 ################################################################################
 # Manpages
 #
+MAN1DSTDIR=$(DOCS_SRC_DIR)/man1
 MAN7DSTDIR=$(DOCS_SRC_DIR)/man7
 
 # Manpages #1: Types
@@ -53,7 +54,6 @@ MANTYPES=$(subst /man.rst,.rst,$(MANTYPEPREFIX))
 
 # Link manpage: do not create man.html but correct named file
 $(MAN7DSTDIR)/cdist-type%.rst: $(TYPEDIR)/%/man.rst
-	mkdir -p $(MAN7DSTDIR)
 	ln -sf "../../../$^" $@
 
 # Manpages #2: reference
@@ -63,16 +63,11 @@ DOCSREFSH=$(DOCS_SRC_DIR)/cdist-reference.rst.sh
 $(DOCSREF): $(DOCSREFSH)
 	$(DOCSREFSH)
 
-version:
-	@[ -f "cdist/version.py" ] || { \
-		printf "Missing 'cdist/version.py', please generate it first.\n" && exit 1; \
-	}
-
 # Manpages #3: generic part
-man: version $(MANTYPES) $(DOCSREF)
+man: $(MANTYPES) $(DOCSREF) $(PYTHON_VERSION)
 	$(SPHINXM)
 
-html: version $(MANTYPES) $(DOCSREF)
+html: $(MANTYPES) $(DOCSREF) $(PYTHON_VERSION)
 	$(SPHINXH)
 
 docs: man html
@@ -80,6 +75,24 @@ docs: man html
 docs-clean:
 	$(SPHINXC)
 
+# Manpages #5: release part
+MANWEBDIR=$(WEBBASE)/man/$(CHANGELOG_VERSION)
+HTMLBUILDDIR=docs/dist/html
+
+docs-dist: html
+	rm -rf "${MANWEBDIR}"
+	mkdir -p "${MANWEBDIR}"
+	# mkdir -p "${MANWEBDIR}/man1" "${MANWEBDIR}/man7"
+	# cp ${MAN1DSTDIR}/*.html ${MAN1DSTDIR}/*.css ${MANWEBDIR}/man1
+	# cp ${MAN7DSTDIR}/*.html ${MAN7DSTDIR}/*.css ${MANWEBDIR}/man7
+	cp -R ${HTMLBUILDDIR}/* ${MANWEBDIR}
+	cd ${MANWEBDIR} && git add . && git commit -m "cdist manpages update: $(CHANGELOG_VERSION)" || true
+
+man-latest-link: web-pub
+	# Fix ikiwiki, which does not like symlinks for pseudo security
+	ssh staticweb.ungleich.ch \
+		"cd /home/services/www/nico/nico.schottelius.org/www/software/cdist/man/ && rm -f latest && ln -sf "$(CHANGELOG_VERSION)" latest"
+
 # Manpages: .cdist Types
 DOT_CDIST_PATH=${HOME}/.cdist
 DOTMAN7DSTDIR=$(MAN7DSTDIR)
@@ -92,7 +105,8 @@ DOTMANTYPES=$(subst /man.rst,.rst,$(DOTMANTYPEPREFIX))
 $(DOTMAN7DSTDIR)/cdist-type%.rst: $(DOTTYPEDIR)/%/man.rst
 	ln -sf "$^" $@
 
-dotman: version $(DOTMANTYPES)
+# Manpages #3: generic part
+dotman: $(DOTMANTYPES)
 	$(SPHINXM)
 
 ################################################################################
@@ -100,6 +114,7 @@ dotman: version $(DOTMANTYPES)
 #
 SPEECHESOURCES=$(SPEECHDIR)/*.tex
 SPEECHES=$(SPEECHESOURCES:.tex=.pdf)
+SPEECHESWEBDIR=$(WEBBASE)/speeches
 
 # Create speeches and ensure Toc is up-to-date
 $(SPEECHDIR)/%.pdf: $(SPEECHDIR)/%.tex
@@ -109,26 +124,131 @@ $(SPEECHDIR)/%.pdf: $(SPEECHDIR)/%.tex
 
 speeches: $(SPEECHES)
 
+speeches-dist: speeches
+	rm -rf "${SPEECHESWEBDIR}"
+	mkdir -p "${SPEECHESWEBDIR}"
+	cp ${SPEECHES} "${SPEECHESWEBDIR}"
+	cd ${SPEECHESWEBDIR} && git add . && git commit -m "cdist speeches updated" || true
+
 ################################################################################
-# Misc
+# Website
 #
-clean: docs-clean
+
+BLOGFILE=$(WEBBLOG)/cdist-$(CHANGELOG_VERSION)-released.mdwn
+
+$(BLOGFILE): $(CHANGELOG_FILE)
+	$(helper) blog $(CHANGELOG_VERSION) $(BLOGFILE)
+
+web-blog: $(BLOGFILE)
+
+web-doc:
+	# Go to top level, because of cdist.mdwn
+	rsync -av "$(WEBSRCDIR)/" "${WEBBASE}/.."
+	cd "${WEBBASE}/.." && git add cdist* && git commit -m "cdist doc update" cdist* || true
+
+web-dist: web-blog web-doc
+
+web-pub: web-dist docs-dist speeches-dist
+	cd "${WEBDIR}" && make pub
+
+web-release-all: man-latest-link
+web-release-all-no-latest: web-pub
+
+################################################################################
+# Release: Mailinglist
+#
+ML_FILE=.lock-ml
+
+# Only send mail once - lock until new changelog things happened
+$(ML_FILE): $(CHANGELOG_FILE)
+	$(helper) ml-release $(CHANGELOG_VERSION)
+	touch $@
+
+ml-release: $(ML_FILE)
+
+
+################################################################################
+# pypi
+#
+PYPI_FILE=.pypi-release
+$(PYPI_FILE): man $(PYTHON_VERSION)
+	python3 setup.py sdist upload
+	touch $@
+
+pypi-release: $(PYPI_FILE)
+################################################################################
+# archlinux
+#
+ARCHLINUX_FILE=.lock-archlinux
+ARCHLINUXTAR=cdist-$(CHANGELOG_VERSION)-1.src.tar.gz
+
+$(ARCHLINUXTAR): PKGBUILD
+	umask 022; mkaurball
+
+PKGBUILD: PKGBUILD.in $(PYTHON_VERSION)
+	./PKGBUILD.in $(CHANGELOG_VERSION)
+
+$(ARCHLINUX_FILE): $(ARCHLINUXTAR) $(PYTHON_VERSION)
+	burp -c system $(ARCHLINUXTAR)
+	touch $@
+
+archlinux-release: $(ARCHLINUX_FILE)
+
+################################################################################
+# Release
+#
+
+$(PYTHON_VERSION) version: .git/refs/heads/master
+	$(helper) version
+
+# Code that is better handled in a shell script
+check-%:
+	$(helper) $@
+
+release:
+	$(helper) $@
+
+################################################################################
+# Cleanup
+#
+
+clean:
 	rm -f $(DOCS_SRC_DIR)/cdist-reference.rst
 
 	find "$(DOCS_SRC_DIR)" -mindepth 2 -type l \
 	| xargs rm -f
 
+	make -C $(DOCS_SRC_DIR) clean
+
 	find * -name __pycache__  | xargs rm -rf
 
-	# distutils
+	# Archlinux
-	rm -rf ./build
+	rm -f cdist-*.pkg.tar.xz cdist-*.tar.gz
+	rm -rf pkg/ src/
+
+	rm -f MANIFEST PKGBUILD
+	rm -rf dist/
+
+	# Signed release
+	rm -f cdist-*.tar.gz
+	rm -f cdist-*.tar.gz.asc
+
+distclean: clean
+	rm -f cdist/version.py
 
 ################################################################################
-# install
+# Misc
 #
 
-install:
+# The pub is Nico's "push to all git remotes" way ("make pub")
-	python3 setup.py install
+pub:
+	git push --mirror
 
-install-user:
+test:
-	python3 setup.py install --user
+	$(helper) $@
+
+test-remote:
+	$(helper) $@
+
+pep8:
+	$(helper) $@

PKGBUILD.in

@@ -9,7 +9,7 @@ pkgver=$version
 pkgrel=1
 pkgdesc='A Usable Configuration Management System"'
 arch=('any')
-url='https://www.cdi.st/'
+url='http://www.nico.schottelius.org/software/cdist/'
 license=('GPL3')
 depends=('python>=3.2.0')
 source=("http://pypi.python.org/packages/source/c/cdist/cdist-\${pkgver}.tar.gz")

README

@@ -3,5 +3,4 @@ cdist
 
 cdist is a usable configuration management system.
 
-For the web documentation have a look at https://www.cdi.st/
+For the web documentation have a look at docs/web/.
-or at docs/src for reStructuredText manual.

README-maintainers

@@ -1,4 +0,0 @@
-Maintainers should use ./bin/build-helper script.
-
-Makefile is intended for end users. It can be used for non-maintaining
-targets that can be run from pure source (without git repository).

bin/build-helper

@@ -1,7 +1,6 @@
 #!/bin/sh
 #
 # 2011-2013 Nico Schottelius (nico-cdist at schottelius.org)
-# 2016-2019 Darko Poljak (darko.poljak at gmail.com)
 #
 # This file is part of cdist.
 #
@@ -19,66 +18,17 @@
 # along with cdist. If not, see <http://www.gnu.org/licenses/>.
 #
 #
-# This file contains the heavy lifting found usually in the Makefile.
+# This file contains the heavy lifting found usually in the Makefile
 #
 
-usage() {
+basedir=${0%/*}/../
-    printf "usage: %s TARGET [TARGET-ARGS...]
+# Change to checkout directory
-    Available targets:
+cd "$basedir"
-        changelog-changes
-        changelog-version
-        check-date
-        check-unittest
-        ml-release
-        archlinux-release
-        pypi-release
-        release-git-tag
-        sign-git-release
-        release
-        test
-        test-remote
-        pycodestyle
-        pep8
-        check-pycodestyle
-        shellcheck-global-explorers
-        shellcheck-type-explorers
-        shellcheck-manifests
-        shellcheck-local-gencodes
-        shellcheck-remote-gencodes
-        shellcheck-scripts
-        shellcheck-gencodes
-        shellcheck-types
-        shellcheck
-        shellcheck-type-files
-        shellcheck-with-files
-        shellcheck-build-helper
-        check-shellcheck
-        version-branch
-        version
-        target-version
-        clean
-        distclean\n" "$1"
-}
 
-basename="${0##*/}"
+version=$(git describe)
-
-if [ $# -lt 1 ]
-then
-    usage "${basename}"
-    exit 1
-fi
 
 option=$1; shift
 
-SHELLCHECKCMD="shellcheck -s sh -f gcc -x"
-# Skip SC2154 for variables starting with __ since such variables are cdist
-# environment variables.
-SHELLCHECK_SKIP=': __.*is referenced but not assigned.*\[SC2154\]'
-
-# Change to checkout directory
-basedir="${0%/*}/../"
-cd "$basedir"
-
 case "$option" in
     changelog-changes)
         if [ "$#" -eq 1 ]; then
@@ -116,8 +66,8 @@ case "$option" in
         date_changelog=$(grep '^[[:digit:]]' "$basedir/docs/changelog" | head -n1 | sed 's/.*: //')
 
         if [ "$date_today" != "$date_changelog" ]; then
-            printf "Date in changelog is not today\n"
+            echo "Date in changelog is not today"
-            printf "Changelog date: %s\n" "${date_changelog}"
+            echo "Changelog: $date_changelog"
             exit 1
         fi
     ;;
@@ -126,17 +76,54 @@ case "$option" in
         "$0" test
     ;;
 
+    blog)
+        version=$1; shift
+        blogfile=$1; shift
+        dir=${blogfile%/*}
+        file=${blogfile##*/}
+
+
+        cat << eof > "$blogfile"
+[[!meta title="Cdist $version released"]]
+
+Here's a short overview about the changes found in version ${version}:
+
+eof
+
+        $0 changelog-changes "$version" >> "$blogfile"
+
+        cat << eof >> "$blogfile"
+For more information visit the [[cdist homepage|software/cdist]].
+
+[[!tag cdist config unix]]
+eof
+        cd "$dir"
+        git add "$file"
+        # Allow git commit to fail if there are no changes
+        git commit -m "cdist blog update: $version" "$blogfile" || true
+    ;;
+
     ml-release)
         if [ $# -ne 1 ]; then
-            printf "%s ml-release version\n" "$0" >&2
+            echo "$0 ml-release version" >&2
             exit 1
         fi
 
         version=$1; shift
 
+        to_a=cdist
+        to_d=l.schottelius.org
+        to=${to_a}@${to_d}
+
+        from_a=nico-cdist
+        from_d=schottelius.org
+        from=${from_a}@${from_d}
+
         ( 
         cat << eof
-Subject: cdist $version has been released
+From: Nico -telmich- Schottelius <$from>
+To: cdist mailing list <$to>
+Subject: cdist $version released
 
 Hello .*,
 
@@ -147,41 +134,25 @@ eof
         "$0" changelog-changes "$version"
         cat << eof
 
+Cheers,
+
+Nico
+
+-- 
+Automatisation at its best level. With cdist.
 eof
-        ) > mailinglist.tmp
+        ) | /usr/sbin/sendmail -f "$from" "$to"
     ;;
 
-    archlinux-release)
-        if [ $# -ne 1 ]; then
-            printf "%s archlinux-release version\n" "$0" >&2
-            exit 1
-        fi
-        version=$1; shift
-
-        ARCHLINUXTAR="cdist-${version}-1.src.tar.gz"
-        ./PKGBUILD.in "${version}"
-        umask 022
-        mkaurball
-        burp -c system "${ARCHLINUXTAR}"
-    ;;
-
-    pypi-release)
-        # Ensure that pypi release has the right version
-        "$0" version
-
-        make docs-clean
-        make docs
-        python3 setup.py sdist upload
-    ;;
 
     release-git-tag)
         target_version=$($0 changelog-version)
-        if git rev-parse --verify "refs/tags/${target_version}" 2>/dev/null; then
+        if git rev-parse --verify refs/tags/$target_version 2>/dev/null; then
-            printf "Tag for %s exists, aborting\n" "${target_version}"
+            echo "Tag for $target_version exists, aborting"
             exit 1
         fi
-        printf "Enter tag description for %s: " "${target_version}"
+        printf "Enter tag description for ${target_version}: "
-        read -r tagmessage
+        read tagmessage
 
         # setup for signed tags:
         # gpg --fulL-gen-key
@@ -199,8 +170,7 @@ eof
         # gpg --verify <asc-file> <file>
         # gpg --no-default-keyring --keyring <pubkey.gpg> --verify <asc-file> <file>
         # Ensure gpg-agent is running.
-        GPG_TTY=$(tty)
+        export GPG_TTY=$(tty)
-        export GPG_TTY
         gpg-agent
 
         git tag -s "$target_version" -m "$tagmessage"
@@ -210,14 +180,14 @@ eof
     sign-git-release)
         if [ $# -lt 2 ]
         then
-            printf "usage: %s sign-git-release TAG TOKEN [ARCHIVE]\n" "$0"
+            printf "usage: $0 sign-git-release TAG TOKEN [ARCHIVE]\n"
             printf "    if ARCHIVE is not specified then it is created\n"
             exit 1
         fi
         tag="$1"
         if ! git rev-parse -q --verify "${tag}" >/dev/null 2>&1
         then
-            printf "Tag \"%s\" not found.\n" "${tag}"
+            printf "Tag \"${tag}\" not found.\n"
             exit 1
         fi
         token="$2"
@@ -225,53 +195,44 @@ eof
         then
             archivename="$3"
         else
-            archivename="cdist-${tag}.tar"
+            archivename="cdist-${tag}.tar.gz"
             git archive --prefix="cdist-${tag}/" -o "${archivename}" "${tag}" \
                 || exit 1
-            # make sure target version is generated
-            "$0" target-version
-            tar -x -f "${archivename}" || exit 1
-            cp cdist/version.py "cdist-${tag}/cdist/version.py" || exit 1
-            tar -c -f "${archivename}" "cdist-${tag}/" || exit 1
-            rm -r -f "cdist-${tag}/"
-            gzip "${archivename}" || exit 1
-            archivename="${archivename}.gz"
         fi
         gpg --armor --detach-sign "${archivename}" || exit 1
 
-        project="ungleich-public%2Fcdist"
+        # make github release
-        sed_cmd='s/^.*"markdown":"\([^"]*\)".*$/\1/'
+        curl -H "Authorization: token ${token}" \
+            --request POST \
+            --data "{ \"tag_name\":\"${tag}\", \
+                      \"target_commitish\":\"master\", \
+                      \"name\": \"${tag}\", \
+                      \"body\":\"${tag}\", \
+                      \"draft\":false, \
+                      \"prerelease\": false}" \
+            "https://api.github.com/repos/ungleich/cdist/releases" || exit 1
 
-        # upload archive
+        # get release ID
-        response_archive=$(curl -f -X POST \
+        repoid=$(curl "https://api.github.com/repos/ungleich/cdist/releases/tags/${tag}" \
-             --http1.1 \
+            | python3 -c 'import json; import sys; print(json.loads(sys.stdin.read())["id"])') \
-             -H "PRIVATE-TOKEN: ${token}" \
+            || exit 1
-             -F "file=@${archivename}" \
-             "https://code.ungleich.ch/api/v4/projects/${project}/uploads" \
-             | sed "${sed_cmd}") || exit 1
 
-        # upload archive signature
+        # upload archive and then signature
-        response_archive_sig=$(curl -f -X POST \
+        curl -H "Authorization: token ${token}" \
-             --http1.1 \
+             -H "Accept: application/vnd.github.manifold-preview" \
-             -H "PRIVATE-TOKEN: ${token}" \
+             -H "Content-Type: application/x-gtar" \
-             -F "file=@${archivename}.asc" \
+             --data-binary @${archivename} \
-            "https://code.ungleich.ch/api/v4/projects/${project}/uploads" \
+            "https://uploads.github.com/repos/ungleich/cdist/releases/${repoid}/assets?name=${archivename}" \
-             | sed "${sed_cmd}") || exit 1
+            || exit 1
-
+        curl -H "Authorization: token ${token}" \
-        # make release
+             -H "Accept: application/vnd.github.manifold-preview" \
-        changelog=$("$0" changelog-changes "$1" | sed 's/^[[:space:]]*//')
+             -H "Content-Type: application/pgp-signature" \
-        release_notes=$(
+             --data-binary @${archivename}.asc \
-            printf "%s\n\n%s\n\n**Changelog**\n\n%s\n" \
+            "https://uploads.github.com/repos/ungleich/cdist/releases/${repoid}/assets?name=${archivename}.asc" \
-                "${response_archive}" "${response_archive_sig}" "${changelog}"
-        )
-        curl -f -X POST \
-             -H "PRIVATE-TOKEN: ${token}" \
-             -F "description=${release_notes}" \
-            "https://code.ungleich.ch/api/v4/projects/${project}/repository/tags/${tag}/release" \
             || exit 1
 
         # remove generated files (archive and asc)
-        if [ $# -eq 2 ]
+        if [ $# -eq 2]
         then
             rm -f "${archivename}"
         fi
@@ -283,30 +244,29 @@ eof
         target_version=$($0 changelog-version)
         target_branch=$($0 version-branch)
 
-        printf "Beginning release process for %s\n" "${target_version}"
+        echo "Beginning release process for $target_version"
 
         # First check everything is sane
         "$0" check-date
         "$0" check-unittest
-        "$0" check-pycodestyle
+        "$0" check-pep8
-        "$0" check-shellcheck
 
         # Generate version file to be included in packaging
         "$0" target-version
 
         # Ensure the git status is clean, else abort
         if ! git diff-index --name-only --exit-code HEAD ; then
-            printf "Unclean tree, see files above, aborting.\n"
+            echo "Unclean tree, see files above, aborting"
             exit 1
         fi
 
         # Ensure we are on the master branch
         masterbranch=yes
         if [ "$(git rev-parse --abbrev-ref HEAD)" != "master" ]; then
-            printf "Releases are happening from the master branch, aborting.\n"
+            echo "Releases are happening from the master branch, aborting"
 
-            printf "Enter the magic word to release anyway:"
+            echo "Enter the magic word to release anyway"
-            read -r magicword
+            read magicword
 
             if [ "$magicword" = "iknowwhatido" ]; then
                 masterbranch=no
@@ -317,7 +277,7 @@ eof
 
         if [ "$masterbranch" = yes ]; then
             # Ensure version branch exists
-            if ! git rev-parse --verify "refs/heads/${target_branch}" 2>/dev/null; then
+            if ! git rev-parse --verify refs/heads/$target_branch 2>/dev/null; then
                 git branch "$target_branch"
             fi
 
@@ -335,12 +295,20 @@ eof
         make docs-clean
         make docs
 
+        # Generate speeches (indirect check if they build)
+        make speeches
+
         ############################################################# 
         # Everything green, let's do the release
 
         # Tag the current commit
         "$0" release-git-tag
 
+        # sign git tag
+        printf "Enter github authentication token: "
+        read token
+        "$0" sign-git-release "${target_version}" "${token}"
+
         # Also merge back the version branch
         if [ "$masterbranch" = yes ]; then
             git checkout master
@@ -348,41 +316,41 @@ eof
         fi
 
         # Publish git changes
-        # if you want to have mirror locally then uncomment this and comment below
+        make pub
-        #     git push --mirror
+
-            git push
+        # publish man, speeches, website
-            # push also new branch and set up tracking
+        if [ "$masterbranch" = yes ]; then
-            git push -u origin "${target_branch}"
+            make web-release-all
-        # fi
+        else
+            make web-release-all-no-latest
+        fi
+
+        # Ensure that pypi release has the right version
+        "$0" version
 
         # Create and publish package for pypi
-        "$0" pypi-release
+        make pypi-release
 
-        # sign git tag
+        # Archlinux release is based on pypi
-        printf "Enter upstream repository authentication token: "
+        make archlinux-release
-        read -r token
-        "$0" sign-git-release "${target_version}" "${token}"
 
         # Announce change on ML
-        "$0" ml-release "${target_version}"
+        make ml-release
 
         cat << eof
 Manual steps post release:
-    - cdist-web
+
-    - send mail body generated in mailinglist.tmp and inform Dmitry for deb
+    - linkedin
+    - hackernews
+    - reddit
     - twitter
+
 eof
+
     ;;
 
     test)
-        if [ ! -f "cdist/version.py" ]
+        export PYTHONPATH="$(pwd -P)"
-        then
-            printf "cdist/version.py is missing, generate it first.\n"
-            exit 1
-        fi
-
-        PYTHONPATH="$(pwd -P)"
-        export PYTHONPATH
 
         if [ $# -lt 1 ]; then
             python3 -m cdist.test
@@ -392,30 +360,22 @@ eof
     ;;
 
     test-remote)
-        if [ ! -f "cdist/version.py" ]
+        export PYTHONPATH="$(pwd -P)"
-        then
-            printf "cdist/version.py is missing, generate it first.\n"
-            exit 1
-        fi
-
-        PYTHONPATH="$(pwd -P)"
-        export PYTHONPATH
-
         python3 -m cdist.test.exec.remote
     ;;
 
-    pycodestyle|pep8)
+    pep8)
-        pycodestyle "${basedir}" "${basedir}/scripts/cdist" | less
+        pep8 "${basedir}" "${basedir}/scripts/cdist" | less
     ;;
 
-    check-pycodestyle)
+    check-pep8)
-        "$0" pycodestyle
+        "$0" pep8
-        printf "\\nPlease review pycodestyle report.\\n"
+        echo "Please review pep8 report."
         while true
         do
-            printf "Continue (yes/no)?\n"
+            echo "Continue (yes/no)?"
             any=
-            read -r any
+            read any
             case "$any" in
                 yes)
                     break
@@ -424,83 +384,7 @@ eof
                     exit 1
                 ;;
                 *)
-                    printf "Please answer with 'yes' or 'no' explicitly.\n"
+                    echo "Please answer with 'yes' or 'no' explicitly."
-                ;;
-        esac
-        done
-    ;;
-
-    shellcheck-global-explorers)
-        find cdist/conf/explorer -type f -exec ${SHELLCHECKCMD} {} + | grep -v "${SHELLCHECK_SKIP}" || exit 0
-    ;;
-
-    shellcheck-type-explorers)
-        find cdist/conf/type -type f -path "*/explorer/*" -exec ${SHELLCHECKCMD} {} + | grep -v "${SHELLCHECK_SKIP}" || exit 0
-    ;;
-
-    shellcheck-manifests)
-        find cdist/conf/type -type f -name manifest -exec ${SHELLCHECKCMD} {} + | grep -v "${SHELLCHECK_SKIP}" || exit 0
-    ;;
-
-    shellcheck-local-gencodes)
-        find cdist/conf/type -type f -name gencode-local -exec ${SHELLCHECKCMD} {} + | grep -v "${SHELLCHECK_SKIP}" || exit 0
-    ;;
-
-    shellcheck-remote-gencodes)
-        find cdist/conf/type -type f -name gencode-remote -exec ${SHELLCHECKCMD} {} + | grep -v "${SHELLCHECK_SKIP}" || exit 0
-    ;;
-
-    shellcheck-scripts)
-        ${SHELLCHECKCMD} scripts/cdist-dump scripts/cdist-new-type || exit 0
-    ;;
-
-    shellcheck-gencodes)
-        "$0" shellcheck-local-gencodes
-        "$0" shellcheck-remote-gencodes
-    ;;
-
-    shellcheck-types)
-        "$0" shellcheck-type-explorers
-        "$0" shellcheck-manifests
-        "$0" shellcheck-gencodes
-    ;;
-
-    shellcheck)
-        "$0" shellcheck-global-explorers
-        "$0" shellcheck-types
-        "$0" shellcheck-scripts
-    ;;
-
-    shellcheck-type-files)
-        find cdist/conf/type -type f -path "*/files/*" -exec ${SHELLCHECKCMD} {} + | grep -v "${SHELLCHECK_SKIP}" || exit 0
-    ;;
-
-    shellcheck-with-files)
-        "$0" shellcheck
-        "$0" shellcheck-type-files
-    ;;
-
-    shellcheck-build-helper)
-        ${SHELLCHECKCMD} ./bin/build-helper
-    ;;
-
-    check-shellcheck)
-        "$0" shellcheck
-        printf "\\nPlease review shellcheck report.\\n"
-        while true
-        do
-            printf "Continue (yes/no)?\n"
-            any=
-            read -r any
-            case "$any" in
-                yes)
-                    break
-                ;;
-                no)
-                    exit 1
-                ;;
-                *)
-                    printf "Please answer with 'yes' or 'no' explicitly.\n"
                 ;;
         esac
         done
@@ -511,39 +395,16 @@ eof
     ;;
 
     version)
-        printf "VERSION = \"%s\"\n" "$(git describe)" > cdist/version.py
+        echo "VERSION = \"$(git describe)\"" > cdist/version.py
     ;;
 
     target-version)
         target_version=$($0 changelog-version)
-        printf "VERSION = \"%s\"\n" "${target_version}" > cdist/version.py
+        echo "VERSION = \"${target_version}\"" > cdist/version.py
     ;;
 
-    clean)
-        make clean
-
-        # Archlinux
-        rm -f cdist-*.pkg.tar.xz cdist-*.tar.gz
-        rm -rf pkg/ src/
-
-        rm -f MANIFEST PKGBUILD
-        rm -rf dist/
-
-        # Signed release
-        rm -f cdist-*.tar.gz
-        rm -f cdist-*.tar.gz.asc
-
-        # Temp files
-        rm -f ./*.tmp
-    ;;
-
-    distclean)
-        "$0" clean
-        rm -f cdist/version.py
-    ;;
     *)
-        printf "Unknown target: '%s'.\n" "${option}" >&2
+        echo "Unknown helper target $@ - aborting"
-        usage "${basename}"
         exit 1
     ;;
 

bin/build-helper.freebsd

@@ -0,0 +1,473 @@
+#!/bin/sh
+#
+# 2011-2013 Nico Schottelius (nico-cdist at schottelius.org)
+# 2016 Darko Poljak (darko.poljak at gmail.com)
+#
+# 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/>.
+#
+#
+# This file contains the heavy lifting found usually in the Makefile
+#
+
+# vars for make
+helper=$0
+
+basedir=${0%/*}/../
+# run_as is used to check how the script is called (by $0 value)
+# currently supported sufixes for $0 are:
+# .freebsd - run as freebsd
+basename=${0##*/}
+run_as=${basename#*.}
+case "$run_as" in
+    freebsd)
+        to_a=cdist-configuration-management
+        to_d=googlegroups.com
+        from_a=darko.poljak
+        from_d=gmail.com
+        ml_name="Darko Poljak"
+        ml_sig_name="Darko"
+
+        # vars for make
+        WEBDIR=../vcs/www.nico.schottelius.org
+    ;;
+    *)
+        to_a=cdist
+        to_d=l.schottelius.org
+        from_a=nico-cdist
+        from_d=schottelius.org
+        ml_name="Nico -telmich- Schottelius"
+        ml_sig_name="Nico"
+
+        # vars for make
+        WEBDIR=$$HOME/vcs/www.nico.schottelius.org
+    ;;
+esac
+
+# Change to checkout directory
+cd "$basedir"
+
+version=$(git describe)
+
+option=$1; shift
+
+case "$option" in
+    print-make-vars)
+        printf "helper: ${helper}\n"
+        printf "WEBDIR: ${WEBDIR}\n"
+    ;;
+    print-runas)
+        printf "run_as: $run_as\n"
+    ;;
+    changelog-changes)
+        if [ "$#" -eq 1 ]; then
+            start=$1
+        else
+            start="[[:digit:]]"
+        fi
+
+        end="[[:digit:]]"
+
+        awk -F: "BEGIN { start=0 }
+            {
+                if(start == 0) {
+                    if (\$0 ~ /^$start/) {
+                        start = 1
+                    }
+                } else {
+                    if (\$0 ~ /^$end/) {
+                        exit
+                    } else {
+                        print \$0 
+                    }
+                }
+            }" "$basedir/docs/changelog"
+    ;;
+
+    changelog-version)
+        # get version from changelog
+        grep '^[[:digit:]]' "$basedir/docs/changelog" | head -n1 | sed 's/:.*//'
+    ;;
+
+    check-date)
+        # verify date in changelog is today
+        date_today="$(date +%Y-%m-%d)"
+        date_changelog=$(grep '^[[:digit:]]' "$basedir/docs/changelog" | head -n1 | sed 's/.*: //')
+
+        if [ "$date_today" != "$date_changelog" ]; then
+            echo "Date in changelog is not today"
+            echo "Changelog: $date_changelog"
+            exit 1
+        fi
+    ;;
+
+    check-unittest)
+        "$0" test
+    ;;
+
+    blog)
+        version=$1; shift
+        blogfile=$1; shift
+        dir=${blogfile%/*}
+        file=${blogfile##*/}
+
+
+        cat << eof > "$blogfile"
+[[!meta title="Cdist $version released"]]
+
+Here's a short overview about the changes found in version ${version}:
+
+eof
+
+        $0 changelog-changes "$version" >> "$blogfile"
+
+        cat << eof >> "$blogfile"
+For more information visit the [[cdist homepage|software/cdist]].
+
+[[!tag cdist config unix]]
+eof
+        cd "$dir"
+        git add "$file"
+        # Allow git commit to fail if there are no changes
+        git commit -m "cdist blog update: $version" "$blogfile" || true
+    ;;
+
+    ml-release)
+        if [ $# -ne 1 ]; then
+            echo "$0 ml-release version" >&2
+            exit 1
+        fi
+
+        version=$1; shift
+
+        to=${to_a}@${to_d}
+        from=${from_a}@${from_d}
+
+        ( 
+        cat << eof
+From: ${ml_name} <$from>
+To: cdist mailing list <$to>
+Subject: cdist $version released
+
+Hello .*,
+
+cdist $version has been released with the following changes:
+
+eof
+
+        "$0" changelog-changes "$version"
+        cat << eof
+
+Cheers,
+
+${ml_sig_name}
+
+-- 
+Automatisation at its best level. With cdist.
+eof
+        ) | /usr/sbin/sendmail -f "$from" "$to"
+    ;;
+
+    release-git-tag)
+        target_version=$($0 changelog-version)
+        if git rev-parse --verify refs/tags/$target_version 2>/dev/null; then
+            echo "Tag for $target_version exists, aborting"
+            exit 1
+        fi
+        printf "Enter tag description for ${target_version}: "
+        read tagmessage
+
+        # setup for signed tags:
+        # gpg --fulL-gen-key
+        # gpg --list-secret-keys --keyid-format LONG
+        # git config --local user.signingkey <id>
+        # for exporting pub key:
+        #     gpg --armor --export <id> > pubkey.asc
+        #     gpg --output pubkey.gpg --export <id>
+        # show tag with signature
+        # git show <tag>
+        # verify tag signature
+        # git tag -v <tag>
+        #
+        # gpg verify signature
+        # gpg --verify <asc-file> <file>
+        # gpg --no-default-keyring --keyring <pubkey.gpg> --verify <asc-file> <file>
+        # Ensure gpg-agent is running.
+        export GPG_TTY=$(tty)
+        gpg-agent
+
+        git tag -s "$target_version" -m "$tagmessage"
+        git push --tags
+    ;;
+
+    sign-git-release)
+        if [ $# -lt 2 ]
+        then
+            printf "usage: $0 sign-git-release TAG TOKEN [ARCHIVE]\n"
+            printf "    if ARCHIVE is not specified then it is created\n"
+            exit 1
+        fi
+        tag="$1"
+        if ! git rev-parse -q --verify "${tag}" >/dev/null 2>&1
+        then
+            printf "Tag \"${tag}\" not found.\n"
+            exit 1
+        fi
+        token="$2"
+        if [ $# -gt 2 ]
+        then
+            archivename="$3"
+        else
+            archivename="cdist-${tag}.tar.gz"
+            git archive --prefix="cdist-${tag}/" -o "${archivename}" "${tag}" \
+                || exit 1
+        fi
+        gpg --armor --detach-sign "${archivename}" || exit 1
+
+        # make github release
+        curl -H "Authorization: token ${token}" \
+            --request POST \
+            --data "{ \"tag_name\":\"${tag}\", \
+                      \"target_commitish\":\"master\", \
+                      \"name\": \"${tag}\", \
+                      \"body\":\"${tag}\", \
+                      \"draft\":false, \
+                      \"prerelease\": false}" \
+            "https://api.github.com/repos/ungleich/cdist/releases" || exit 1
+
+        # get release ID
+        repoid=$(curl "https://api.github.com/repos/ungleich/cdist/releases/tags/${tag}" \
+            | python3 -c 'import json; import sys; print(json.loads(sys.stdin.read())["id"])') \
+            || exit 1
+
+        # upload archive and then signature
+        curl -H "Authorization: token ${token}" \
+             -H "Accept: application/vnd.github.manifold-preview" \
+             -H "Content-Type: application/x-gtar" \
+             --data-binary @${archivename} \
+            "https://uploads.github.com/repos/ungleich/cdist/releases/${repoid}/assets?name=${archivename}" \
+            || exit 1
+        curl -H "Authorization: token ${token}" \
+             -H "Accept: application/vnd.github.manifold-preview" \
+             -H "Content-Type: application/pgp-signature" \
+             --data-binary @${archivename}.asc \
+            "https://uploads.github.com/repos/ungleich/cdist/releases/${repoid}/assets?name=${archivename}.asc" \
+            || exit 1
+
+        # remove generated files (archive and asc)
+        if [ $# -eq 2]
+        then
+            rm -f "${archivename}"
+        fi
+        rm -f "${archivename}.asc"
+    ;;
+
+    release)
+        set -e
+        target_version=$($0 changelog-version)
+        target_branch=$($0 version-branch)
+
+        echo "Beginning release process for $target_version"
+
+        # First check everything is sane
+        "$0" check-date
+        "$0" check-unittest
+        "$0" check-pep8
+
+        # Generate version file to be included in packaging
+        "$0" target-version
+
+        # Ensure the git status is clean, else abort
+        if ! git diff-index --name-only --exit-code HEAD ; then
+            echo "Unclean tree, see files above, aborting"
+            exit 1
+        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
+                masterbranch=no
+            else
+                exit 1
+            fi
+        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
+        fi
+
+        # Verify that after the merge everything works
+        "$0" check-date
+        "$0" check-unittest
+
+        # Generate documentation (man and html)
+        # First, clean old generated docs
+        make helper=${helper} WEBDIR=${WEBDIR} docs-clean
+        make helper=${helper} WEBDIR=${WEBDIR} docs
+
+        # Generate speeches (indirect check if they build)
+        make helper=${helper} WEBDIR=${WEBDIR} speeches
+
+        ############################################################# 
+        # Everything green, let's do the release
+
+        # Tag the current commit
+        "$0" release-git-tag
+
+        # sign git tag
+        printf "Enter github authentication token: "
+        read token
+        "$0" sign-git-release "${target_version}" "${token}"
+
+        # Also merge back the version branch
+        if [ "$masterbranch" = yes ]; then
+            git checkout master
+            git merge "$target_branch"
+        fi
+
+        # Publish git changes
+        case "$run_as" in
+            freebsd)
+                # if we are not Nico :) then just push, no mirror
+                git push
+                # push also new branch and set up tracking
+                git push -u origin "${target_branch}"
+            ;;
+            *)
+                make helper=${helper} WEBDIR=${WEBDIR} pub
+            ;;
+        esac
+
+        # publish man, speeches, website
+        if [ "$masterbranch" = yes ]; then
+            make helper=${helper} WEBDIR=${WEBDIR} web-release-all
+        else
+            make helper=${helper} WEBDIR=${WEBDIR} web-release-all-no-latest
+        fi
+
+        # Ensure that pypi release has the right version
+        "$0" version
+
+        # Create and publish package for pypi
+        make helper=${helper} WEBDIR=${WEBDIR} pypi-release
+
+        case "$run_as" in
+            freebsd)
+            ;;
+            *)
+                # Archlinux release is based on pypi
+                make archlinux-release
+            ;;
+        esac
+
+        # Announce change on ML
+        make helper=${helper} WEBDIR=${WEBDIR} ml-release
+
+        cat << eof
+Manual steps post release:
+
+    - linkedin
+    - hackernews
+    - reddit
+    - twitter
+
+eof
+
+        case "$run_as" in
+            freebsd)
+                cat <<eof
+Additional steps post release:
+    - archlinux release
+eof
+            ;;
+            *)
+            ;;
+        esac
+
+    ;;
+
+    test)
+        export PYTHONPATH="$(pwd -P)"
+
+        if [ $# -lt 1 ]; then
+            python3 -m cdist.test
+        else
+            python3 -m unittest "$@"
+        fi
+    ;;
+
+    test-remote)
+        export PYTHONPATH="$(pwd -P)"
+        python3 -m cdist.test.exec.remote
+    ;;
+
+    pep8)
+        pep8 "${basedir}" "${basedir}/scripts/cdist" | less
+    ;;
+
+    check-pep8)
+        "$0" pep8
+        echo "Please review pep8 report."
+        while true
+        do
+            echo "Continue (yes/no)?"
+            any=
+            read any
+            case "$any" in
+                yes)
+                    break
+                ;;
+                no)
+                    exit 1
+                ;;
+                *)
+                    echo "Please answer with 'yes' or 'no' explicitly."
+                ;;
+        esac
+        done
+    ;;
+
+    version-branch)
+        "$0" changelog-version | cut -d. -f '1,2'
+    ;;
+
+    version)
+        echo "VERSION = \"$(git describe)\"" > cdist/version.py
+    ;;
+
+    target-version)
+        target_version=$($0 changelog-version)
+        echo "VERSION = \"${target_version}\"" > cdist/version.py
+    ;;
+
+    *)
+        echo "Unknown helper target $@ - aborting"
+        exit 1
+    ;;
+
+esac

cdist/__init__.py

@@ -83,78 +83,41 @@ class CdistBetaRequired(cdist.Error):
 
 class CdistEntityError(Error):
     """Something went wrong while executing cdist entity"""
-    def __init__(self, entity_name, entity_params, stdout_paths,
+    def __init__(self, entity_name, entity_params, stderr_paths, subject=''):
-                 stderr_paths, subject=''):
         self.entity_name = entity_name
         self.entity_params = entity_params
         self.stderr_paths = stderr_paths
-        self.stdout_paths = stdout_paths
         if isinstance(subject, Error):
             self.original_error = subject
         else:
             self.original_error = None
         self.message = str(subject)
 
-    def _stdpath(self, stdpaths, header_name):
-        result = {}
-        for name, path in stdpaths:
-            if name not in result:
-                result[name] = []
-            try:
-                if os.path.exists(path) and os.path.getsize(path) > 0:
-                    output = []
-                    label_begin = name + ":" + header_name
-                    output.append(label_begin)
-                    output.append('\n')
-                    output.append('-' * len(label_begin))
-                    output.append('\n')
-                    with open(path, 'r') as fd:
-                        output.append(fd.read())
-                    output.append('\n')
-                    result[name].append(''.join(output))
-            except UnicodeError as ue:
-                result[name].append(('Cannot output {}:{} due to: {}.\n'
-                                     'You can try to read the error file "{}"'
-                                     ' yourself.').format(
-                                         name, header_name, ue, path))
-        return result
-
-    def _stderr(self):
-        return self._stdpath(self.stderr_paths, 'stderr')
-
-    def _stdout(self):
-        return self._stdpath(self.stdout_paths, 'stdout')
-
-    def _update_dict_list(self, target, source):
-        for x in source:
-            if x not in target:
-                target[x] = []
-            target[x].extend(source[x])
-
     @property
-    def std_streams(self):
+    def stderr(self):
-        std_dict = {}
+        output = []
-        self._update_dict_list(std_dict, self._stdout())
+        for stderr_name, stderr_path in self.stderr_paths:
-        self._update_dict_list(std_dict, self._stderr())
+            if (os.path.exists(stderr_path) and
-        return std_dict
+                    os.path.getsize(stderr_path) > 0):
+                label_begin = '---- BEGIN ' + stderr_name + ':stderr ----'
+                label_end = '---- END ' + stderr_name + ':stderr ----'
+                output.append('\n' + label_begin)
+                with open(stderr_path, 'r') as fd:
+                    output.append(fd.read())
+                output.append(label_end)
+        return '\n'.join(output)
 
     def __str__(self):
         output = []
         output.append(self.message)
-        output.append('\n\n')
+        header = "\nError processing " + self.entity_name
-        header = "Error processing " + self.entity_name
         under_header = '=' * len(header)
         output.append(header)
-        output.append('\n')
         output.append(under_header)
-        output.append('\n')
         for param_name, param_value in self.entity_params:
             output.append(param_name + ': ' + str(param_value))
-            output.append('\n')
+        output.append(self.stderr + '\n')
-        output.append('\n')
+        return '\n'.join(output)
-        for x in self.std_streams:
-            output.append(''.join(self.std_streams[x]))
-        return ''.join(output)
 
 
 class CdistObjectError(CdistEntityError):
@@ -164,76 +127,28 @@ class CdistObjectError(CdistEntityError):
             ('name', cdist_object.name, ),
             ('path', cdist_object.absolute_path, ),
             ('source', " ".join(cdist_object.source), ),
-            ('type', os.path.realpath(
+            ('type', cdist_object.cdist_type.absolute_path, ),
-                cdist_object.cdist_type.absolute_path), ),
         ]
         stderr_paths = []
         for stderr_name in os.listdir(cdist_object.stderr_path):
             stderr_path = os.path.join(cdist_object.stderr_path,
                                        stderr_name)
             stderr_paths.append((stderr_name, stderr_path, ))
-        stdout_paths = []
-        for stdout_name in os.listdir(cdist_object.stdout_path):
-            stdout_path = os.path.join(cdist_object.stdout_path,
-                                       stdout_name)
-            stdout_paths.append((stdout_name, stdout_path, ))
         super().__init__("object '{}'".format(cdist_object.name),
-                         params, stdout_paths, stderr_paths, subject)
+                         params, stderr_paths, subject)
-
-
-class CdistObjectExplorerError(CdistEntityError):
-    """
-    Something went wrong while working on a specific
-    cdist object explorer
-    """
-    def __init__(self, cdist_object, explorer_name, explorer_path,
-                 stderr_path, subject=''):
-        params = [
-            ('object name', cdist_object.name, ),
-            ('object path', cdist_object.absolute_path, ),
-            ('object source', " ".join(cdist_object.source), ),
-            ('object type', os.path.realpath(
-                cdist_object.cdist_type.absolute_path), ),
-            ('explorer name', explorer_name, ),
-            ('explorer path', explorer_path, ),
-        ]
-        stdout_paths = []
-        stderr_paths = [
-            ('remote', stderr_path, ),
-        ]
-        super().__init__("explorer '{}' of object '{}'".format(
-            explorer_name, cdist_object.name), params, stdout_paths,
-            stderr_paths, subject)
 
 
 class InitialManifestError(CdistEntityError):
     """Something went wrong while executing initial manifest"""
-    def __init__(self, initial_manifest, stdout_path, stderr_path, subject=''):
+    def __init__(self, initial_manifest, stderr_path, subject=''):
         params = [
             ('path', initial_manifest, ),
         ]
-        stdout_paths = [
+        stderr_paths = []
-            ('init', stdout_path, ),
-        ]
         stderr_paths = [
             ('init', stderr_path, ),
         ]
-        super().__init__('initial manifest', params, stdout_paths,
+        super().__init__('initial manifest', params, stderr_paths, subject)
-                         stderr_paths, subject)
-
-
-class GlobalExplorerError(CdistEntityError):
-    """Something went wrong while executing global explorer"""
-    def __init__(self, name, path, stderr_path, subject=''):
-        params = [
-            ('name', name, ),
-            ('path', path, ),
-        ]
-        stderr_paths = [
-            ('remote', stderr_path, ),
-        ]
-        super().__init__("global explorer '{}'".format(name),
-                         params, [], stderr_paths, subject)
 
 
 def file_to_list(filename):

cdist/argparse.py

@@ -5,23 +5,21 @@ import logging
 import collections
 import functools
 import cdist.configuration
-import cdist.preos
 
 
 # set of beta sub-commands
 BETA_COMMANDS = set(('install', 'inventory', ))
 # set of beta arguments for sub-commands
 BETA_ARGS = {
-    'config': set(('tag', 'all_tagged_hosts', 'use_archiving', )),
+    'config': set(('jobs', 'tag', 'all_tagged_hosts', 'use_archiving', )),
 }
-EPILOG = "Get cdist at https://code.ungleich.ch/ungleich-public/cdist"
+EPILOG = "Get cdist at http://www.nico.schottelius.org/software/cdist/"
 # Parser others can reuse
 parser = None
 
 
 _verbosity_level_off = -2
 _verbosity_level = {
-    None: logging.WARNING,
     _verbosity_level_off: logging.OFF,
     -1: logging.ERROR,
     0: logging.WARNING,
@@ -163,16 +161,6 @@ def get_parsers():
 
     # Config
     parser['config_main'] = argparse.ArgumentParser(add_help=False)
-    parser['config_main'].add_argument(
-           '-4', '--force-ipv4',
-           help=('Force to use IPv4 addresses only. No influence for custom'
-                 ' remote commands.'),
-           action='store_const', dest='force_ipv', const=4)
-    parser['config_main'].add_argument(
-           '-6', '--force-ipv6',
-           help=('Force to use IPv6 addresses only. No influence for custom'
-                 ' remote commands.'),
-           action='store_const', dest='force_ipv', const=6)
     parser['config_main'].add_argument(
             '-C', '--cache-path-pattern',
             help=('Specify custom cache path pattern. If '
@@ -193,7 +181,8 @@ def get_parsers():
                                   name="positive int"),
            help=('Operate in parallel in specified maximum number of jobs. '
                  'Global explorers, object prepare and object run are '
-                 'supported. Without argument CPU count is used by default. '),
+                 'supported. Without argument CPU count is used by default. '
+                 'Currently in beta.'),
            action='store', dest='jobs',
            const=multiprocessing.cpu_count())
     parser['config_main'].add_argument(
@@ -202,11 +191,6 @@ def get_parsers():
     parser['config_main'].add_argument(
            '-o', '--out-dir',
            help='Directory to save cdist output in.', dest="out_path")
-    parser['config_main'].add_argument(
-           '-P', '--timestamp',
-           help=('Timestamp log messages with the current local date and time '
-                 'in the format: YYYYMMDDHHMMSS.us.'),
-           action='store_true', dest='timestamp')
     parser['config_main'].add_argument(
            '-R', '--use-archiving', nargs='?',
            choices=('tar', 'tgz', 'tbz2', 'txz',),
@@ -236,13 +220,19 @@ def get_parsers():
                  '(should behave like ssh).'),
            action='store', dest='remote_exec',
            default=None)
-    parser['config_main'].add_argument(
-           '-S', '--disable-saving-output-streams',
-           help='Disable saving output streams.',
-           action='store_false', dest='save_output_streams', default=True)
 
     # Config
     parser['config_args'] = argparse.ArgumentParser(add_help=False)
+    parser['config_args'].add_argument(
+           '-4', '--force-ipv4',
+           help=('Force to use IPv4 addresses only. No influence for custom'
+                 ' remote commands.'),
+           action='store_const', dest='force_ipv', const=4)
+    parser['config_args'].add_argument(
+           '-6', '--force-ipv6',
+           help=('Force to use IPv6 addresses only. No influence for custom'
+                 ' remote commands.'),
+           action='store_const', dest='force_ipv', const=6)
     parser['config_args'].add_argument(
              '-A', '--all-tagged',
              help=('Use all hosts present in tags db. Currently in beta.'),
@@ -252,6 +242,8 @@ def get_parsers():
              help=('List hosts that have all specified tags, '
                    'if -t/--tag is specified.'),
              action="store_true", dest="has_all_tags", default=False)
+    parser['config_args'].add_argument(
+            'host', nargs='*', help='Host(s) to operate on.')
     parser['config_args'].add_argument(
             '-f', '--file',
             help=('Read specified file for a list of additional hosts to '
@@ -268,6 +260,10 @@ def get_parsers():
                  'default.'),
            action='store', dest='parallel',
            const=multiprocessing.cpu_count())
+    parser['config_args'].add_argument(
+           '-S', '--disable-saving-output-streams',
+           help='Disable saving output streams.',
+           action='store_false', dest='save_output_streams', default=True)
     parser['config_args'].add_argument(
            '-s', '--sequential',
            help='Operate on multiple hosts sequentially (default).',
@@ -278,8 +274,6 @@ def get_parsers():
                    'list all hosts that contain any of specified tags. '
                    'Currently in beta.'),
              dest='tag', required=False, action="store_true", default=False)
-    parser['config_args'].add_argument(
-            'host', nargs='*', help='Host(s) to operate on.')
     parser['config'] = parser['sub'].add_parser(
             'config', parents=[parser['loglevel'], parser['beta'],
                                parser['common'],
@@ -424,9 +418,6 @@ def get_parsers():
     parser['inventory'].set_defaults(
             func=cdist.inventory.Inventory.commandline)
 
-    # PreOs
-    parser['preos'] = parser['sub'].add_parser('preos', add_help=False)
-
     # Shell
     parser['shell'] = parser['sub'].add_parser(
             'shell', parents=[parser['loglevel']])

cdist/conf/explorer/cpu_cores

@@ -25,17 +25,13 @@
 os=$("$__explorer/os")
 case "$os" in
     "macosx")
-        sysctl -n hw.physicalcpu
+        echo "$(sysctl -n hw.physicalcpu)"
-    ;;
-
-    "openbsd")
-        sysctl -n hw.ncpuonline
     ;;
 
     *)
         if [ -r /proc/cpuinfo ]; then
             cores="$(grep "core id" /proc/cpuinfo | sort | uniq | wc -l)"
-            if [ "${cores}" -eq 0 ]; then
+            if [ ${cores} -eq 0 ]; then
                 cores="1"
             fi
             echo "$cores"

cdist/conf/explorer/cpu_sockets

@@ -25,14 +25,14 @@
 os=$("$__explorer/os")
 case "$os" in
     "macosx")
-        system_profiler SPHardwareDataType | grep "Number of Processors" | awk -F': ' '{print $2}'
+        echo "$(system_profiler SPHardwareDataType | grep "Number of Processors" | awk -F': ' '{print $2}')"
     ;;
 
     *)
     if [ -r /proc/cpuinfo ]; then
-        sockets="$(grep "physical id" /proc/cpuinfo | sort -u | wc -l)"
+        sockets="$(grep "physical id" /proc/cpuinfo | sort | uniq | wc -l)"
-        if [ "${sockets}" -eq 0 ]; then
+        if [ ${sockets} -eq 0 ]; then
-            sockets="$(grep -c "processor" /proc/cpuinfo)"
+            sockets="$(cat /proc/cpuinfo | grep "processor" | wc -l)"
         fi
         echo "${sockets}"
     fi

cdist/conf/explorer/disks

@@ -1,27 +1,2 @@
-#!/bin/sh
+cd /dev
-
+echo sd? hd? vd?
-uname_s="$(uname -s)"
-
-case "${uname_s}" in
-    FreeBSD)
-        sysctl -n kern.disks
-    ;;
-    OpenBSD|NetBSD)
-        sysctl -n hw.disknames | grep -Eo '[lsw]d[0-9]+' | xargs
-    ;;
-    Linux)
-        if command -v lsblk > /dev/null
-        then
-            # exclude ram disks, floppies and cdroms
-            # https://www.kernel.org/doc/Documentation/admin-guide/devices.txt
-            lsblk -e 1,2,11 -dno name | xargs
-        else
-            printf "Don't know how to list disks for %s operating system without lsblk, if you can please submit a patch\n" "${uname_s}" >&2
-        fi
-    ;;
-    *)
-        printf "Don't know how to list disks for %s operating system, if you can please submit a patch\n" "${uname_s}" >&2
-    ;;
-esac
-
-exit 0

cdist/conf/explorer/init

@@ -29,7 +29,7 @@ case "$uname_s" in
     Linux)
         (pgrep -P0 -l | awk '/^1[ \t]/ {print $2;}') || true
     ;;
-    FreeBSD|OpenBSD)
+    FreeBSD)
         ps -o comm= -p 1 || true
     ;;
     *)

cdist/conf/explorer/interfaces

@@ -1,6 +1,6 @@
-#!/bin/sh -e
+#!/bin/sh
 #
-# 2019 Ander Punnar (ander-at-kvlt-dot-ee)
+# 2012 Sébastien Gross <seb•ɑƬ•chezwam•ɖɵʈ•org>
 #
 # This file is part of cdist.
 #
@@ -17,12 +17,35 @@
 # You should have received a copy of the GNU General Public License
 # along with cdist. If not, see <http://www.gnu.org/licenses/>.
 #
+#
+# List all network interfaces in explorer/ifaces. One interface per line.
+#
+# If your OS is not supported please provide a ifconfig output
+#
 
-if command -v ip >/dev/null
+# Use ip, if available
-then
+if command -v ip >/dev/null; then
-	ip -o link show | sed -n 's/^[0-9]\+: \(.\+\): <.*/\1/p'
+    ip -o link show | sed -n 's/^[0-9]\+: \(.\+\): <.*/\1/p'
-elif command -v ifconfig >/dev/null
+    exit 0
-then
+fi
-	ifconfig -a | sed -n -E 's/^(.*)(:[[:space:]]*flags=|Link encap).*/\1/p'
+
-fi \
+if ! command -v ifconfig >/dev/null; then
- | sort -u
+   # no ifconfig, nothing we could do
+   exit 0
+fi
+
+uname_s="$(uname -s)"
+REGEXP='s/^(.*)(:[[:space:]]*flags=|Link encap).*/\1/p'
+
+case "$uname_s" in
+    Darwin)
+	ifconfig -a | sed -n -E "$REGEXP"
+	;;
+    Linux|*BSD)
+	ifconfig -a | sed -n -r "$REGEXP"
+	;;
+    *)
+	echo "Unsupported ifconfig output for $uname_s" >&2
+	exit 1
+	;;
+esac

cdist/conf/explorer/is-freebsd-jail

@@ -1,2 +0,0 @@
-#!/bin/sh
-sysctl -n security.jail.jailed 2>/dev/null | grep "1" || true

cdist/conf/explorer/kernel_name

@@ -1,2 +1 @@
-#!/bin/sh
 uname -s

cdist/conf/explorer/lsb_codename

@@ -20,9 +20,8 @@
 #
 
 set +e
-case "$("$__explorer/os")" in
+case "$($__explorer/os)" in
    openwrt)
-      # shellcheck disable=SC1091
       (. /etc/openwrt_release && echo "$DISTRIB_CODENAME")
    ;;
    *)

cdist/conf/explorer/lsb_description

@@ -20,9 +20,8 @@
 #
 
 set +e
-case "$("$__explorer/os")" in
+case "$($__explorer/os)" in
    openwrt)
-      # shellcheck disable=SC1091
       (. /etc/openwrt_release && echo "$DISTRIB_DESCRIPTION")
    ;;
    *)

cdist/conf/explorer/lsb_id

@@ -20,9 +20,8 @@
 #
 
 set +e
-case "$("$__explorer/os")" in
+case "$($__explorer/os)" in
    openwrt)
-      # shellcheck disable=SC1091
       (. /etc/openwrt_release && echo "$DISTRIB_ID")
    ;;
    *)

cdist/conf/explorer/lsb_release

@@ -20,9 +20,8 @@
 #
 
 set +e
-case "$("$__explorer/os")" in
+case "$($__explorer/os)" in
    openwrt)
-      # shellcheck disable=SC1091
       (. /etc/openwrt_release && echo "$DISTRIB_RELEASE")
    ;;
    *)

cdist/conf/explorer/machine

@@ -22,6 +22,6 @@
 #
 #
 
-if command -v uname >/dev/null 2>&1 ; then
+if command -v uname 2>&1 >/dev/null; then
    uname -m
 fi

cdist/conf/explorer/machine_type

@@ -22,13 +22,13 @@
 
 # FIXME: other system types (not linux ...)
 
-if [ -d "/proc/vz" ] && [ ! -d "/proc/bc" ]; then
+if [ -d "/proc/vz" -a ! -d "/proc/bc" ]; then
     echo openvz
     exit
 fi
 
 if [ -e "/proc/1/environ" ] &&
-    tr '\000' '\n' < "/proc/1/environ" | grep -Eiq '^container='; then
+    cat "/proc/1/environ" | tr '\000' '\n' | grep -Eiq '^container='; then
     echo lxc
     exit
 fi

cdist/conf/explorer/os

@@ -145,7 +145,7 @@ esac
 if [ -f /etc/os-release ]; then
    # already lowercase, according to:
    # https://www.freedesktop.org/software/systemd/man/os-release.html
-   awk -F= '/^ID=/ { if ($2 ~ /^'"'"'(.*)'"'"'$/ || $2 ~ /^"(.*)"$/) { print substr($2, 2, length($2) - 2) } else { print $2 } }' /etc/os-release
+   awk -F= '/^ID=/ {print $2;}' /etc/os-release
    exit 0
 fi
 

cdist/conf/explorer/os_release

@@ -1,26 +0,0 @@
-#!/bin/sh
-#
-# 2018 Adam Dej (dejko.a at gmail.com)
-#
-# 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/>.
-#
-#
-
-# See os-release(5) and http://0pointer.de/blog/projects/os-release
-
-set +e
-
-cat /etc/os-release || cat /usr/lib/os-release || true

cdist/conf/explorer/os_version

@@ -22,7 +22,7 @@
 #
 #
 
-case "$("$__explorer/os")" in
+case "$($__explorer/os)" in
    amazon)
       cat /etc/system-release
    ;;

cdist/conf/type/__acl/explorer/acl_is

@@ -1,31 +0,0 @@
-#!/bin/sh -e
-#
-# 2018 Ander Punnar (ander-at-kvlt-dot-ee)
-#
-# 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/>.
-#
-
-[ ! -e "/$__object_id" ] && exit 0
-
-if ! command -v getfacl > /dev/null
-then
-    echo 'getfacl not available' >&2
-    exit 1
-fi
-
-getfacl "/$__object_id" 2>/dev/null \
-    | grep -Eo '^(default:)?(user|group|(mask|other):):[^:][[:graph:]]+' \
-    || true

cdist/conf/type/__acl/explorer/checks

@@ -1,39 +0,0 @@
-#!/bin/sh -e
-#
-# 2019 Ander Punnar (ander-at-kvlt-dot-ee)
-#
-# 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/>.
-#
-
-# TODO check if filesystem has ACL turned on etc
-
-if [ -f "$__object/parameter/acl" ]
-then
-    grep -E '^(default:)?(user|group):' "$__object/parameter/acl" \
-    | while read -r acl
-    do
-        param="$( echo "$acl" | awk -F: '{print $(NF-2)}' )"
-        check="$( echo "$acl" | awk -F: '{print $(NF-1)}' )"
-
-        [ "$param" = 'user' ] && db=passwd || db="$param"
-
-        if ! getent "$db" "$check" > /dev/null
-        then
-            echo "missing $param '$check'" >&2
-            exit 1
-        fi
-    done
-fi

cdist/conf/type/__acl/explorer/file_is

@@ -1,31 +0,0 @@
-#!/bin/sh -e
-#
-# 2018 Ander Punnar (ander-at-kvlt-dot-ee)
-#
-# 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 [ -e "/$__object_id" ]
-then
-    if [ -d "/$__object_id" ]
-    then echo directory
-    elif [ -f "/$__object_id" ]
-    then echo regular
-    else echo other
-    fi
-else
-    echo missing
-fi

cdist/conf/type/__acl/gencode-remote

@@ -1,126 +0,0 @@
-#!/bin/sh -e
-#
-# 2018 Ander Punnar (ander-at-kvlt-dot-ee)
-#
-# 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/>.
-#
-
-file_is="$( cat "$__object/explorer/file_is" )"
-
-[ "$file_is" = 'missing' ] && [ -z "$__cdist_dry_run" ] && exit 0
-
-os="$( cat "$__global/explorer/os" )"
-
-acl_path="/$__object_id"
-
-acl_is="$( cat "$__object/explorer/acl_is" )"
-
-if [ -f "$__object/parameter/acl" ]
-then
-    acl_should="$( cat "$__object/parameter/acl" )"
-elif
-    [ -f "$__object/parameter/user" ] \
-        || [ -f "$__object/parameter/group" ] \
-        || [ -f "$__object/parameter/mask" ] \
-        || [ -f "$__object/parameter/other" ]
-then
-    acl_should="$( for param in user group mask other
-    do
-        [ ! -f "$__object/parameter/$param" ] && continue
-
-        echo "$param" | grep -Eq 'mask|other' && sep=:: || sep=:
-
-        echo "$param$sep$( cat "$__object/parameter/$param" )"
-    done )"
-else
-    echo 'no parameters set' >&2
-    exit 1
-fi
-
-if [ -f "$__object/parameter/default" ]
-then
-    acl_should="$( echo "$acl_should" \
-        | sed 's/^default://' \
-        | sort -u \
-        | sed 's/\(.*\)/default:\1\n\1/' )"
-fi
-
-if [ "$file_is" = 'regular' ] \
-    && echo "$acl_should" | grep -Eq '^default:'
-then
-    # only directories can have default ACLs,
-    # but instead of error,
-    # let's just remove default entries
-    acl_should="$( echo "$acl_should" | grep -Ev '^default:' )"
-fi
-
-if echo "$acl_should" | awk -F: '{ print $NF }' | grep -Fq 'X'
-then
-    [ "$file_is" = 'directory' ] && rep=x || rep=-
-
-    acl_should="$( echo "$acl_should" | sed "s/\\(.*\\)X/\\1$rep/" )"
-fi
-
-setfacl_exec='setfacl'
-
-if [ -f "$__object/parameter/recursive" ]
-then
-    if echo "$os" | grep -Fq 'freebsd'
-    then
-        echo "$os setfacl do not support recursive operations" >&2
-    else
-        setfacl_exec="$setfacl_exec -R"
-    fi
-fi
-
-if [ -f "$__object/parameter/remove" ]
-then
-    echo "$acl_is" | while read -r acl
-    do
-        # skip wanted ACL entries which already exist
-        # and skip mask and other entries, because we
-        # can't actually remove them, but only change.
-        if echo "$acl_should" | grep -Eq "^$acl" \
-            || echo "$acl" | grep -Eq '^(default:)?(mask|other)'
-        then continue
-        fi
-
-        if echo "$os" | grep -Fq 'freebsd'
-        then
-            remove="$acl"
-        else
-            remove="$( echo "$acl" | sed 's/:...$//' )"
-        fi
-
-        echo "$setfacl_exec -x \"$remove\" \"$acl_path\""
-        echo "removed '$remove'" >> "$__messages_out"
-    done
-fi
-
-for acl in $acl_should
-do
-    if ! echo "$acl_is" | grep -Eq "^$acl"
-    then
-        if echo "$os" | grep -Fq 'freebsd' \
-            && echo "$acl" | grep -Eq '^default:'
-        then
-            echo "setting default ACL in $os is currently not supported" >&2
-        else
-            echo "$setfacl_exec -m \"$acl\" \"$acl_path\""
-            echo "added '$acl'" >> "$__messages_out"
-        fi
-    fi
-done

cdist/conf/type/__acl/man.rst

@@ -1,85 +0,0 @@
-cdist-type__acl(7)
-==================
-
-NAME
-----
-cdist-type__acl - Set ACL entries
-
-
-DESCRIPTION
------------
-Fully supported and tested on Linux (ext4 filesystem), partial support for FreeBSD.
-
-See ``setfacl`` and ``acl`` manpages for more details.
-
-
-REQUIRED MULTIPLE PARAMETERS
-----------------------------
-acl
-   Set ACL entry following ``getfacl`` output syntax.
-
-
-BOOLEAN PARAMETERS
-------------------
-default
-   Set all ACL entries as default too.
-   Only directories can have default ACLs.
-   Setting default ACL in FreeBSD is currently not supported.
-
-recursive
-   Make ``setfacl`` recursive (Linux only), but not ``getfacl`` in explorer.
-
-remove
-   Remove undefined ACL entries.
-   ``mask`` and ``other`` entries can't be removed, but only changed.
-
-
-DEPRECATED PARAMETERS
----------------------
-Parameters ``user``, ``group``, ``mask`` and ``other`` are deprecated and they
-will be removed in future versions. Please use ``acl`` parameter instead.
-
-
-EXAMPLES
---------
-
-.. code-block:: sh
-
-    __acl /srv/project \
-        --default \
-        --recursive \
-        --remove \
-        --acl user:alice:rwx \
-        --acl user:bob:r-x \
-        --acl group:project-group:rwx \
-        --acl group:some-other-group:r-x \
-        --acl mask::r-x \
-        --acl other::r-x
-
-    # give Alice read-only access to subdir,
-    # but don't allow her to see parent content.
-
-    __acl /srv/project2 \
-        --remove \
-        --acl default:group:secret-project:rwx \
-        --acl group:secret-project:rwx \
-        --acl user:alice:--x
-
-    __acl /srv/project2/subdir \
-        --default \
-        --remove \
-        --acl group:secret-project:rwx \
-        --acl user:alice:r-x
-
-
-AUTHORS
--------
-Ander Punnar <ander-at-kvlt-dot-ee>
-
-
-COPYING
--------
-Copyright \(C) 2018 Ander Punnar. 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/conf/type/__acl/parameter/boolean

@@ -1,3 +0,0 @@
-recursive
-default
-remove

cdist/conf/type/__acl/parameter/deprecated/group

@@ -1 +0,0 @@
-see manual for details

cdist/conf/type/__acl/parameter/deprecated/mask

@@ -1 +0,0 @@
-see manual for details

cdist/conf/type/__acl/parameter/deprecated/other

@@ -1 +0,0 @@
-see manual for details

cdist/conf/type/__acl/parameter/deprecated/user

@@ -1 +0,0 @@
-see manual for details

cdist/conf/type/__acl/parameter/optional

@@ -1,2 +0,0 @@
-mask
-other

cdist/conf/type/__acl/parameter/optional_multiple

@@ -1,3 +0,0 @@
-acl
-user
-group

cdist/conf/type/__apt_key/explorer/state

@@ -27,18 +27,6 @@ else
    keyid="$__object_id"
 fi
 
-keydir="$(cat "$__object/parameter/keydir")"
+apt-key export "$keyid" | head -n 1 | grep -Fqe "BEGIN PGP PUBLIC KEY BLOCK" \
-keyfile="$keydir/$__object_id.gpg"
+   && echo present \
-
+   || echo absent
-if [ -d "$keydir" ]
-then
-   if [ -f "$keyfile" ]
-   then echo present
-   else echo absent
-   fi
-else
-   # fallback to deprecated apt-key
-   apt-key export "$keyid" | head -n 1 | grep -Fqe "BEGIN PGP PUBLIC KEY BLOCK" \
-      && echo present \
-      || echo absent
-fi

cdist/conf/type/__apt_key/gencode-remote

@@ -31,84 +31,12 @@ if [ "$state_should" = "$state_is" ]; then
    exit 0
 fi
 
-keydir="$(cat "$__object/parameter/keydir")"
-keyfile="$keydir/$__object_id.gpg"
-
 case "$state_should" in
    present)
       keyserver="$(cat "$__object/parameter/keyserver")"
-
+      echo "apt-key adv --keyserver \"$keyserver\" --recv-keys \"$keyid\""
-      if [ -f "$__object/parameter/uri" ]; then
-         uri="$(cat "$__object/parameter/uri")"
-
-         if [ -d "$keydir" ]; then
-            cat << EOF
-
-curl -s -L \\
-    -o "$keyfile" \\
-    "$uri"
-
-key="\$( cat "$keyfile" )"
-
-if echo "\$key" | grep -Fq 'BEGIN PGP PUBLIC KEY BLOCK'
-then
-    echo "\$key" | gpg --dearmor > "$keyfile"
-fi
-
-EOF
-         else
-            # fallback to deprecated apt-key
-            echo "curl -s -L '$uri' | apt-key add -"
-         fi
-      elif [ -d "$keydir" ]; then
-         tmp='/tmp/cdist_apt_key_tmp'
-
-         # we need to kill gpg after 30 seconds, because gpg
-         # can get stuck if keyserver is not responding.
-         # exporting env var and not exit 1,
-         # because we need to clean up and kill dirmngr.
-         cat << EOF
-
-mkdir -m 700 -p "$tmp"
-
-if timeout 30s \\
-    gpg --homedir "$tmp" \\
-        --keyserver "$keyserver" \\
-        --recv-keys "$keyid"
-then
-    gpg --homedir "$tmp" \\
-        --export "$keyid" \\
-        > "$keyfile"
-else
-    export GPG_GOT_STUCK=1
-fi
-
-GNUPGHOME="$tmp" gpgconf --kill dirmngr
-
-rm -rf "$tmp"
-
-if [ -n "\$GPG_GOT_STUCK" ]
-then
-    echo "GPG GOT STUCK - no response from keyserver after 30 seconds" >&2
-    exit 1
-fi
-
-EOF
-      else
-         # fallback to deprecated apt-key
-         echo "apt-key adv --keyserver \"$keyserver\" --recv-keys \"$keyid\""
-      fi
-
-      echo "added '$keyid'" >> "$__messages_out"
    ;;
    absent)
-      if [ -f "$keyfile" ]; then
+      echo "apt-key del \"$keyid\""
-         echo "rm '$keyfile'"
-      else
-         # fallback to deprecated apt-key
-         echo "apt-key del \"$keyid\""
-      fi
-
-      echo "removed '$keyid'" >> "$__messages_out"
    ;;
 esac

cdist/conf/type/__apt_key/man.rst

@@ -28,12 +28,6 @@ keyserver
    the keyserver from which to fetch the key. If omitted the default set
    in ./parameter/default/keyserver is used.
 
-keydir
-   key save location, defaults to ``/etc/apt/trusted.pgp.d``
-
-uri
-   the URI from which to download the key
-
 
 EXAMPLES
 --------
@@ -53,20 +47,15 @@ EXAMPLES
     # same thing with other keyserver
     __apt_key UbuntuArchiveKey --keyid 437D05B5 --keyserver keyserver.ubuntu.com
 
-    # download key from the internet
-    __apt_key rabbitmq \
-       --uri http://www.rabbitmq.com/rabbitmq-signing-key-public.asc
-
 
 AUTHORS
 -------
 Steven Armstrong <steven-cdist--@--armstrong.cc>
-Ander Punnar <ander-at-kvlt-dot-ee>
 
 
 COPYING
 -------
-Copyright \(C) 2011-2019 Steven Armstrong and Ander Punnar. You can
+Copyright \(C) 2011-2014 Steven Armstrong. You can redistribute it
-redistribute it and/or modify it under the terms of the GNU General Public
+and/or modify it under the terms of the GNU General Public License as
-License as published by the Free Software Foundation, either version 3 of the
+published by the Free Software Foundation, either version 3 of the
 License, or (at your option) any later version.

cdist/conf/type/__apt_key/manifest

@@ -1,8 +0,0 @@
-#!/bin/sh -e
-
-__package gnupg
-
-if [ -f "$__object/parameter/uri" ]
-then __package curl
-else __package dirmngr
-fi

cdist/conf/type/__apt_key/parameter/default/keydir

@@ -1 +0,0 @@
-/etc/apt/trusted.gpg.d

cdist/conf/type/__apt_key/parameter/optional

@@ -1,5 +1,3 @@
 state
 keyid
 keyserver
-keydir
-uri

cdist/conf/type/__apt_ppa/explorer/state

@@ -23,11 +23,10 @@
 
 name="$__object_id"
 
-# shellcheck disable=SC1091
 . /etc/lsb-release
 
 repo_name="${name#ppa:}"
-repo_file_name="$(echo "$repo_name" | sed -e 's|[/:]|-|' -e 's|\.|_|')-${DISTRIB_CODENAME}.list"
+repo_file_name="$(echo "$repo_name" | sed -e "s|[/:]|-|" -e "s|\.|_|")-${DISTRIB_CODENAME}.list"
 
 [ -s "/etc/apt/sources.list.d/${repo_file_name}" ] \
    && echo present || echo absent

cdist/conf/type/__apt_ppa/gencode-remote

@@ -29,9 +29,9 @@ fi
 
 case "$state_should" in
    present)
-      echo "add-apt-repository '$name'"
+      echo add-apt-repository \"$name\"
    ;;
    absent)
-      echo "remove-apt-repository '$name'"
+      echo remove-apt-repository \"$name\"
    ;;
 esac

cdist/conf/type/__apt_ppa/manifest

@@ -18,6 +18,8 @@
 # along with cdist. If not, see <http://www.gnu.org/licenses/>.
 #
 
+name="$__object_id"
+
 __package software-properties-common
 
 require="__package/software-properties-common" \

cdist/conf/type/__block/gencode-remote

@@ -18,11 +18,6 @@
 # along with cdist. If not, see <http://www.gnu.org/licenses/>.
 #
 
-# quote function from http://www.etalabs.net/sh_tricks.html
-quote() {
-   printf '%s\n' "$1" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/'/"
-}
-
 file="$(cat "$__object/parameter/file" 2>/dev/null || echo "/$__object_id")"
 state_should=$(cat "$__object/parameter/state")
 prefix=$(cat "$__object/parameter/prefix" 2>/dev/null || echo "#cdist:__block/$__object_id")
@@ -51,7 +46,7 @@ tmpfile=\$(mktemp ${file}.cdist.XXXXXXXXXX)
 if [ -f "$file" ]; then
    cp -p "$file" "\$tmpfile"
 fi
-awk -v prefix=^$(quote "$prefix")\$ -v suffix=^$(quote "$suffix")\$ '
+awk -v prefix="^$prefix\$" -v suffix="^$suffix\$" '
 {
    if (match(\$0,prefix)) {
       triggered=1

cdist/conf/type/__block/manifest

@@ -18,6 +18,8 @@
 # along with cdist. If not, see <http://www.gnu.org/licenses/>.
 #
 
+
+file="$(cat "$__object/parameter/file" 2>/dev/null || echo "/$__object_id")"
 prefix=$(cat "$__object/parameter/prefix" 2>/dev/null || echo "#cdist:__block/$__object_id")
 suffix=$(cat "$__object/parameter/suffix" 2>/dev/null || echo "#/cdist:__block/$__object_id")
 text=$(cat "$__object/parameter/text")

cdist/conf/type/__ccollect_source/gencode-remote

@@ -42,20 +42,21 @@ get_current_value() {
 }
 
 set_group() {
-    echo "chgrp '$1' '$destination'"
+    echo chgrp \"$1\" \"$destination\"
-    echo "chgrp '$1'" >> "$__messages_out"
+    echo chgrp $1 >> "$__messages_out"
 }
 
 set_owner() {
-    echo "chown '$1' '$destination'"
+    echo chown \"$1\" \"$destination\"
-    echo "chown '$1'" >> "$__messages_out"
+    echo chown $1 >> "$__messages_out"
 }
 
 set_mode() {
-   echo "chmod '$1' '$destination'"
+   echo chmod \"$1\" \"$destination\"
-   echo "chmod '$1'" >> "$__messages_out"
+   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
@@ -66,11 +67,11 @@ case "$state_should" in
 
             # change 0xxx format to xxx format => same as stat returns
             if [ "$attribute" = mode ]; then
-                value_should="$(echo "$value_should" | sed 's/^0\(...\)/\1/')"
+                value_should="$(echo $value_should | sed 's/^0\(...\)/\1/')"
             fi
             
             value_is="$(get_current_value "$attribute" "$value_should")"
-            if [ -f "$__object/files/set-attributes" ] || [ "$value_should" != "$value_is" ]; then
+            if [ -f "$__object/files/set-attributes" -o "$value_should" != "$value_is" ]; then
                 "set_$attribute" "$value_should"
             fi
         fi
@@ -80,7 +81,7 @@ case "$state_should" in
 
     absent)
         if [ "$type" = "file" ]; then
-            echo "rm -f '$destination'"
+            echo rm -f \"$destination\"
             echo remove >> "$__messages_out"
         fi
     ;;

cdist/conf/type/__ccollect_source/manifest

@@ -22,7 +22,7 @@ name="$__object_id"
 state="$(cat "$__object/parameter/state")"
 source="$(cat "$__object/parameter/source")"
 destination="$(cat "$__object/parameter/destination")"
-ccollectconf="$(sed 's,/$,,' "$__object/parameter/ccollectconf")"
+ccollectconf="$(cat "$__object/parameter/ccollectconf" | sed 's,/$,,')"
 
 sourcedir="$ccollectconf/sources"
 basedir="$sourcedir/$name"
@@ -55,5 +55,5 @@ if [ -f "$__object/parameter/exclude" ]; then
 fi
 
 if [ -f "$__object/parameter/create-destination" ]; then
-    __directory "${destination}" --parents --state "${state}"
+    __directory "${destination}" --parents --state ${state}
 fi

cdist/conf/type/__cdist/man.rst

@@ -30,7 +30,7 @@ username
 
 source
     Select the source from which to clone cdist from.
-    Defaults to "git@code.ungleich.ch:ungleich-public/cdist.git".
+    Defaults to "git://github.com/ungleich/cdist.git".
 
 
 branch
@@ -47,7 +47,7 @@ EXAMPLES
     __cdist /home/cdist/cdist
 
     # Use alternative source
-    __cdist --source "git@code.ungleich.ch:ungleich-public/cdist.git" /home/cdist/cdist
+    __cdist --source "git://github.com/ungleich/cdist" /home/cdist/cdist
 
 
 AUTHORS

cdist/conf/type/__cdist/parameter/default/source

@@ -1 +1 @@
-git@code.ungleich.ch:ungleich-public/cdist.git
+git://github.com/ungleich/cdist.git

cdist/conf/type/__check_messages/gencode-remote

@@ -1,26 +0,0 @@
-#!/bin/sh -e
-#
-# 2019 Ander Punnar (ander-at-kvlt-dot-ee)
-#
-# 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 grep -Eq \
-    "$( cat "$__object/parameter/pattern" )" \
-    "$__messages_in"
-then
-    tee "$__messages_out" < "$__object/parameter/execute"
-fi

cdist/conf/type/__check_messages/man.rst

@@ -1,52 +0,0 @@
-cdist-type__check_messages(7)
-=============================
-
-NAME
-----
-cdist-type__check_messages - Check messages for pattern and execute command on match.
-
-
-DESCRIPTION
------------
-Check messages for pattern and execute command on match.
-
-This type is useful if you chain together multiple related types using
-dependencies and want to restart service if at least one type changes
-something.
-
-For more information about messages see `cdist messaging <cdist-messaging.html>`_.
-
-For more information about dependencies and execution order see
-`cdist manifest <cdist-manifest.html#dependencies>`_ documentation.
-
-
-REQUIRED PARAMETERS
--------------------
-pattern
-   Extended regular expression pattern for search (passed to ``grep -E``).
-
-execute
-   Command to execute on pattern match.
-
-
-EXAMPLES
---------
-
-.. code-block:: sh
-
-    __check_messages munin \
-        --pattern '^__(file|link|line)/etc/munin/' \
-        --execute 'service munin-node restart'
-
-
-AUTHORS
--------
-Ander Punnar <ander-at-kvlt-dot-ee>
-
-
-COPYING
--------
-Copyright \(C) 2019 Ander Punnar. 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/conf/type/__check_messages/parameter/required

@@ -1,2 +0,0 @@
-pattern
-execute

cdist/conf/type/__clean_path/explorer/list

@@ -1,35 +0,0 @@
-#!/bin/sh -e
-#
-# 2019 Ander Punnar (ander-at-kvlt-dot-ee)
-#
-# 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/>.
-#
-
-path="/$__object_id"
-
-[ ! -d "$path" ] && exit 0
-
-pattern="$( cat "$__object/parameter/pattern" )"
-
-if [ -f "$__object/parameter/exclude" ]
-then
-    exclude="$( cat "$__object/parameter/exclude" )"
-
-    find "$path" -mindepth 1 -maxdepth 1 -regex "$pattern" \
-        -and -not -regex "$exclude"
-else
-    find "$path" -mindepth 1 -maxdepth 1 -regex "$pattern"
-fi

cdist/conf/type/__clean_path/gencode-remote

@@ -1,48 +0,0 @@
-#!/bin/sh -e
-#
-# 2019 Ander Punnar (ander-at-kvlt-dot-ee)
-#
-# 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/>.
-#
-
-[ ! -s "$__object/explorer/list" ] && exit 0
-
-path="/$__object_id"
-
-pattern="$( cat "$__object/parameter/pattern" )"
-
-if [ -f "$__object/parameter/exclude" ]
-then
-    exclude="$( cat "$__object/parameter/exclude" )"
-
-    echo "find '$path' -mindepth 1 -maxdepth 1 -regex '$pattern'" \
-        "-and -not -regex '$exclude'" \
-        '-exec rm -rf {} \;'
-else
-    echo "find '$path' -mindepth 1 -maxdepth 1 -regex '$pattern'" \
-        '-exec rm -rf {} \;'
-fi
-
-while read -r f
-do
-    echo "removed '$f'" >> "$__messages_out"
-done \
-< "$__object/explorer/list"
-
-if [ -f "$__object/parameter/onchange" ]
-then
-    cat "$__object/parameter/onchange"
-fi

cdist/conf/type/__clean_path/man.rst

@@ -1,60 +0,0 @@
-cdist-type__clean_path(7)
-=========================
-
-NAME
-----
-cdist-type__clean_path - Remove files and directories which match the pattern.
-
-
-DESCRIPTION
------------
-Remove files and directories which match the pattern.
-
-Provided path (as __object_id) must be a directory.
-
-Patterns are passed to ``find``'s ``-regex`` - see ``find(1)`` for more details.
-
-Look up of files and directories is non-recursive (``-maxdepth 1``).
-
-Parent directory is excluded (``-mindepth 1``).
-
-This type is not POSIX compatible (sorry, Solaris users).
-
-
-REQUIRED PARAMETERS
--------------------
-pattern
-   Pattern of files which are removed from path.
-
-
-OPTIONAL PARAMETERS
--------------------
-exclude
-   Pattern of files which are excluded from removal.
-
-onchange
-   The code to run if files or directories were removed.
-
-
-EXAMPLES
---------
-
-.. code-block:: sh
-
-    __clean_path /etc/apache2/conf-enabled \
-        --pattern '.+' \
-        --exclude '.+\(charset\.conf\|security\.conf\)' \
-        --onchange 'service apache2 restart'
-
-
-AUTHORS
--------
-Ander Punnar <ander-at-kvlt-dot-ee>
-
-
-COPYING
--------
-Copyright \(C) 2019 Ander Punnar. 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/conf/type/__clean_path/parameter/optional

@@ -1,2 +0,0 @@
-exclude
-onchange

cdist/conf/type/__clean_path/parameter/required

@@ -1 +0,0 @@
-pattern

cdist/conf/type/__config_file/manifest

@@ -19,8 +19,7 @@
 #
 
 set -- "/${__object_id}"
-cd "$__object/parameter/"
+for param in $(ls "$__object/parameter/"); do
-for param in *; do
    case "$param" in
       source)
          source="$(cat "$__object/parameter/source")"

cdist/conf/type/__consul/files/versions/1.2.3/cksum

@@ -1 +0,0 @@
-191982 110369685

cdist/conf/type/__consul/files/versions/1.2.3/source

@@ -1 +0,0 @@
-https://releases.hashicorp.com/consul/1.2.3/consul_1.2.3_linux_amd64.zip

cdist/conf/type/__consul/files/versions/1.3.0/cksum

@@ -1 +0,0 @@
-1714523667 98363467 consul

cdist/conf/type/__consul/files/versions/1.3.0/source

@@ -1 +0,0 @@
-https://releases.hashicorp.com/consul/1.3.0/consul_1.3.0_linux_amd64.zip

cdist/conf/type/__consul/files/versions/1.5.0/cksum

@@ -1 +0,0 @@
-886614099 103959898 consul

cdist/conf/type/__consul/files/versions/1.5.0/source

@@ -1 +0,0 @@
-https://releases.hashicorp.com/consul/1.5.0/consul_1.5.0_linux_amd64.zip

cdist/conf/type/__consul/gencode-remote

@@ -39,10 +39,10 @@ version_dir="$versions_dir/$version"
 
 source=$(cat "$version_dir/source")
 source_file_name="${source##*/}"
-cksum_should=$(cut -d' ' -f1,2 "$version_dir/cksum")
+cksum_should=$(cat "$version_dir/cksum" | cut -d' ' -f1,2)
 
 cat << eof
-    tmpdir=\$(mktemp -d -p /tmp "${__type##*/}.XXXXXXXXXX")
+    tmpdir=\$(mktemp -d --tmpdir="/tmp" "${__type##*/}.XXXXXXXXXX")
     curl -s -L "$source" > "\$tmpdir/$source_file_name"
     unzip -p "\$tmpdir/$source_file_name" > "${destination}.tmp"
     rm -rf "\$tmpdir"

cdist/conf/type/__consul/man.rst

@@ -40,11 +40,9 @@ MESSAGES
 If consul binary is created using __staged_file then underlaying __file type messages are emitted.
 
 If consul binary is created by direct method then the following messages are emitted:
-
 /usr/local/bin/consul created
     consul binary was created
 
-
 EXAMPLES
 --------
 

cdist/conf/type/__consul/manifest

@@ -24,7 +24,7 @@
 os=$(cat "$__global/explorer/os")
 
 case "$os" in
-   alpine|scientific|centos|redhat|ubuntu|debian|devuan|archlinux|gentoo)
+   scientific|centos|redhat|ubuntu|debian|devuan|archlinux|gentoo)
       # any linux should work
       :
    ;;
@@ -47,7 +47,6 @@ fi
 
 if [ -f "$__object/parameter/direct" ]; then
     __package unzip
-    __package curl
 else
     __staged_file /usr/local/bin/consul \
        --source "$(cat "$version_dir/source")" \

cdist/conf/type/__consul_agent/files/consul.sys-openrc

@@ -1,38 +0,0 @@
-#!/sbin/openrc-run
-# 2019 Nico Schottelius (nico-cdist at schottelius.org)
-
-description="consul agent"
-
-pidfile="${CONSUL_PIDFILE:-"/var/run/$RC_SVCNAME/pidfile"}"
-command="${CONSUL_BINARY:-"/usr/local/bin/consul"}"
-
-
-checkconfig() {
-	if [ ! -d /var/run/consul ] ; then
-		mkdir -p /var/run/consul || return 1
-        chown consul:consul /var/run/$NAME || return 1
-        chmod 2770 /var/run/$NAME || return 1
-	fi
-}
-
-start() {
-    need net
-
-    start-stop-daemon --start --quiet --oknodo \
-            --pidfile "$pidfile" --background \
-            --exec $command -- agent -pid-file="$pidfile" -config-dir /etc/consul/conf.d
-}
-start_pre() {
-	checkconfig
-}
-
-stop() {
-	if [ "${RC_CMD}" = "restart" ] ; then
-		checkconfig || return 1
-	fi
-
-	ebegin "Stopping $RC_SVCNAME"
-	start-stop-daemon --stop --exec "$command" \
-		--pidfile "$pidfile" --quiet
-	eend $?
-}

cdist/conf/type/__consul_agent/files/consul.sysv-debian

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# 2015-2018 Nico Schottelius (nico-cdist at schottelius.org)
+# 2015 Nico Schottelius (nico-cdist at schottelius.org)
 # 2015 Steven Armstrong (steven-cdist at armstrong.cc)
 #
 # This file is part of cdist.
@@ -18,24 +18,11 @@
 # You should have received a copy of the GNU General Public License
 # along with cdist. If not, see <http://www.gnu.org/licenses/>.
 #
-### BEGIN INIT INFO
-# Provides:          consul
-# Required-Start:    $network $local_fs $remote_fs
-# Required-Stop:     $local_fs
-# Should-Start:
-# Should-Stop:
-# Short-Description: consul
-# Description:       consul agent
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-### END INIT INFO
 
 if [ -f "/etc/default/consul" ]; then
-    # shellcheck disable=SC1091
     . /etc/default/consul
 fi
 
-# shellcheck disable=SC1091
 . /lib/lsb/init-functions
 
 NAME=consul

cdist/conf/type/__consul_agent/files/consul.sysv-redhat

@@ -11,52 +11,49 @@
 # pidfile: /var/run/consul/pidfile
 
 # Source function library.
-
-# shellcheck disable=SC1091
 . /etc/init.d/functions
 NAME=consul
 CONSUL=/usr/local/bin/consul
-CONFIG="/etc/$NAME/conf.d"
+CONFIG=/etc/$NAME/conf.d
-PID_FILE="/var/run/$NAME/pidfile"
+PID_FILE=/var/run/$NAME/pidfile
-LOG_FILE="/var/log/$NAME"
+LOG_FILE=/var/log/$NAME
 
-# shellcheck disable=SC1090
+[ -e /etc/sysconfig/$NAME ] && . /etc/sysconfig/$NAME
-[ -e "/etc/sysconfig/$NAME" ] && . "/etc/sysconfig/$NAME"
+export GOMAXPROCS=${GOMAXPROCS:-2}
-export GOMAXPROCS="${GOMAXPROCS:-2}"
 
-mkdir -p "/var/run/$NAME"
+mkdir -p /var/run/$NAME
-chown consul:consul "/var/run/$NAME"
+chown consul:consul /var/run/$NAME
-chmod 2770 "/var/run/$NAME"
+chmod 2770 /var/run/$NAME
 
 
 start() {
-   printf "Starting %s: " "$NAME"
+   echo -n "Starting $NAME: "
    daemon --user=consul \
       --pidfile="$PID_FILE" \
       "$CONSUL" agent -pid-file="$PID_FILE" -config-dir "$CONFIG" >> "$LOG_FILE" &
    retcode=$?
-   touch "/var/lock/subsys/$NAME"
+   touch /var/lock/subsys/$NAME
-   return "$retcode"
+   return $retcode
 }
 
 stop() {
-   printf "Shutting down %s: " "$NAME"
+   echo -n "Shutting down $NAME: "
-   killproc -p "$PID_FILE" "$NAME"
+   killproc -p "$PID_FILE" $NAME
    retcode=$?
-   rm -f "/var/lock/subsys/$NAME"
+   rm -f /var/lock/subsys/$NAME
-   return "$retcode"
+   return $retcode
 }
 
 case "$1" in
    start)
-      if status -p "$PID_FILE" "$NAME" >/dev/null; then
+      if $(status -p "$PID_FILE" $NAME >/dev/null); then
          echo "$NAME already running"
       else
          start
       fi
    ;;
    stop)
-      if status -p "$PID_FILE" "$NAME" >/dev/null; then
+      if $(status -p "$PID_FILE" $NAME >/dev/null); then
          stop
       else
          echo "$NAME not running"
@@ -66,25 +63,25 @@ case "$1" in
       "$CONSUL" info
    ;;
    status)
-      status -p "$PID_FILE" "$NAME"
+      status -p "$PID_FILE" $NAME
       exit $?
    ;;
    restart)
-      if status -p "$PID_FILE" "$NAME" >/dev/null; then
+      if $(status -p "$PID_FILE" $NAME >/dev/null); then
          stop
       fi
       start
    ;;
    reload)
-      if status -p "$PID_FILE" "$NAME" >/dev/null; then
+      if $(status -p "$PID_FILE" $NAME >/dev/null); then
-         kill -HUP "$(cat "$PID_FILE")"
+         kill -HUP `cat $PID_FILE`
       else
          echo "$NAME not running"
       fi
    ;;
    condrestart)
-      if [ -f "/var/lock/subsys/$NAME" ]; then
+      if [ -f /var/lock/subsys/$NAME ]; then
-         if status -p "$PID_FILE" "$NAME" >/dev/null; then
+         if $(status -p "$PID_FILE" $NAME >/dev/null); then
             stop
          fi
          start

cdist/conf/type/__consul_agent/manifest

@@ -1,7 +1,7 @@
 #!/bin/sh -e
 #
 # 2015 Steven Armstrong (steven-cdist at armstrong.cc)
-# 2015-2019 Nico Schottelius (nico-cdist at schottelius.org)
+# 2015 Nico Schottelius (nico-cdist at schottelius.org)
 #
 # This file is part of cdist.
 #
@@ -23,7 +23,7 @@
 os=$(cat "$__global/explorer/os")
 
 case "$os" in
-   alpine|scientific|centos|debian|devuan|redhat|ubuntu)
+   scientific|centos|debian|devuan|redhat|ubuntu)
       # whitelist safeguard
       :
    ;;
@@ -66,7 +66,7 @@ require="__directory/etc/consul" \
    __directory "$conf_dir" \
       --owner root --group "$group" --mode 750 --state "$state"
 
-if [ -f "$__object/parameter/ca-file-source" ] || [ -f "$__object/parameter/cert-file-source" ] || [ -f "$__object/parameter/key-file-source" ]; then
+if [ -f "$__object/parameter/ca-file-source" -o -f "$__object/parameter/cert-file-source" -o -f "$__object/parameter/key-file-source" ]; then
    # create directory for ssl certs
    require="__directory/etc/consul" \
       __directory /etc/consul/ssl \
@@ -84,8 +84,7 @@ echo "{"
 # parameters we define ourself
 printf '   "data_dir": "%s"\n' "$data_dir"
 
-cd "$__object/parameter/"
+for param in $(ls "$__object/parameter/"); do
-for param in *; do
    case "$param" in
       state|user|group|json-config) continue ;;
       ca-file-source|cert-file-source|key-file-source)
@@ -181,25 +180,22 @@ init_upstart()
 
 # Install init script to start on boot
 case "$os" in
-    alpine|devuan)
+   centos|redhat)
-        init_sysvinit debian
+      os_version="$(sed 's/[^0-9.]//g' "$__global/explorer/os_version")"
-        ;;
+      major_version="${os_version%%.*}"
-    centos|redhat)
+      case "$major_version" in
-        os_version="$(sed 's/[^0-9.]//g' "$__global/explorer/os_version")"
+         [456])
-        major_version="${os_version%%.*}"
+            init_sysvinit redhat
-        case "$major_version" in
+         ;;
-            [456])
+         7)
-                init_sysvinit redhat
+            init_systemd
-                ;;
+         ;;
-            7)
+         *)
-                init_systemd
+            echo "Unsupported CentOS/Redhat version: $os_version" >&2
-                ;;
+            exit 1
-            *)
+         ;;
-                echo "Unsupported CentOS/Redhat version: $os_version" >&2
+      esac
-                exit 1
+   ;;
-                ;;
-        esac
-        ;;
 
     debian)
         os_version=$(cat "$__global/explorer/os_version")
@@ -209,7 +205,7 @@ case "$os" in
             [567])
                 init_sysvinit debian
             ;;
-            [89])
+            8)
                 init_systemd
             ;;
             *)
@@ -217,9 +213,13 @@ case "$os" in
                 exit 1
             ;;
         esac
-        ;;
+    ;;
+
+    devuan)
+        init_sysvinit debian
+    ;;
 
     ubuntu)
         init_upstart
-        ;;
+    ;;
 esac

cdist/conf/type/__consul_check/manifest

@@ -40,7 +40,7 @@ if [ ! -f "$__object/parameter/interval" ]; then
       fi
    done
 fi
-if [ -f "$__object/parameter/docker-container-id" ] && [ ! -f "$__object/parameter/script" ]; then
+if [ -f "$__object/parameter/docker-container-id" -a ! -f "$__object/parameter/script" ]; then
    echo "When using --docker-container-id you must also define --script." >&2
    exit 1
 fi
@@ -50,8 +50,7 @@ fi
 echo "{"
 printf '   "check": {\n'
 printf '      "name": "%s"\n' "$name"
-cd "$__object/parameter/"
+for param in $(ls "$__object/parameter/"); do
-for param in *; do
    case "$param" in
       state|name) continue ;;
       *)

cdist/conf/type/__consul_service/manifest

@@ -24,15 +24,15 @@ conf_file="service_${name}.json"
 state="$(cat "$__object/parameter/state")"
 
 # Sanity checks
-if [ -f "$__object/parameter/check-script" ] && [ -f "$__object/parameter/check-ttl" ]; then
+if [ -f "$__object/parameter/check-script" -a -f "$__object/parameter/check-ttl" ]; then
    echo "Use either --check-script together with --check-interval OR --check-ttl, but not both" >&2
    exit 1
 fi
-if [ -f "$__object/parameter/check-script" ] && [ ! -f "$__object/parameter/check-interval" ]; then
+if [ -f "$__object/parameter/check-script" -a ! -f "$__object/parameter/check-interval" ]; then
    echo "When using --check-script you must also define --check-interval" >&2
    exit 1
 fi
-if [ -f "$__object/parameter/check-http" ] && [ ! -f "$__object/parameter/check-interval" ]; then
+if [ -f "$__object/parameter/check-http" -a ! -f "$__object/parameter/check-interval" ]; then
    echo "When using --check-http you must also define --check-interval" >&2
    exit 1
 fi
@@ -42,8 +42,7 @@ fi
 echo "{"
 printf '   "service": {\n'
 printf '      "name": "%s"\n' "$name"
-cd "$__object/parameter/"
+for param in $(ls "$__object/parameter/"); do
-for param in *; do
    case "$param" in
       state|name|check-interval) continue ;;
       check-script)

cdist/conf/type/__consul_template/files/consul-template.sysv

@@ -10,75 +10,72 @@
 # pidfile: /var/run/consul-template/pidfile
 
 # Source function library.
-
-# shellcheck disable=SC1091
 . /etc/init.d/functions
 NAME=consul-template
 CONSUL_TEMPLATE=/usr/local/bin/consul-template
-CONFIG="/etc/$NAME/conf.d"
+CONFIG=/etc/$NAME/conf.d
-PID_FILE="/var/run/$NAME/pidfile"
+PID_FILE=/var/run/$NAME/pidfile
-LOG_FILE="/var/log/$NAME"
+LOG_FILE=/var/log/$NAME
 
-# shellcheck disable=SC1090
+[ -e /etc/sysconfig/$NAME ] && . /etc/sysconfig/$NAME
-[ -e "/etc/sysconfig/$NAME" ] && . "/etc/sysconfig/$NAME"
+export CONSUL_TEMPLATE_LOG=${CONSUL_TEMPLATE_LOG:-info}
-export CONSUL_TEMPLATE_LOG="${CONSUL_TEMPLATE_LOG:-info}"
+export GOMAXPROCS=${GOMAXPROCS:-2}
-export GOMAXPROCS="${GOMAXPROCS:-2}"
 
-mkdir -p "/var/run/$NAME"
+mkdir -p /var/run/$NAME
 
 start() {
-   printf "Starting %s: " "$NAME"
+   echo -n "Starting $NAME: "
    daemon --pidfile="$PID_FILE" \
       "$CONSUL_TEMPLATE" -config "$CONFIG" >> "$LOG_FILE" 2>&1 &
-   echo "$!" > "$PID_FILE"
+   echo $! > "$PID_FILE"
    retcode=$?
-   touch "/var/lock/subsys/$NAME"
+   touch /var/lock/subsys/$NAME
-   return "$retcode"
+   return $retcode
 }
 
 stop() {
-   printf "Shutting down %s: " "$NAME"
+   echo -n "Shutting down $NAME: "
-   killproc -p "$PID_FILE" "$CONSUL_TEMPLATE"
+   killproc -p $PID_FILE $CONSUL_TEMPLATE
    retcode=$?
-   rm -f "/var/lock/subsys/$NAME"
+   rm -f /var/lock/subsys/$NAME
-   return "$retcode"
+   return $retcode
 }
 
 case "$1" in
    start)
-      if status -p "$PID_FILE" "$NAME" >/dev/null; then
+      if $(status -p "$PID_FILE" $NAME >/dev/null); then
          echo "$NAME already running"
       else
          start
       fi
    ;;
    stop)
-      if status -p "$PID_FILE" "$NAME" >/dev/null; then
+      if $(status -p "$PID_FILE" $NAME >/dev/null); then
          stop
       else
          echo "$NAME not running"
       fi
    ;;
    status)
-      status -p "$PID_FILE" "$NAME"
+      status -p "$PID_FILE" $NAME
       exit $?
    ;;
    restart)
-      if status -p "$PID_FILE" "$NAME" >/dev/null; then
+      if $(status -p "$PID_FILE" $NAME >/dev/null); then
          stop
       fi
       start
    ;;
    reload)
-      if status -p "$PID_FILE" "$NAME" >/dev/null; then
+      if $(status -p "$PID_FILE" $NAME >/dev/null); then
-          kill -HUP "$(cat "$PID_FILE")"
+         kill -HUP `cat $PID_FILE`
       else
          echo "$NAME not running"
       fi
    ;;
    condrestart)
-      if [ -f "/var/lock/subsys/$NAME" ]; then
+      if [ -f /var/lock/subsys/$NAME ]; then
-         if status -p "$PID_FILE" "$NAME" >/dev/null; then
+         if $(status -p "$PID_FILE" $NAME >/dev/null); then
             stop
          fi
          start

cdist/conf/type/__consul_template/manifest

@@ -75,8 +75,7 @@ require="__directory/etc/consul-template" \
 
 # Generate hcl config file
 (
-cd "$__object/parameter/"
+for param in $(ls "$__object/parameter/"); do
-for param in *; do
    case "$param" in
       auth-password|state|ssl-*|syslog-*|version|vault-token|vault-ssl*) continue ;;
       auth-username)

cdist/conf/type/__consul_template_template/manifest

@@ -26,36 +26,32 @@ template_dir="/etc/consul-template/template"
 require=""
 
 # Sanity checks
-if [ -f "$__object/parameter/source" ] && [ -f "$__object/parameter/source-file" ]; then
+if [ -f "$__object/parameter/source" -a -f "$__object/parameter/source-file" ]; then
    echo "Use either --source OR --source-file, but not both." >&2
    exit 1
 fi
-if [ ! -f "$__object/parameter/source" ] && [ ! -f "$__object/parameter/source-file" ]; then
+if [ ! -f "$__object/parameter/source" -a ! -f "$__object/parameter/source-file" ]; then
    echo "Either --source OR --source-file must be given." >&2
    exit 1
 fi
 
-if [ -f "$__object/parameter/source-file" ]; then
-    destination="${template_dir}/${name}"
-    require="__file${destination}"
-fi
-
 # Generate hcl config file
-{
+(
 printf 'template {\n'
-cd "$__object/parameter/"
+for param in $(ls "$__object/parameter/"); do
-for param in *; do
    case "$param" in
       source-file)
          source="$(cat "$__object/parameter/$param")"
          if [ "$source" = "-" ]; then
             source="$__object/stdin"
          fi
+         destination="${template_dir}/${name}"
          require="__directory${template_dir}" \
             __file "$destination" \
                --owner root --group root --mode 640 \
                --source "$source" \
                --state "$state"
+         export require="__file${destination}"
          printf '   source = "%s"\n' "$destination"
 
       ;;
@@ -69,7 +65,7 @@ for param in *; do
    esac
 done
 printf '}\n'
-} | \
+) | \
 require="$require __directory${conf_dir}" \
    __config_file "${conf_dir}/${conf_file}" \
       --owner root --group root --mode 640 \

cdist/conf/type/__consul_watch_checks/manifest

@@ -25,7 +25,7 @@ conf_file="watch_${watch_type}_${__object_id}.json"
 state="$(cat "$__object/parameter/state")"
 
 # Sanity checks
-if [ -f "$__object/parameter/filter-service" ] && [ -f "$__object/parameter/filter-state" ]; then
+if [ -f "$__object/parameter/filter-service" -a -f "$__object/parameter/filter-state" ]; then
    echo "Use either --filter-service or --filter-state but not both." >&2
    exit 1
 fi
@@ -35,8 +35,7 @@ fi
 echo "{"
 printf '   "watches": [{\n'
 printf '      "type": "%s"\n' "$watch_type"
-cd "$__object/parameter/"
+for param in $(ls "$__object/parameter/"); do
-for param in *; do
    case "$param" in
       state) continue ;;
       filter-*)

cdist/conf/type/__consul_watch_event/manifest

@@ -29,8 +29,7 @@ state="$(cat "$__object/parameter/state")"
 echo "{"
 printf '   "watches": [{\n'
 printf '      "type": "%s"\n' "$watch_type"
-cd "$__object/parameter/"
+for param in $(ls "$__object/parameter/"); do
-for param in *; do
    case "$param" in
       state) continue ;;
       *)

cdist/conf/type/__consul_watch_key/manifest

@@ -29,8 +29,7 @@ state="$(cat "$__object/parameter/state")"
 echo "{"
 printf '   "watches": [{\n'
 printf '      "type": "%s"\n' "$watch_type"
-cd "$__object/parameter/"
+for param in $(ls "$__object/parameter/"); do
-for param in *; do
    case "$param" in
       state) continue ;;
       *)

cdist/conf/type/__consul_watch_keyprefix/manifest

@@ -29,8 +29,7 @@ state="$(cat "$__object/parameter/state")"
 echo "{"
 printf '   "watches": [{\n'
 printf '      "type": "%s"\n' "$watch_type"
-cd "$__object/parameter/"
+for param in $(ls "$__object/parameter/"); do
-for param in *; do
    case "$param" in
       state) continue ;;
       *)

cdist/conf/type/__consul_watch_nodes/manifest

@@ -29,8 +29,7 @@ state="$(cat "$__object/parameter/state")"
 echo "{"
 printf '   "watches": [{\n'
 printf '      "type": "%s"\n' "$watch_type"
-cd "$__object/parameter/"
+for param in $(ls "$__object/parameter/"); do
-for param in *; do
    case "$param" in
       state) continue ;;
       *)

cdist/conf/type/__consul_watch_service/manifest

@@ -29,8 +29,7 @@ state="$(cat "$__object/parameter/state")"
 echo "{"
 printf '   "watches": [{\n'
 printf '      "type": "%s"\n' "$watch_type"
-cd "$__object/parameter/"
+for param in $(ls "$__object/parameter/"); do
-for param in *; do
    case "$param" in
       state) continue ;;
       passingonly)

cdist/conf/type/__consul_watch_services/manifest

@@ -29,8 +29,7 @@ state="$(cat "$__object/parameter/state")"
 echo "{"
 printf '   "watches": [{\n'
 printf '      "type": "%s"\n' "$watch_type"
-cd "$__object/parameter/"
+for param in $(ls "$__object/parameter/"); do
-for param in *; do
    case "$param" in
       state) continue ;;
       *)

cdist/conf/type/__cron/explorer/entry

@@ -24,7 +24,7 @@ user="$(cat "$__object/parameter/user")"
 
 if [ -f "$__object/parameter/raw_command" ]; then
     command="$(cat "$__object/parameter/command")"
-    crontab -u "$user" -l 2>/dev/null | grep "^$command\$" || true
+    crontab -u $user -l 2>/dev/null | grep "^$command\$" || true
 else
-    crontab -u "$user" -l 2>/dev/null | grep "# $name\$" || true
+    crontab -u $user -l 2>/dev/null | grep "# $name\$" || true
 fi

cdist/conf/type/__cron/gencode-remote

@@ -58,7 +58,7 @@ state_should="$(cat "$__object/parameter/state" 2>/dev/null || echo "present")"
 # These are the old markers
 prefix="#cdist:__cron/$__object_id"
 suffix="#/cdist:__cron/$__object_id"
-filter='^# DO NOT EDIT THIS FILE|^# \(.* installed on |^# \(Cron version V|^# \(Cronie version .\..\)$'
+filter="^# DO NOT EDIT THIS FILE|^# \(.* installed on |^# \(Cron version V|^# \(Cronie version .\..\)$"
 cat << DONE
 crontab -u $user -l 2>/dev/null | grep -v -E "$filter" | awk -v prefix="$prefix" -v suffix="$suffix" '
 {

cdist/conf/type/__daemontools/files/init.d-svscan

@@ -23,9 +23,9 @@ fi
 
 case "$1" in
     start)
-        printf "Starting daemontools: "
+        echo -n "Starting daemontools: "
-        if  ! pidof svscan > /dev/null 2>&1; then
+        if [ ! `pidof svscan` ]; then
-                printf "svscan "
+                echo -n "svscan "
                 env - PATH="$PATH" svscan /service 2>&1 | setuidgid daemon multilog t /var/log/svscan &
                 echo "."
         else
@@ -33,28 +33,23 @@ case "$1" in
         fi
         ;;
     stop)
-        printf "Stopping daemontools: "
+        echo -n "Stopping daemontools: "
-        pids="$(pidof svscan)"
+        if [ `pidof svscan` ]; then
-        if [ -n "${pids}" ]
+                echo -n "svscan"
-        then
+                while [ `pidof svscan` ]; do
-                printf "svscan"
+                     kill `pidof svscan`
-                while [ -n "${pids}" ]
+                     echo -n "."
-                do
-                    # shellcheck disable=SC2086
-                    kill ${pids}
-                    printf "."
-                    pids="$(pidof svscan)"
                 done
         fi
-        printf " services"
+        echo -n " services"
-        for i in /service/*; do
+        for i in `ls -d /service/*`; do
-                svc -dx "$i"
+                svc -dx $i
-                printf "."
+                echo -n "."
         done
-        printf " logging "
+        echo -n " logging "
-        for i in /service/*/log; do
+        for i in `ls -d /service/*/log`; do
-                svc -dx "$i"
+                svc -dx $i
-                printf "."
+                echo -n "."
         done
         echo ""
         ;;

cdist/conf/type/__daemontools/manifest

@@ -3,13 +3,12 @@
 pkg=$(cat "$__object/parameter/from-package")
 servicedir=$(cat "$__object/parameter/servicedir")
 
-__package "$pkg"
+__package $pkg
-__directory "$servicedir" --mode 700
+__directory $servicedir --mode 700
 
 os=$(cat "$__global/explorer/os")
 init=$(cat "$__global/explorer/init")
 
-require=""
 case $os in
 	freebsd)
 		# TODO change to __start_on_boot once it supports freebsd

cdist/conf/type/__daemontools_service/explorer/svc

@@ -1,2 +1 @@
-#!/bin/sh
 command -v svc || true

cdist/conf/type/__daemontools_service/manifest

@@ -25,14 +25,14 @@ badusage() {
 [ -z "$run$runfile" ] && badusage
 [ -n "$run" ] && [ -n "$runfile" ] && badusage
 
-__directory "$servicedir/$name/log/main" --parents
+__directory $servicedir/$name/log/main --parents
 
 echo "$RUN_PREFIX$run" | require="__directory/$servicedir/$name/log/main" __config_file "$servicedir/$name/run" \
 	--onchange "svc -t '$servicedir/$name' 2>/dev/null" \
 	--mode 755 \
 	--source "${runfile:--}"
 
-echo "$RUN_PREFIX$logrun" | require="__directory/$servicedir/$name/log/main" __config_file "$servicedir/$name/log/run" \
+echo "$RUN_PREFIX$logrun" | require="__directory/$servicedir/$name/log/main" __config_file $servicedir/$name/log/run \
 	--onchange "svc -t '$servicedir/$name/log' 2>/dev/null" \
 	--mode 755 \
 	--source "-"

cdist/conf/type/__directory/explorer/stat

@@ -25,51 +25,23 @@ destination="/$__object_id"
 
 os=$("$__explorer/os")
 case "$os" in
-   "freebsd"|"netbsd"|"openbsd"|"macosx")
+   "freebsd"|"netbsd"|"openbsd")
-      stat -f "type: %HT
+      # 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: %Lp %Sp
+mode: %Op %Sp
-" "$destination" | awk '/^type/ { print tolower($0); next; } { print; }'
-      ;;
-   alpine)
-      stat -c "type: %F
-owner: %u %U
-group: %g %G
-mode: %a %A
 " "$destination"
-      ;;
+   ;;
-    solaris)
+    "macosx")
-        ls1="$( ls -ld "$destination" )"
+       stat -f "type: %HT
-        ls2="$( ls -ldn "$destination" )"
+ owner: %Du %Su
-
+ group: %Dg %Sg
-        if [ -f "$__object/parameter/mode" ]
+ mode: %Lp %Sp
-        then mode_should="$( cat "$__object/parameter/mode" )"
+ " "$destination"
-        fi
-
-        # yes, it is ugly hack, but if you know better way...
-        if [ -z "$( find "$destination" -perm "$mode_should" )" ]
-        then octets=888
-        else octets="$( echo "$mode_should" | sed 's/^0//' )"
-        fi
-
-        case "$( echo "$ls1" | cut -c1-1 )" in
-            -) echo 'type: regular file' ;;
-            d) echo 'type: directory' ;;
-        esac
-
-        echo "owner: $( echo "$ls2" \
-            | awk '{print $3}' ) $( echo "$ls1" \
-                | awk '{print $3}' )"
-
-        echo "group: $( echo "$ls2" \
-            | awk '{print $4}' ) $( echo "$ls1" \
-                | awk '{print $4}' )"
-
-        echo "mode: $octets $( echo "$ls1" | awk '{print $1}' )"
     ;;
    *)
-       stat --printf="type: %F
+      stat --printf="type: %F
 owner: %u %U
 group: %g %G
 mode: %a %A

cdist/conf/type/__directory/gencode-remote

@@ -57,18 +57,18 @@ get_current_value() {
 }
 
 set_group() {
-    echo "chgrp $recursive '$1' '$destination'"
+    echo chgrp $recursive \"$1\" \"$destination\"
-    echo "chgrp $recursive '$1'" >> "$__messages_out"
+    echo chgrp $recursive $1 >> "$__messages_out"
 }
 
 set_owner() {
-    echo "chown $recursive '$1' '$destination'"
+    echo chown $recursive \"$1\" \"$destination\"
-    echo "chown $recursive '$1'" >> "$__messages_out"
+    echo chown $recursive $1 >> "$__messages_out"
 }
 
 set_mode() {
-    echo "chmod $recursive '$1' '$destination'"
+    echo chmod $recursive \"$1\" \"$destination\"
-    echo "chmod $recursive '$1'" >> "$__messages_out"
+    echo chmod $recursive $1 >> "$__messages_out"
 }
 
 case "$state_should" in
@@ -78,10 +78,10 @@ case "$state_should" in
          if [ "$type" != "none" ]; then
             # our destination is not a directory, remove whatever is there
             # and then create our directory and set all attributes
-            echo "rm -f '$destination'"
+            echo rm -f "\"$destination\""
             echo "remove non directory" >> "$__messages_out"
          fi
-         echo "mkdir $mkdiropt '$destination'"
+         echo "mkdir $mkdiropt \"$destination\""
          echo "create" >> "$__messages_out"
       fi
 
@@ -94,7 +94,7 @@ case "$state_should" in
 
             # change 0xxx format to xxx format => same as stat returns
             if [ "$attribute" = mode ]; then
-                value_should="$(echo "$value_should" | sed 's/^0\(...\)/\1/')"
+                value_should="$(echo $value_should | sed 's/^0\(...\)/\1/')"
             fi
 
             if [ "$set_attributes" = 1 ] || [ "$value_should" != "$value_is" ]; then
@@ -105,7 +105,7 @@ case "$state_should" in
    ;;
    absent)
         if [ "$type" = "directory" ]; then
-            echo "rm -rf '$destination'"
+            echo rm -rf \"$destination\"
             echo remove >> "$__messages_out"
         fi
    ;;

cdist/conf/type/__docker/man.rst

@@ -3,12 +3,12 @@ cdist-type__docker(7)
 
 NAME
 ----
-cdist-type__docker - install Docker CE
+cdist-type__docker - install docker-engine
 
 
 DESCRIPTION
 -----------
-Installs latest Docker Community Edition package.
+Installs latest docker-engine package from dockerproject.org.
 
 
 REQUIRED PARAMETERS
@@ -18,16 +18,16 @@ None.
 
 OPTIONAL PARAMETERS
 -------------------
-state
+None.
-   'present' or 'absent', defaults to 'present'
-version
-   The specific version to install. Defaults to the special value 'latest',
-   meaning the version the package manager will install by default.
 
 
 BOOLEAN PARAMETERS
 ------------------
-None.
+experimental
+   Install the experimental docker-engine package instead of the latest stable release.
+
+state
+   'present' or 'absent', defaults to 'present'
 
 
 EXAMPLES
@@ -38,11 +38,12 @@ EXAMPLES
     # Install docker
     __docker
 
+    # Install experimental
+    __docker --experimental
+
     # Remove docker
     __docker --state absent
 
-    # Install specific version
-    __docker --state present --version 18.03.0.ce
 
 AUTHORS
 -------

cdist/conf/type/__docker/manifest

@@ -21,84 +21,58 @@
 
 os=$(cat "$__global/explorer/os")
 state=$(cat "$__object/parameter/state")
-version=$(cat "$__object/parameter/version")
 
 case "$os" in
     centos)
-        # shellcheck source=/dev/null
+        component="main"
-        if (. "$__global/explorer/os_release" && [ "${VERSION_ID}" = "7" ]); then
+        if [ -f "$__object/parameter/experimental" ]; then
-          __yum_repo docker-ce-stable \
+          component="experimental"
-            --name 'Docker CE Stable' \
-            --baseurl "https://download.docker.com/linux/centos/7/\$basearch/stable" \
-            --enabled \
-            --gpgcheck 1 \
-            --gpgkey 'https://download.docker.com/linux/centos/gpg' \
-            --state "${state}"
-          if [ "$version" != "latest" ]; then
-            require="__yum_repo/docker-ce-stable" __package docker-ce --version "${version}" --state "${state}"
-          else
-            require="__yum_repo/docker-ce-stable" __package docker-ce --state "${state}"
-          fi
-        else
-          echo "CentOS version 7 is required!" >&2
-          exit 1
         fi
+        __yum_repo docker \
+          --name 'Docker Repository' \
+          --baseurl "https://yum.dockerproject.org/repo/$component/centos/\$releasever/" \
+          --enabled \
+          --gpgcheck 1 \
+          --gpgkey 'https://yum.dockerproject.org/gpg' \
+          --state ${state} 
+        require="__yum_repo/docker" __package docker-engine --state ${state}
     ;;
-    ubuntu|debian)
+    ubuntu)
-      if [ "${state}" = "present" ]; then
+        component="main"
-        __package apt-transport-https
+      if [ -f "$__object/parameter/experimental" ]; then
-        __package ca-certificates
+         component="experimental"
-        __package gnupg2
-      fi
-      __apt_key_uri docker --name "Docker Release (CE deb) <docker@docker.com>" \
-        --uri "https://download.docker.com/linux/${os}/gpg" --state "${state}"
-
-      require="__apt_key_uri/docker" __apt_source docker \
-         --uri "https://download.docker.com/linux/${os}" \
-         --distribution "$(cat "$__global/explorer/lsb_codename")" \
-         --state "${state}" \
-         --component "stable"
-      if [ "$version" != "latest" ]; then
-        require="__apt_source/docker" __package docker-ce --version "${version}" --state "${state}"
-      else
-        require="__apt_source/docker" __package docker-ce --state "${state}"
       fi
+      __package apparmor --state ${state}
+      __package ca-certificates --state ${state}
+      __package apt-transport-https --state ${state}
+      __apt_key docker --keyid 58118E89F3A912897C070ADBF76221572C52609D --state ${state}
+      export CDIST_ORDER_DEPENDENCY=on
+      __apt_source docker \
+         --uri https://apt.dockerproject.org/repo \
+         --distribution "ubuntu-$(cat "$__global/explorer/lsb_codename")" \
+         --state ${state} \
+         --component "$component"
+      __package docker-engine --state ${state}
+      unset CDIST_ORDER_DEPENDENCY
    ;;
-   devuan)
+   debian)
-      os_version="$(cat "$__global/explorer/os_version")"
+       component="main"
-
+      if [ -f "$__object/parameter/experimental" ]; then
-      case "$os_version" in
+         component="experimental"
-        ascii)
-          distribution="stretch"
-        ;;
-        jessie)
-          distribution="jessie"
-        ;;
-        *)
-          echo "Your devuan release ($os_version) is currently not supported by this type (${__type##*/}).">&2
-          echo "Please contribute an implementation for it if you can." >&2
-          exit 1
-        ;;
-      esac
-
-      if [ "${state}" = "present" ]; then
-        __package apt-transport-https
-        __package ca-certificates
-        __package gnupg2
       fi
-      __apt_key_uri docker --name "Docker Release (CE deb) <docker@docker.com>" \
-        --uri "https://download.docker.com/linux/${os}/gpg" --state "${state}"
 
-      require="__apt_key_uri/docker" __apt_source docker \
+      __package apt-transport-https --state ${state}
-         --uri "https://download.docker.com/linux/${os}" \
+      __package ca-certificates --state ${state}
-         --distribution "${distribution}" \
+      __package gnupg2 --state ${state}
-         --state "${state}" \
+      __apt_key docker --keyid 58118E89F3A912897C070ADBF76221572C52609D --state ${state}
-         --component "stable"
+      export CDIST_ORDER_DEPENDENCY=on
-      if [ "$version" != "latest" ]; then
+      __apt_source docker \
-        require="__apt_source/docker" __package docker-ce --version "${version}" --state "${state}"
+          --uri https://apt.dockerproject.org/repo \
-      else
+          --distribution "debian-$(cat "$__global/explorer/lsb_codename")" \
-        require="__apt_source/docker" __package docker-ce --state "${state}"
+          --state ${state} \
-      fi
+          --component "$component"
+      __package docker-engine --state ${state}
+      unset CDIST_ORDER_DEPENDENCY
 
    ;;
    *)

cdist/conf/type/__docker/parameter/boolean

@@ -0,0 +1 @@
+experimental

cdist/conf/type/__docker/parameter/default/version

@@ -1 +0,0 @@
-latest