1764 changed files with 4750 additions and 82214 deletions
--- a/.gitattributes
+++ b/.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
--- a/.gitignore
+++ b/.gitignore
@ -1,61 +1,14 @@
 # -vim
-# Swap
-[._]*.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~
+.*.swp

 # Ignore generated manpages
-docs/src/.marker
-docs/src/man1/*.1
-docs/src/man7/*.7
-docs/src/man7/cdist-type__*.rst
-docs/src/cdist-reference.rst
+doc/man/*.[1-9]
+doc/man/.marker
+doc/man/man*/

-# Ignore cdist cache for version control
-/cache/
+doc/html

-# Ignore inventory basedir
-cdist/inventory/
+conf/type/*/*.7
+conf/type/*/man.html

-# Python: cache, distutils, distribution in general
-__pycache__/
-*.pyc
-MANIFEST
-dist/
-cdist/version.py
-cdist.egg-info/

-# sphinx build dirs, cache
-_build/
-docs/dist
-
-# Ignore temp files used for signing
-cdist-*.tar
-cdist-*.tar.gz
-cdist-*.tar.gz.asc
-
-# Packaging: Archlinux
-/PKGBUILD
-/cdist-*.pkg.tar.xz
-/cdist-*.tar.gz
-/pkg
-/src
-build
-.lock-*
-.git-current-branch
-.lock*
-.pypi-release
--- a/49
+++ b/49
@ -0,0 +1,49 @@
+cat << eof
+
+Hey hackers,
+
+this README is for you, for those who want to dig into cdist, hack it or try
+to get a deeper understanding.
+
+A lot of documentation is still missing, but running cdist-quickstart should
+give you an impression of how cdist works.
+
+I hope you have a lot of fun with cdist, because it was also a lot of fun to
+develop it!
+
+   -- Nico, 20110304
+
+
+## Conventions
+
+- All variables exported by cdist are prefixed with a double underscore (__)
+- All cdist-internal variables are prefixed with __cdist_ and are generally not exported.
+
+## Running cdist when developing
+
+This file is suitable for execution and saving the objects and
+explorers from cdist. I usually do it like this:
+
+   % ./HACKERS_README
+
+################################################################################
+eof
+
+set -x
+# Tell the user what we do, so this script makes sense during execution
+
+# prepare use (only from top level directory)
+export PATH="$(pwd -P)/bin:$PATH"
+export __cdist_conf_dir="$(pwd -P)/conf"
+
+# Allow user to supply hostname
+target="${1:-localhost}"
+
+# And use hostname as basedir (dangerous, but hackers know what they do)
+export __cdist_local_base_dir="/tmp/$target"
+
+# Run the real script
+cdist-deploy-to "$target"
+
+# Display results
+find "${__cdist_local_base_dir}"
--- a/MANIFEST.in
+++ b/MANIFEST.in
@ -1,3 +0,0 @@
-include docs/changelog
-recursive-include docs/gfx *.png *.text
-recursive-include docs *.text *.html *.1 *.7
--- a/216
+++ b/216
@ -1,134 +1,120 @@
-#
-# 2013 Nico Schottelius (nico-cdist at schottelius.org)
-#
-# This file is part of cdist.
-#
-# cdist is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# cdist is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with cdist. If not, see <http://www.gnu.org/licenses/>.
-#
-#
+# General
+PREFIX=/usr
+BINDIR=$(PREFIX)/bin
+MANDIR=$(PREFIX)/share/man

-.PHONY: help
-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"
+# Manpage and HTML
+A2XM=a2x -f manpage --no-xmllint
+# A2XH=a2x -f xhtml --no-xmllint
+A2XH=asciidoc -b xhtml11

-DOCS_SRC_DIR=./docs/src
-SPEECHDIR=./docs/speeches
-TYPEDIR=./cdist/conf/type
+# Developer only
+WEBDIR=$$HOME/niconetz
+WEBPAGE=software/cdist.mdwn
+
+# Documentation
+MANDIR=doc/man
+MANGENERATED=$(MANDIR)/cdist-reference.text
+
+MANSRC=$(MANDIR)/cdist.text						\
+	$(MANDIR)/cdist-code-run-all.text			\
+	$(MANDIR)/cdist-code-run.text					\
+	$(MANDIR)/cdist-config.text 					\
+   $(MANDIR)/cdist-dir.text         			\
+   $(MANDIR)/cdist-env.text         			\
+   $(MANDIR)/cdist-explorer-run-global.text 	\
+   $(MANDIR)/cdist-deploy-to.text 				\
+	$(MANDIR)/cdist-explorer.text					\
+	$(MANDIR)/cdist-manifest.text 				\
+	$(MANDIR)/cdist-manifest-run.text			\
+   $(MANDIR)/cdist-manifest-run-init.text		\
+   $(MANDIR)/cdist-manifest-run-all.text	 	\
+	$(MANDIR)/cdist-object-explorer-all.text	\
+	$(MANDIR)/cdist-object-gencode.text    	\
+	$(MANDIR)/cdist-object-gencode-all.text	\
+	$(MANDIR)/cdist-quickstart.text 				\
+   $(MANDIR)/cdist-remote-explorer-run.text 	\
+	$(MANDIR)/cdist-run-remote.text				\
+	$(MANDIR)/cdist-stages.text					\
+	$(MANDIR)/cdist-type.text						\
+	$(MANDIR)/cdist-type-build-emulation.text \
+	$(MANDIR)/cdist-type-emulator.text			\
+	$(MANDIR)/cdist-type-template.text			\

-SPHINXM=make -C $(DOCS_SRC_DIR) man
-SPHINXH=make -C $(DOCS_SRC_DIR) html
-SPHINXC=make -C $(DOCS_SRC_DIR) clean

 ################################################################################
-# Manpages
+# User targets
 #
-MAN7DSTDIR=$(DOCS_SRC_DIR)/man7

-# Manpages #1: Types
-# Use shell / ls to get complete list - $(TYPEDIR)/*/man.rst does not work
-# Using ls does not work if no file with given pattern exist, so use wildcard
-MANTYPESRC=$(wildcard $(TYPEDIR)/*/man.rst)
-MANTYPEPREFIX=$(subst $(TYPEDIR)/,$(MAN7DSTDIR)/cdist-type,$(MANTYPESRC))
-MANTYPES=$(subst /man.rst,.rst,$(MANTYPEPREFIX))
+all:
+	@echo ''
+	@echo 'Welcome to cdist!'
+	@echo ''
+	@echo 'Here are the possible targets:'
+	@echo ''
+	@echo '	man: Build manpages (requires Asciidoc (a2x binary))'
+	@echo '	clean: Remove build stuff'
+	@echo ''
+	@echo ''

-# Link manpage: do not create man.html but correct named file
-$(MAN7DSTDIR)/cdist-type%.rst: $(TYPEDIR)/%/man.rst
-	mkdir -p $(MAN7DSTDIR)
-	ln -sf "../../../$^" $@
+man: doc/man/.marker

-# Manpages #2: reference
-DOCSREF=$(MAN7DSTDIR)/cdist-reference.rst
-DOCSREFSH=$(DOCS_SRC_DIR)/cdist-reference.rst.sh
+doc/man/.marker: $(MANDIR)/cdist-reference.text
+	touch $@

-$(DOCSREF): $(DOCSREFSH)
-	$(DOCSREFSH)
+# Manual from core
+mancore: $(MANSRC)
+	for mansrc in $^; do $(A2XM) $$mansrc; $(A2XH) $$mansrc; done

-version:
-	@[ -f "cdist/version.py" ] || { \
-		printf "Missing 'cdist/version.py', please generate it first.\n" && exit 1; \
-	}
+# Manuals from types
+mantype:
+	for man in conf/type/*/man.text; do $(A2XM) $$man; $(A2XH) $$man; done

-# Manpages #3: generic part
-man: version $(MANTYPES) $(DOCSREF)
-	$(SPHINXM)
+# Move into manpath directories
+manmove: mantype mancore
+	for manpage in $(MANDIR)/*.[1-9] conf/type/*/*.7; do \
+		cat=$${manpage##*.}; \
+		mandir=$(MANDIR)/man$$cat; \
+		mkdir -p $$mandir; \
+		mv $$manpage $$mandir; \
+	done
+	mkdir -p doc/html
+	mv doc/man/*.html doc/html

-html: version $(MANTYPES) $(DOCSREF)
-	$(SPHINXH)
+	for mantype in conf/type/*/man.html; do \
+	mannew=$$(echo $$mantype | sed -e 's;conf/;cdist-;'  -e 's;/;;' -e 's;/man;;');\
+	mv $$mantype doc/html/$$mannew; \
+	done

-docs: man html
-
-docs-clean:
-	$(SPHINXC)
-
-# Manpages: .cdist Types
-DOT_CDIST_PATH=${HOME}/.cdist
-DOTMAN7DSTDIR=$(MAN7DSTDIR)
-DOTTYPEDIR=$(DOT_CDIST_PATH)/type
-DOTMANTYPESRC=$(wildcard $(DOTTYPEDIR)/*/man.rst)
-DOTMANTYPEPREFIX=$(subst $(DOTTYPEDIR)/,$(DOTMAN7DSTDIR)/cdist-type,$(DOTMANTYPESRC))
-DOTMANTYPES=$(subst /man.rst,.rst,$(DOTMANTYPEPREFIX))
-
-# Link manpage: do not create man.html but correct named file
-$(DOTMAN7DSTDIR)/cdist-type%.rst: $(DOTTYPEDIR)/%/man.rst
-	ln -sf "$^" $@
-
-dotman: version $(DOTMANTYPES)
-	$(SPHINXM)
+# Reference depends on conf/type/*/man.text - HOWTO with posix make?
+$(MANDIR)/cdist-reference.text: manmove $(MANDIR)/cdist-reference.text.sh
+	$(MANDIR)/cdist-reference.text.sh
+	$(A2XM) $(MANDIR)/cdist-reference.text
+	$(A2XH) $(MANDIR)/cdist-reference.text
+	# Move us to the destination as well
+	make manmove
+	
+clean:
+	rm -rf doc/man/*.html doc/man/*.[1-9] doc/man/man[1-9] $(MANGENERATED)
+	rm -f conf/type/*/man.html

 ################################################################################
-# Speeches
-#
-SPEECHESOURCES=$(SPEECHDIR)/*.tex
-SPEECHES=$(SPEECHESOURCES:.tex=.pdf)
-
-# Create speeches and ensure Toc is up-to-date
-$(SPEECHDIR)/%.pdf: $(SPEECHDIR)/%.tex
-	pdflatex -output-directory $(SPEECHDIR) $^
-	pdflatex -output-directory $(SPEECHDIR) $^
-	pdflatex -output-directory $(SPEECHDIR) $^
-
-speeches: $(SPEECHES)
-
-################################################################################
-# Misc
-#
-clean: docs-clean
-	rm -f $(DOCS_SRC_DIR)/cdist-reference.rst
-
-	find "$(DOCS_SRC_DIR)" -mindepth 2 -type l \
-	| xargs rm -f
-
-	find * -name __pycache__  | xargs rm -rf
-
-	# distutils
-	rm -rf ./build
-
-################################################################################
-# install
+# Developer targets
 #

-install:
-	python3 setup.py install
+test:
+	# ubuntu
+	.rsync lyni@tablett:cdist
+	# redhat
+	.rsync nicosc@free.ethz.ch:cdist
+	# gentoo
+	.rsync nicosc@ru3.inf.ethz.ch:cdist

-install-user:
-	python3 setup.py install --user
+web:
+	cp README $(WEBDIR)/$(WEBPAGE)
+	cd $(WEBDIR) && git commit -m "cdist update" $(WEBPAGE)
+	cd $(WEBDIR) && make pub
+
+pub:
+	git push --mirror
+	git push --mirror github
--- a/PKGBUILD.in
+++ b/PKGBUILD.in
@ -1,29 +0,0 @@
-#!/bin/sh
-
-version="$1"
-outfile=${0%.in}
-
-cat << eof > "${outfile}"
-pkgname=cdist
-pkgver=$version
-pkgrel=1
-pkgdesc='A Usable Configuration Management System"'
-arch=('any')
-url='https://www.cdi.st/'
-license=('GPL3')
-depends=('python>=3.2.0')
-source=("http://pypi.python.org/packages/source/c/cdist/cdist-\${pkgver}.tar.gz")
-
-package() {
-    cd cdist-\${pkgver}
-    python3 setup.py build install --root="\${pkgdir}"
-    find "\$pkgdir" -type d -exec chmod 0755 {} \;
-    find "\$pkgdir" -type f -exec chmod a+r {} \;
-}
-eof
-
-makepkg -g >> "${outfile}"
-
-# Fix this issue:
-# error: failed to upload cdist-3.1.6-1.src.tar.gz: Error - all files must have permissions of 644 or 755.
-chmod a+r "${outfile}"
--- a/210
+++ b/210
@ -1,7 +1,207 @@
-cdist
-----
+[[!meta title="cdist - usable configuration management"]]

-cdist is a usable configuration management system.
+     
+                 ..          .       .x+=:.        s   
+               dF           @88>    z`    ^%      :8  
+              '88bu.        %8P        .   <k    .88 
+          .   '*88888bu      .       .@8Ned8"   :888ooo
+     .udR88N    ^"*8888N   .@88u   .@^%8888"  -*8888888
+    <888'888k  beWE "888L ''888E` x88:  `)8b.   8888
+    9888 'Y"   888E  888E   888E  8888N=*8888   8888
+    9888       888E  888E   888E   %8"    R88   8888
+    9888       888E  888F   888E    @8Wou 9%   .8888Lu=
+    ?8888u../ .888N..888    888&  .888888P`    ^%888*
+     "8888P'   `"888*""     R888" `   ^"F        'Y" 
+       "P'        ""         ""  
+     

-For the web documentation have a look at https://www.cdi.st/
-or at docs/src for reStructuredText manual.
+[[!toc  levels=2]]
+
+## Introduction
+
+cdist configures your system and is similar to
+other configuration management systems like
+[cfengine](http://www.cfengine.org/),
+[bcfg2](http://trac.mcs.anl.gov/projects/bcfg2),
+[chef](http://wiki.opscode.com/display/chef/)
+and [puppet](http://www.puppetlabs.com/), but
+it ticks differently:
+
+ * cdist sticks completly to the KISS (keep it simple and stupid) paradigma
+  * cdist's core is very small (< 1k lines of code)
+  * There is only one type to extend cdist called ***type***.
+  * One main development target: ***It must be incredible easy to add new types.***
+ * cdist is UNIX
+  * It reuses existing tools like cat, find, mv, ...
+  * cdist's documentation is bundled as manpages
+ * cdist is written in POSIX shell
+  * No special requirements like high level interpreters needed on server or target
+
+### Architecture
+
+ * Push mode (server pushes configuration)
+ * User defines configuration in shell scripts (called ***manifests***)
+ * Generates internal configuration (cconfig style)
+ * Uses ***types*** to generate code be executed on the target
+ * And finally executes the code on the target / applies the configuration
+
+### Features
+
+Stuff that should probably be included in every configuration management,
+but is not. Or: Why I began to write cdist:
+
+ * Speed
+ * Elegant code
+ * Clean design
+ * Good documentation (man pages)
+ * Meaningful error messages
+ * The no surprise factor
+ * Consistency in behaviour, naming and documentation
+ * Easy integration into bare metal installations
+ * Simple and well-known DSL: posix shell
+ * It must be very easy to extend and debug cdist
+ * Focus on reuse of existing functionality (like sh, ssh, find, rm, ...)
+ * Easy upgrade: ***There is no need to update cdist on target hosts!***
+  * cdist only needs to be update on the master server
+
+### OS support
+
+cdist was tested or is know to run on at least
+
+ * [Archlinux](http://www.archlinux.org/)
+ * [Debian](http://www.debian.org/)
+ * [Gentoo](http://www.gentoo.org/)
+ * [Mac OS X](http://www.apple.com/macosx/)
+ * [Redhat](http://www.redhat.com/)
+ * [Ubuntu](http://www.ubuntu.com/)
+
+
+## Requirements
+
+### Server
+
+ * A posix like shell
+ * SSH-Client
+
+### Client ("target host")
+
+ * A posix like shell
+ * SSH-Server
+
+
+## Getting cdist
+
+You can clone cdist from git, which gives you the advantage of having
+a version control in place for development of your own stuff as well.
+
+### Installation
+
+To install cdist, execute the following commands:
+
+    git clone git://git.schottelius.org/cdist
+    cd cdist
+    export PATH=$PATH:$(pwd -P)/bin
+
+    # If you want the manpages (requires asciidoc to be installed)
+    make man
+    export MANPATH=$MANPATH:$(pwd -P)/doc/man
+
+
+Afterwards you can run ***cdist-quickstart*** to get an impression on
+how to use cdist.
+
+### Available versions
+
+There are at least the following branches available:
+
+ * master: the development branch
+ * 1.3: Support for local and remote code execution (current stable)
+
+Old versions:
+
+ * 1.0: First official release
+ * 1.1: __file to __file, __directory, __link migration
+ * 1.2: Dependencies supported
+
+Other branches may be available for features or bugfixes, but they
+may vanish at any point. To select a specific branch use
+
+    # Generic code
+    git checkout -b <name> origin/<name>
+    
+    # Stay on a specific version
+    git checkout -b 1.3 origin/1.3
+
+### Mirrors
+
+ * git://github.com/telmich/cdist.git ([github](https://github.com/telmich/cdist))
+ * git://git.sans.ethz.ch/cdist ([sans](http://git.sans.ethz.ch/?p=cdist;a=summary))
+
+## Update
+
+To upgrade cdist in the current branch use
+
+    git pull
+
+    # Also update the manpages
+    make man
+    export MANPATH=$MANPATH:$(pwd -P)/doc/man
+
+If you stay on a version branche (i.e. 1.0, 1.1., ...), nothing should break.
+The master branch on the other hand is the development branch and may not be
+working, break your setup or eat the tree in your garden.
+
+### Upgrading from 1.1 to 1.2
+
+No incompatiblities.
+
+### Upgrading from 1.0 to 1.1
+
+In 1.1 the type **\_\_file** was split into **\_\_directory**, **\_\_file** and
+**\_\_link**. The parameter **--type** was removed from **\_\_file**. Thus you
+need to replace **\_\_file** calls in your manifests:
+
+ * Remove --type from all \_\_file calls
+ * If type was symlink, use \_\_link and --type symbolic
+ * If type was directory, use \_\_directory
+
+
+## Support
+
+### IRC
+
+You can join the development ***IRC channel***
+[#cLinux on irc.freenode.org](irc://irc.freenode.org/#cLinux).
+
+### Mailing list
+
+Bug reports, questions, patches, etc. should be send to the
+[cdist mailing list](http://l.schottelius.org/mailman/listinfo/cdist).
+
+## Used by
+
+If you're using cdist, feel free to send a report to the mailing list.
+Interesting information are for instance
+
+ * Which services do you manage?
+ * How many machines do you manage?
+ * What are the pros/cons you see in cdist?
+ * General comments/critics
+
+### Nico Schottelius, Systems Group ETH Zurich
+
+Yes, I'm actually eating my own dogfood and currently managing
+
+ * [plone](http://plone.org/) (cms)
+ * [moinmoin](http://moinmo.in/) (wiki)
+ * [apache](http://httpd.apache.org/) (webserver)
+ * [kerberos (mit)](http://web.mit.edu/kerberos/) (authentication)
+ * [ircd-hybrid](http://www.ircd-hybrid.org/) (chat)
+ * [stunnel](http://stunnel.mirt.net/) (SSL tunnel)
+ * [mercurial-server](http://www.lshift.net/mercurial-server.html) (version control)
+ * [xfce](http://www.xfce.org/) (lightweight desktop environment)
+ * [slim](http://slim.berlios.de/) (graphical login manager for X11)
+
+with cdist on a total of **5** production machines of the
+[Systems Group](http://www.systems.ethz.ch) at the
+[ETH Zurich](http://www.ethz.ch).
--- a/4
+++ b/4
@ -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).
--- a/bin/build-helper
+++ b/bin/build-helper
@ -1,550 +0,0 @@
-#!/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.
-#
-# 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.
-#
-
-usage() {
-    printf "usage: %s TARGET [TARGET-ARGS...]
-    Available targets:
-        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##*/}"
-
-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
-            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
-            printf "Date in changelog is not today\n"
-            printf "Changelog date: %s\n" "${date_changelog}"
-            exit 1
-        fi
-    ;;
-
-    check-unittest)
-        "$0" test
-    ;;
-
-    ml-release)
-        if [ $# -ne 1 ]; then
-            printf "%s ml-release version\n" "$0" >&2
-            exit 1
-        fi
-
-        version=$1; shift
-
-        ( 
-        cat << eof
-Subject: cdist $version has been released
-
-Hello .*,
-
-cdist $version has been released with the following changes:
-
-eof
-
-        "$0" changelog-changes "$version"
-        cat << eof
-
-eof
-        ) > mailinglist.tmp
-    ;;
-
-    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
-            printf "Tag for %s exists, aborting\n" "${target_version}"
-            exit 1
-        fi
-        printf "Enter tag description for %s: " "${target_version}"
-        read -r 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.
-        GPG_TTY=$(tty)
-        export GPG_TTY
-        gpg-agent
-
-        git tag -s "$target_version" -m "$tagmessage"
-        git push --tags
-    ;;
-
-    sign-git-release)
-        if [ $# -lt 2 ]
-        then
-            printf "usage: %s sign-git-release TAG TOKEN [ARCHIVE]\n" "$0"
-            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}"
-            exit 1
-        fi
-        token="$2"
-        if [ $# -gt 2 ]
-        then
-            archivename="$3"
-        else
-            archivename="cdist-${tag}.tar"
-            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"
-        sed_cmd='s/^.*"markdown":"\([^"]*\)".*$/\1/'
-
-        # upload archive
-        response_archive=$(curl -f -X POST \
-             --http1.1 \
-             -H "PRIVATE-TOKEN: ${token}" \
-             -F "file=@${archivename}" \
-             "https://code.ungleich.ch/api/v4/projects/${project}/uploads" \
-             | sed "${sed_cmd}") || exit 1
-
-        # upload archive signature
-        response_archive_sig=$(curl -f -X POST \
-             --http1.1 \
-             -H "PRIVATE-TOKEN: ${token}" \
-             -F "file=@${archivename}.asc" \
-            "https://code.ungleich.ch/api/v4/projects/${project}/uploads" \
-             | sed "${sed_cmd}") || exit 1
-
-        # make release
-        changelog=$("$0" changelog-changes "$1" | sed 's/^[[:space:]]*//')
-        release_notes=$(
-            printf "%s\n\n%s\n\n**Changelog**\n\n%s\n" \
-                "${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 ]
-        then
-            rm -f "${archivename}"
-        fi
-        rm -f "${archivename}.asc"
-    ;;
-
-    release)
-        set -e
-        target_version=$($0 changelog-version)
-        target_branch=$($0 version-branch)
-
-        printf "Beginning release process for %s\n" "${target_version}"
-
-        # First check everything is sane
-        "$0" check-date
-        "$0" check-unittest
-        "$0" check-pycodestyle
-        "$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"
-            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"
-
-            printf "Enter the magic word to release anyway:"
-            read -r 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 docs-clean
-        make docs
-
-        ############################################################# 
-        # Everything green, let's do the release
-
-        # Tag the current commit
-        "$0" release-git-tag
-
-        # Also merge back the version branch
-        if [ "$masterbranch" = yes ]; then
-            git checkout master
-            git merge "$target_branch"
-        fi
-
-        # Publish git changes
-        # if you want to have mirror locally then uncomment this and comment below
-        #     git push --mirror
-            git push
-            # push also new branch and set up tracking
-            git push -u origin "${target_branch}"
-        # fi
-
-        # Create and publish package for pypi
-        "$0" pypi-release
-
-        # sign git tag
-        printf "Enter upstream repository authentication token: "
-        read -r token
-        "$0" sign-git-release "${target_version}" "${token}"
-
-        # Announce change on ML
-        "$0" ml-release "${target_version}"
-
-        cat << eof
-Manual steps post release:
-    - cdist-web
-    - send mail body generated in mailinglist.tmp and inform Dmitry for deb
-    - twitter
-eof
-    ;;
-
-    test)
-        if [ ! -f "cdist/version.py" ]
-        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
-        else
-            python3 -m unittest "$@"
-        fi
-    ;;
-
-    test-remote)
-        if [ ! -f "cdist/version.py" ]
-        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)
-        pycodestyle "${basedir}" "${basedir}/scripts/cdist" | less
-    ;;
-
-    check-pycodestyle)
-        "$0" pycodestyle
-        printf "\\nPlease review pycodestyle 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
-    ;;
-
-    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
-    ;;
-
-    version-branch)
-        "$0" changelog-version | cut -d. -f '1,2'
-    ;;
-
-    version)
-        printf "VERSION = \"%s\"\n" "$(git describe)" > cdist/version.py
-    ;;
-
-    target-version)
-        target_version=$($0 changelog-version)
-        printf "VERSION = \"%s\"\n" "${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
-        usage "${basename}"
-        exit 1
-    ;;
-
-esac
--- a/bin/cdist-code-run
+++ b/bin/cdist-code-run
@ -0,0 +1,71 @@
+#!/bin/sh
+#
+# 2011 Nico Schottelius (nico-cdist at schottelius.org)
+#
+# This file is part of cdist.
+#
+# cdist is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# cdist is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with cdist. If not, see <http://www.gnu.org/licenses/>.
+#
+#
+# This binary is executed on the remote side to execute code
+# 
+
+. cdist-config
+[ $# -eq 3 ] || __cdist_usage "<object dir> <object> <type>"
+set -ue
+
+# This variable MUST be exactly like this - see __cdist_object_dir
+__cdist_out_object_dir="$1"; shift
+
+object="$1"; shift
+__cdist_gencode_type="$1"; shift
+
+if [ ! -d "$(__cdist_object_dir "$object")" ]; then
+   __cdist_exit_err "Object $object is missing."
+fi  
+
+finished="$(__cdist_object_code_finished "$object")"
+require="$(__cdist_object_require "$object")"
+
+code="$(__cdist_object_code "$object")-${__cdist_gencode_type}"
+
+# Do nothing if our work has been done
+if [ -f "$finished" ]; then
+   exit 0
+fi
+
+echo "Checking code-${__cdist_gencode_type} for $object ..."
+
+if [ -f "$require" ]; then
+   while read requirement; do
+      echo "Requiring  dependency $requirement for $object ..."
+      cdist-code-run "$__cdist_out_object_dir" "$requirement" "$__cdist_gencode_type"
+   done < "$require"
+fi
+
+if [ -e "$code" ]; then
+   if [ -f "$code" ]; then
+      if [ -x "$code" ]; then
+         echo "Executing code-${__cdist_gencode_type}  for $object ..."
+         "$code"
+         touch "$finished"
+      else
+         __cdist_exit_err "$code exists, but is not executable."
+      fi
+   else
+      __cdist_exit_err "$code exists, but is not a file."
+   fi
+else
+   __cdist_exit_err "Missing code for ${object}."
+fi
--- a/bin/cdist-code-run-all
+++ b/bin/cdist-code-run-all
@ -0,0 +1,50 @@
+#!/bin/sh
+#
+# 2010-2011 Nico Schottelius (nico-cdist at schottelius.org)
+#
+# This file is part of cdist.
+#
+# cdist is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# cdist is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with cdist. If not, see <http://www.gnu.org/licenses/>.
+#
+#
+# Exec code locally and remote
+#
+
+. cdist-config
+[ $# -eq 1 ] || __cdist_usage "<target host>"
+set -e
+
+__cdist_target_host="$1"; shift
+
+__cdist_object_list "$__cdist_out_object_dir" > "$__cdist_tmp_file"
+
+# NEED TO CREATE ARRAY, SSH DESTROYS WHILE READ LOOP
+while read object; do
+   set -- "$@" "$object"
+done < "$__cdist_tmp_file"
+
+while [ $# -ge 1 ]; do
+   object="$1"; shift
+
+   # Code local
+   cdist-code-run "$__cdist_out_object_dir" "$object" \
+      "${__cdist_name_gencode_local}"                 \
+         || __cdist_exit_err "Remote code failed for $object"
+
+   # Code remote
+   cdist-run-remote "$__cdist_target_host" "cdist-code-run" \
+      "${__cdist_remote_out_object_base_dir}" "$object"     \
+      "${__cdist_name_gencode_remote}"                      \
+      || __cdist_exit_err "Remote code failed for $object"
+done < "$__cdist_tmp_file"
--- a/bin/cdist-config
+++ b/bin/cdist-config
@ -0,0 +1,315 @@
+#!/bin/sh
+#
+# 2010-2011 Nico Schottelius (nico-cdist at schottelius.org)
+#
+# This file is part of cdist.
+#
+# cdist is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# cdist is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with cdist. If not, see <http://www.gnu.org/licenses/>.
+#
+#
+
+__cdist_version="1.3.1"
+
+# Fail if something bogus is going on
+set -u
+
+################################################################################
+# cconf standard vars prefixed with cdist
+
+__cdist_pwd="$(pwd -P)"
+__cdist_mydir="${0%/*}";
+__cdist_abs_mydir="$(cd "$__cdist_mydir" && pwd -P)"
+__cdist_myname=${0##*/};
+__cdist_abs_myname="$__cdist_abs_mydir/$__cdist_myname"
+
+################################################################################
+# Names / Constants
+#
+# Most values can be overriden from outside, so you can
+# customise paths as you like (for distributors, geeks and hackers)
+#
+
+: ${__cdist_name_bin:=bin}
+: ${__cdist_name_code:=code}
+: ${__cdist_name_code_finished:=.codedone}
+: ${__cdist_name_conf_dir:=conf}
+: ${__cdist_name_explorer:=explorer}
+: ${__cdist_name_gencode:=gencode}
+: ${__cdist_name_gencode_local:=local}
+: ${__cdist_name_gencode_remote:=remote}
+: ${__cdist_name_global:=global}
+: ${__cdist_name_host:=host}
+: ${__cdist_name_init:=init}
+: ${__cdist_name_manifest:=manifest}
+: ${__cdist_name_object:=object}
+: ${__cdist_name_object_finished:=.done}
+: ${__cdist_name_object_id:=object_id}
+: ${__cdist_name_object_source:=.source}
+: ${__cdist_name_out_dir:=out}
+: ${__cdist_name_parameter:=parameter}
+: ${__cdist_name_parameter_required:=required}
+: ${__cdist_name_parameter_optional:=optional}
+: ${__cdist_name_require:=require}
+: ${__cdist_name_singleton:=singleton}
+: ${__cdist_name_target_host:=target_host}
+: ${__cdist_name_target_user:=target_user}
+: ${__cdist_name_type:=type}
+: ${__cdist_name_type_bin:=type_bin}
+: ${__cdist_name_type_explorer:=type_explorer}
+
+# Used for IDs: Allow everything not starting with - and .
+: ${__cdist_sane_regexp:=[^-\.].*}
+
+# Default remote user
+: ${__cdist_remote_user:=root}
+
+
+################################################################################
+# Exported variable names (usable for non core
+#
+: ${__cdist_name_var_explorer:=__$__cdist_name_explorer}
+: ${__cdist_name_var_type_explorer:=__$__cdist_name_type_explorer}
+: ${__cdist_name_var_global:=__$__cdist_name_global}
+: ${__cdist_name_var_manifest:=__$__cdist_name_manifest}
+: ${__cdist_name_var_target_host:=__$__cdist_name_target_host}
+: ${__cdist_name_var_target_user:=__$__cdist_name_target_user}
+: ${__cdist_name_var_object:=__$__cdist_name_object}
+: ${__cdist_name_var_object_id:=__$__cdist_name_object_id}
+: ${__cdist_name_var_type:=__$__cdist_name_type}
+
+
+################################################################################
+# Tempfiles
+# 
+__cdist_tmp_dir=$(mktemp -d "/tmp/cdist.XXXXXXXXXXXX")
+__cdist_tmp_file=$(mktemp "$__cdist_tmp_dir/cdist.XXXXXXXXXXXX")
+
+################################################################################
+# Local Base
+# 
+: ${__cdist_local_base_dir:=$__cdist_tmp_dir}
+
+: ${__cdist_conf_dir:="$(cd "$__cdist_abs_mydir/../conf" && pwd -P)"}
+
+: ${__cdist_explorer_dir:=$__cdist_conf_dir/$__cdist_name_explorer}
+: ${__cdist_manifest_dir:=$__cdist_conf_dir/$__cdist_name_manifest}
+: ${__cdist_manifest_init:=$__cdist_manifest_dir/$__cdist_name_init}
+: ${__cdist_type_dir:=$__cdist_conf_dir/$__cdist_name_type}
+
+################################################################################
+# Local output
+# 
+: ${__cdist_out_dir:=$__cdist_local_base_dir/$__cdist_name_out_dir}
+: ${__cdist_out_explorer_dir:=$__cdist_out_dir/$__cdist_name_explorer}
+: ${__cdist_out_object_dir:=$__cdist_out_dir/$__cdist_name_object}
+: ${__cdist_out_type_bin_dir:=$__cdist_out_dir/$__cdist_name_type_bin}
+
+################################################################################
+# Remote base
+# 
+: ${__cdist_remote_base_dir:=/var/lib/cdist}
+: ${__cdist_remote_bin_dir:=$__cdist_remote_base_dir/$__cdist_name_bin}
+: ${__cdist_remote_conf_dir:=$__cdist_remote_base_dir/$__cdist_name_conf_dir}
+
+: ${__cdist_remote_explorer_dir:=$__cdist_remote_conf_dir/$__cdist_name_explorer}
+: ${__cdist_remote_type_dir:=$__cdist_remote_conf_dir/$__cdist_name_type}
+
+################################################################################
+# Remote output
+#
+: ${__cdist_remote_out_dir:=$__cdist_remote_base_dir/$__cdist_name_out_dir}
+: ${__cdist_remote_out_explorer_dir:=$__cdist_remote_out_dir/$__cdist_name_explorer}
+: ${__cdist_remote_out_object_base_dir:=$__cdist_remote_out_dir/$__cdist_name_object}
+
+################################################################################
+# Function list
+#
+__cdist_debug_echo()
+{
+   if [ "$__cdist_debug" ]; then
+      echo "Debug: $@"
+   fi
+}
+
+__cdist_exit_err()
+{
+   echo "$@" >&2
+   exit 1
+}
+
+__cdist_usage()
+{
+   __cdist_exit_err "$__cdist_myname: $@"
+}
+
+__cdist_init_deploy()
+{
+   echo "Creating clean directory structure ..."
+
+   # Ensure there is no old stuff, neither local nor remote
+   rm -rf "$__cdist_local_base_dir"
+   ssh "${__cdist_remote_user}@$1" "rm -rf ${__cdist_remote_base_dir}"
+
+   # Init base
+   mkdir -p "$__cdist_local_base_dir"
+   ssh "${__cdist_remote_user}@$1" "mkdir -p ${__cdist_remote_base_dir}"
+
+   # Link configuration source directory - consistent with remote
+   ln -sf "$__cdist_conf_dir" "$__cdist_local_base_dir/$__cdist_name_conf_dir"
+}
+
+__cdist_type_has_explorer()
+{
+   # We only create output, if there's at least one explorer
+   # and can thus be used as a boolean ;-)
+   if [ -d "$(__cdist_type_explorer_dir "$1")" ]; then
+      ls -1 "$(__cdist_type_explorer_dir "$1")"
+   fi
+}
+
+__cdist_type_dir()
+{
+   echo "${__cdist_type_dir}/$1"
+}
+
+__cdist_type_explorer_dir()
+{
+   echo "${__cdist_type_dir}/$1/${__cdist_name_explorer}"
+}
+
+__cdist_remote_type_explorer_dir()
+{
+   echo "${__cdist_remote_type_dir}/$1/${__cdist_name_explorer}"
+}
+
+__cdist_type_gencode()
+{
+   echo "${__cdist_type_dir}/$1/${__cdist_name_gencode}"
+}
+
+__cdist_type_singleton()
+{
+   echo "${__cdist_type_dir}/$1/${__cdist_name_singleton}"
+}
+
+__cdist_type_parameter_dir()
+{
+   echo "$(__cdist_type_dir "$1")/${__cdist_name_parameter}"
+}
+
+# Shorthand for required and optional
+__cdist_type_parameter_required()
+{
+   echo "$(__cdist_type_parameter_dir "$1")/$__cdist_name_parameter_required"
+}
+
+__cdist_type_parameter_optional()
+{
+   echo "$(__cdist_type_parameter_dir "$1")/$__cdist_name_parameter_optional"
+}
+
+__cdist_type_from_object()
+{
+   echo "${1%%/*}"
+}
+
+__cdist_object_id_from_object()
+{
+   echo "${1#*/}"
+}
+
+__cdist_object_dir()
+{
+   __cdist_object_dir="${__cdist_out_object_dir}/$1"
+   echo "$__cdist_object_dir"
+}
+
+__cdist_remote_object_dir()
+{
+   echo "${__cdist_remote_out_object_base_dir}/$1"
+}
+
+__cdist_object_code()
+{
+   echo "$(__cdist_object_dir "$1")/${__cdist_name_code}"
+}
+
+__cdist_object_code_finished()
+{
+   echo "$(__cdist_object_dir "$1")/${__cdist_name_code_finished}"
+}
+
+__cdist_object_parameter_dir()
+{
+   echo "$(__cdist_object_dir "$1")/${__cdist_name_parameter}"
+}
+
+__cdist_remote_object_parameter_dir()
+{
+   echo "$(__cdist_remote_object_dir "$1")/${__cdist_name_parameter}"
+}
+
+__cdist_object_require()
+{
+   echo "$(__cdist_object_dir "$1")/${__cdist_name_require}"
+}
+
+__cdist_object_type_explorer_dir()
+{
+   echo "$(__cdist_object_dir "$1")/${__cdist_name_explorer}"
+}
+
+__cdist_remote_object_type_explorer_dir()
+{
+   echo "$(__cdist_remote_object_dir "$1")/${__cdist_name_explorer}"
+}
+
+# Find objects, remove ./ and /MARKER
+__cdist_object_list()
+{
+   local basedir="$1"; shift
+
+   # Use subshell to prevent changing cwd in program
+   (
+      cd "${basedir}"
+
+      find . -name "$__cdist_name_object_source" |    \
+         sed -e 's;^./;;' -e "s;/${__cdist_name_object_source}\$;;"
+   )
+
+}
+
+__cdist_object_source()
+{
+   local object_dir="$1"; shift
+
+   cat "${object_dir}/${__cdist_name_object_source}"
+}
+
+__cdist_exec_fail_on_error()
+{
+   sh -e "$@"
+   [ "$?" -eq 0 ] || __cdist_exit_err "Error: $1 exited non-zero."
+}
+
+
+__cdist_tmp_removal()
+{
+   rm -rf "${__cdist_tmp_dir}"
+}
+
+################################################################################
+# Trap for tmp removal
+#
+trap __cdist_tmp_removal EXIT
--- a/bin/cdist-deploy-to
+++ b/bin/cdist-deploy-to
@ -0,0 +1,62 @@
+#!/bin/sh
+#
+# 2010-2011 Nico Schottelius (nico-cdist at schottelius.org)
+#
+# This file is part of cdist.
+#
+# cdist is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# cdist is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with cdist. If not, see <http://www.gnu.org/licenses/>.
+#
+#
+# Apply configuration to a host
+#
+
+. cdist-config
+[ $# -eq 1 ] || __cdist_usage "<target host>"
+set -eu
+
+__cdist_target_host="$1"
+
+# Make target host available for non-core
+export $__cdist_name_var_target_host="$__cdist_target_host"
+export $__cdist_name_var_target_user="$__cdist_remote_user"
+
+# Export variables for core, which others do not reset
+export __cdist_local_base_dir
+
+echo "cdist $__cdist_version: Configuring $__cdist_target_host"
+
+################################################################################
+# See cdist-stages(7)
+#
+
+# Prepare local and remote directories
+__cdist_init_deploy           "$__cdist_target_host"
+
+# Transfer cdist executables
+echo "Transferring cdist binaries to $__cdist_target_host ..."
+cdist-dir push "$__cdist_target_host" "${__cdist_abs_mydir}" "${__cdist_remote_bin_dir}"
+
+cdist-explorer-run-global     "$__cdist_target_host"
+cdist-manifest-run-init       "$__cdist_target_host"
+cdist-manifest-run-all        "$__cdist_target_host"
+cdist-object-explorer-all     "$__cdist_target_host"
+cdist-object-gencode-all      "$__cdist_target_host"
+
+echo "Transferring created objects to $__cdist_target_host ..."
+cdist-dir push "$__cdist_target_host" "$__cdist_out_object_dir" \
+   "${__cdist_remote_out_object_base_dir}"
+
+cdist-code-run-all            "$__cdist_target_host"
+
+echo "cdist $__cdist_version: Successfully finished run on $__cdist_target_host"
--- a/bin/cdist-dir
+++ b/bin/cdist-dir
@ -0,0 +1,54 @@
+#!/bin/sh
+#
+# 2011 Nico Schottelius (nico-cdist at schottelius.org)
+#
+# This file is part of cdist.
+#
+# cdist is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# cdist is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with cdist. If not, see <http://www.gnu.org/licenses/>.
+#
+#
+# Push a directory to a target, both sides have the same name (i.e. explorers)
+# or
+# Pull a directory from a target, both sides have the same name (i.e. explorers)
+#
+
+
+. cdist-config
+if [ $# -ne 4 ]; then
+   __cdist_usage "<push|pull> <target host> <src dir> <dst dir>"
+fi
+set -ue
+
+__cdist_action="$1"; shift
+__cdist_target_host="$1"; shift
+
+__cdist_src_dir="$1"; shift
+__cdist_dst_dir="$1"; shift
+
+# This will be the destination directory, so no subdirectories
+# of the same name are created, if the directory is already existing
+__cdist_top_dir="${__cdist_dst_dir%/*}"
+
+if [ "$__cdist_action" = "push" ]; then
+   ssh "${__cdist_remote_user}@${__cdist_target_host}" \
+      "mkdir -p \"${__cdist_dst_dir}\""
+   scp -qr "$__cdist_src_dir" \
+      "${__cdist_remote_user}@${__cdist_target_host}:${__cdist_top_dir}"
+elif [ "$__cdist_action" = "pull" ]; then
+   mkdir -p "${__cdist_dst_dir}"
+   scp -qr "${__cdist_remote_user}@${__cdist_target_host}:${__cdist_src_dir}" \
+      "${__cdist_top_dir}"
+else
+   __cdist_exit_err "Unknown action $__cdist_action"
+fi
--- a/bin/cdist-env
+++ b/bin/cdist-env
@ -0,0 +1,43 @@
+#!/bin/sh
+#
+# 2011 Nico Schottelius (nico-cdist at schottelius.org)
+#
+# This file is part of cdist.
+#
+# cdist is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# cdist is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with cdist. If not, see <http://www.gnu.org/licenses/>.
+#
+#
+# Setup environment for use with cdist - must be standalone!
+#
+
+__cdist_pwd="$(pwd -P)"
+__cdist_mydir="${0%/*}";
+__cdist_abs_mydir="$(cd "$__cdist_mydir" && pwd -P)"
+__cdist_myname=${0##*/};
+__cdist_abs_myname="$__cdist_abs_mydir/$__cdist_myname"
+
+shell_binary=${SHELL##*/}
+
+NEWPATH="$__cdist_abs_mydir:$PATH"
+cd "$__cdist_abs_mydir/../doc/man"
+NEWMANPATH="$(pwd -P):$MANPATH"
+
+# Match csh, tcsh to handle differently
+if [ "$(echo $shell_binary | grep 'csh$')" ]; then
+   echo setenv PATH $NEWPATH \;
+   echo setenv MANPATH $NEWMANPATH
+else
+   echo export PATH=$NEWPATH
+   echo export MANPATH=$NEWMANPATH
+fi
--- a/bin/cdist-explorer-run-global
+++ b/bin/cdist-explorer-run-global
@ -0,0 +1,43 @@
+#!/bin/sh
+#
+# 2010-2011 Nico Schottelius (nico-cdist at schottelius.org)
+#
+# This file is part of cdist.
+#
+# cdist is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# cdist is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with cdist. If not, see <http://www.gnu.org/licenses/>.
+#
+#
+# Copy & run the global explorers, i.e. not bound to types
+#
+
+. cdist-config
+[ $# -eq 1 ] || __cdist_usage "<target_host>"
+set -ue
+
+__cdist_target_host="$1"; shift
+
+echo "Running global explorers ..."
+
+# copy the explorers
+cdist-dir push "$__cdist_target_host" \
+   "${__cdist_explorer_dir}" "${__cdist_remote_explorer_dir}"
+
+# run the initial explorers remotely
+cdist-run-remote "${__cdist_target_host}" cdist-remote-explorer-run  \
+   "$__cdist_name_var_explorer" "$__cdist_remote_explorer_dir"       \
+   "$__cdist_remote_out_explorer_dir"
+
+# retrieve the results
+cdist-dir pull "$__cdist_target_host" \
+   "${__cdist_remote_out_explorer_dir}" "${__cdist_out_explorer_dir}"
--- a/bin/cdist-manifest-run
+++ b/bin/cdist-manifest-run
@ -0,0 +1,68 @@
+#!/bin/sh
+#
+# 2010 Nico Schottelius (nico-cdist at schottelius.org)
+#
+# This file is part of cdist.
+#
+# cdist is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# cdist is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with cdist. If not, see <http://www.gnu.org/licenses/>.
+#
+# 
+# Let's build a cconfig tree from a configuration
+# And save it into the cache tree
+#
+
+. cdist-config
+[ $# -eq 3 ] || __cdist_usage "<target host> <manifest> <out object dir>"
+set -u
+
+__cdist_target_host="$1"; shift
+__cdist_manifest="$1"; shift
+
+################################################################################
+# Export information for cdist-type-emulator or manifest
+#
+
+# This is a special variable, as being used by __cdist_object_dir
+# We need to adjust it, so cdist-type-emulator writes to the right location
+export __cdist_out_object_dir="$1"; shift
+
+# Config dir should not get reset - FIXME: why did I do this?
+export __cdist_conf_dir
+
+# Used to record the source in the object
+export __cdist_manifest
+
+# Export information for manifests - __cdist_out_dir comes from cdist-config
+export __global="$__cdist_out_dir"
+
+################################################################################
+# The actual run
+#
+
+# Ensure binaries exist and are up-to-date
+cdist-type-build-emulation "${__cdist_out_type_bin_dir}" \
+   || __cdist_exit_err "Failed to build type emulation binaries"
+
+# prepend our path, so all cdist tools come before other tools
+export PATH="${__cdist_out_type_bin_dir}:$PATH"
+
+# Sanity checks
+[ -f "${__cdist_manifest}" ] \
+   || __cdist_exit_err "Missing manifest ${__cdist_manifest}"
+[ -x "${__cdist_manifest}" ] \
+   || __cdist_exit_err "${__cdist_manifest} needs to be executable."
+mkdir -p "${__cdist_out_object_dir}" \
+   || __cdist_exit_err "Cannot create output dir ${__cdist_out_object_dir}"
+
+__cdist_exec_fail_on_error "${__cdist_manifest}"
--- a/bin/cdist-manifest-run-all
+++ b/bin/cdist-manifest-run-all
@ -0,0 +1,128 @@
+#!/bin/sh
+#
+# 2010-2011 Nico Schottelius (nico-cdist at schottelius.org)
+#
+# This file is part of cdist.
+#
+# cdist is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# cdist is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with cdist. If not, see <http://www.gnu.org/licenses/>.
+#
+# 
+# For each created object
+# run the manifest of the type (with object id),
+# try to merge back newly created objects (otherwise fail),
+# mark the object as being run
+# and iterate until all objects are marked being run.
+#
+#
+#
+
+. cdist-config
+[ $# -eq 1 ] || __cdist_usage "<target host>"
+set -eu
+
+__cdist_target_host="$1"; shift
+
+__cdist_objects_list="${__cdist_tmp_dir}/objects_file"
+__cdist_new_objects_list="${__cdist_tmp_dir}/new_objects_file"
+__cdist_new_objects_dir="${__cdist_tmp_dir}/new_objects_dir"
+
+
+# Loop until we do not create new objects anymore
+# which is equal to all objects have been run
+__cdist_new_objects_created=y
+while [ "$__cdist_new_objects_created" = "y"  ]; do
+   # Assume we're done after this run
+   __cdist_new_objects_created=n
+
+   __cdist_object_list "$__cdist_out_object_dir" > "$__cdist_objects_list"
+
+   # Check every object, if we need to run it
+   while read __cdist_object; do
+      # Full path to current object
+      __cdist_cur_object_dir="$__cdist_out_object_dir/$__cdist_object"
+      # Only the id
+      __cdist_object_id="$(__cdist_object_id_from_object "$__cdist_object")"
+
+      if [ ! -f "${__cdist_cur_object_dir}/$__cdist_name_object_finished" ]; then
+         echo "Checking manifest for ${__cdist_object} ..."
+
+         __cdist_type="$(__cdist_type_from_object "$__cdist_object")"
+         __cdist_manifest="$__cdist_type_dir/${__cdist_type}/${__cdist_name_manifest}"
+
+         # Make __cdist_manifest available for cdist-type-emulator
+         export __cdist_manifest
+
+         if [ -x "${__cdist_manifest}" ]; then
+            echo "Executing manifest ${__cdist_manifest} ..."
+
+            # Make variables available to non-core
+            export $__cdist_name_var_object="$__cdist_cur_object_dir"
+            export $__cdist_name_var_object_id="$__cdist_object_id"
+            export $__cdist_name_var_type="$(__cdist_type_dir "$__cdist_type")"
+
+            cdist-manifest-run "$__cdist_target_host" "$__cdist_manifest" \
+               "$__cdist_new_objects_dir"
+
+            __cdist_object_list "${__cdist_new_objects_dir}" > "$__cdist_new_objects_list"
+
+            # Verify no conflicting objects have been created
+            while read __cdist_new_object; do
+               grep -q "^$__cdist_new_object\$" "$__cdist_objects_list" && \
+                  __cdist_exit_err "${__cdist_manifest}: Tried to recreate ${__cdist_new_object}"
+            done < "$__cdist_new_objects_list"
+
+            # Safe harbour: We can merge all objects into main tree
+            # Merge = mkdir + mv parameters and source information
+            while read __cdist_new_object; do
+                [ "$__cdist_new_objects_created" = "n" ] && __cdist_new_objects_created="y"
+               
+               # where to save the newly created object
+               __cdist_object_dir="$__cdist_out_object_dir/$__cdist_new_object"
+               mkdir -p "$__cdist_object_dir"
+
+               # Move parts of the object (CANNOT MOVE COMPLETLEY, HIERACHY!)
+               __cdist_new_object_dir="$__cdist_new_objects_dir/$__cdist_new_object"
+
+               # Source
+               mv "${__cdist_new_object_dir}/${__cdist_name_object_source}" \
+                  "$__cdist_object_dir"
+
+               # Explorer, Parameter, Require
+               for __cdist_object_file in   \
+                  ${__cdist_name_explorer}   \
+                  ${__cdist_name_parameter}  \
+                  ${__cdist_name_require}    \
+                  ; do
+                  
+                  if [ -e "${__cdist_new_object_dir}/${__cdist_object_file}" ]; then
+                     mv "${__cdist_new_object_dir}/${__cdist_object_file}" \
+                     "$__cdist_object_dir"
+                  fi
+               done
+            done < "$__cdist_new_objects_list"
+
+            # Remove listing and objects, otherwise the next type will reuse it...
+            rm -rf "$__cdist_new_objects_dir" "$__cdist_new_objects_list"
+         else
+            # Be nice, warn user if manifests exists, but is not executable
+            if [ -f "${__cdist_manifest}" ]; then
+               echo "Warning ${__cdist_manifest} exists, but is not executable." >&2
+            fi
+         fi
+      fi
+
+      # done with this object
+      touch "$__cdist_cur_object_dir/$__cdist_name_object_finished"
+   done < "$__cdist_objects_list"
+done
--- a/bin/cdist-manifest-run-init
+++ b/bin/cdist-manifest-run-init
@ -1,7 +1,6 @@
 #!/bin/sh
-# -*- coding: utf-8 -*-
 #
-# 2012 Nico Schottelius (nico-cdist at schottelius.org)
+# 2010-2011 Nico Schottelius (nico-cdist at schottelius.org)
 #
 # This file is part of cdist.
 #
@ -18,16 +17,18 @@
 # You should have received a copy of the GNU General Public License
 # along with cdist. If not, see <http://www.gnu.org/licenses/>.
 #
+# 
+# Let's build a cconfig tree from a configuration
+# And save it into the cache tree
 #

-# Wrapper for real script to allow execution from checkout
-dir=${0%/*}
+. cdist-config
+[ $# -eq 1 ] || __cdist_usage "<target host>"
+set -e

-# Ensure version is present - the bundled/shipped version contains a static version,
-# the git version contains a dynamic version
-"$dir/build-helper" version
+__cdist_target_host="$1"; shift

-libdir=$(cd "${dir}/../" && pwd -P)
-export PYTHONPATH="${libdir}"
+eval export $__cdist_name_var_manifest=\"\$__cdist_manifest_dir\"

-"$dir/../scripts/cdist" "$@"
+echo "Running initial manifest for $__cdist_target_host ..."
+cdist-manifest-run "$__cdist_target_host" "$__cdist_manifest_init" "$__cdist_out_object_dir"
--- a/bin/cdist-object-explorer-all
+++ b/bin/cdist-object-explorer-all
@ -0,0 +1,102 @@
+#!/bin/sh
+#
+# 2011 Nico Schottelius (nico-cdist at schottelius.org)
+#
+# This file is part of cdist.
+#
+# cdist is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# cdist is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with cdist. If not, see <http://www.gnu.org/licenses/>.
+#
+# 
+# For each created object check the explorers and run them if needed.
+#
+
+. cdist-config
+[ $# -eq 1 ] || __cdist_usage "<target host>"
+set -eu
+
+__cdist_target_host="$1"; shift
+
+object_listing="$__cdist_tmp_dir/objects"
+type_listing_all="$__cdist_tmp_dir/types_all"
+type_listing="$__cdist_tmp_dir/types"
+
+# Get listing of objects
+__cdist_object_list "$__cdist_out_object_dir" > "$object_listing"
+
+# Get listing of types used
+while read object; do
+   echo "$(__cdist_type_from_object "$object")" >> "$type_listing_all"
+done < "$object_listing"
+sort "$type_listing_all" | uniq > "$type_listing"
+
+# Create pseudo array to avoid issues with ssh
+tc=0
+while read type; do
+   eval type_$tc=\"\$type\"
+   tc=$((tc+1))
+done < "$type_listing"
+
+# For every type that has explorers, Transfer the explorers
+i=0
+while [ "$i" -lt "$tc" ]; do
+   eval cur_type=\"\$type_$i\"
+
+   src_dir="$(__cdist_type_explorer_dir "$cur_type")"
+   dst_dir="$(__cdist_remote_type_explorer_dir "$cur_type")"
+
+   if [ -d "$src_dir" ]; then
+      cdist-dir push "$__cdist_target_host" "$src_dir" "$dst_dir"
+   fi
+   i=$((i+1))
+done
+
+################################################################################
+# Explorer execution per object
+#
+# need to create pseudo array, as ssh in cdist-explorer-run will destroy while-read loops
+while read object; do
+   set -- "$@" "$object"
+done < "$object_listing"
+
+while [ $# -gt 0 ]; do
+   __object="$1"; shift
+   __object_id="$(__cdist_object_id_from_object "$__object")"
+   __cdist_type="$(__cdist_type_from_object "$__object")"
+
+   # Check if type of object has >= 1 explorer
+   has_explorer="$(__cdist_type_has_explorer "$__cdist_type")"
+
+   # If so, run explorers on remote side
+   if [ "$has_explorer" ]; then
+      echo "Running explorers for $__object ..."
+      # Copy object parameters
+      cdist-dir push "$__cdist_target_host"                       \
+         "$(__cdist_object_parameter_dir "$__object")"            \
+         "$(__cdist_remote_object_parameter_dir "$__object")"
+
+      # Execute explorers
+      cdist-run-remote "$__cdist_target_host"                     \
+         "__object=\"$(__cdist_remote_object_dir "$__object")\""   \
+         "__object_id=\"$__object_id\""                           \
+         cdist-remote-explorer-run                                \
+         "$__cdist_name_var_type_explorer"                        \
+         "$(__cdist_remote_type_explorer_dir "$__cdist_type")"    \
+         "$(__cdist_remote_object_type_explorer_dir "$__object")"
+   
+      # Copy back results
+      cdist-dir pull "$__cdist_target_host"                       \
+         "$(__cdist_remote_object_type_explorer_dir "$__object")" \
+         "$(__cdist_object_type_explorer_dir "$__object")"
+   fi
+done
--- a/bin/cdist-object-gencode
+++ b/bin/cdist-object-gencode
@ -0,0 +1,63 @@
+#!/bin/sh
+#
+# 2011 Nico Schottelius (nico-cdist at schottelius.org)
+#
+# This file is part of cdist.
+#
+# cdist is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# cdist is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with cdist. If not, see <http://www.gnu.org/licenses/>.
+#
+#
+# Generate code from one object (object must be relative path!)
+# WARNING: OUTPUT ON STDOUT, ERRORS NEED TO BE ON STDERR!
+#
+
+. cdist-config
+[ $# -eq 3 ] || __cdist_usage "<target host>" "<object>" "<type>"
+set -eu
+
+__cdist_target_host="$1"; shift
+__cdist_object="$1"; shift
+__cdist_gencode_type="$1"; shift
+
+__cdist_object_dir="$(__cdist_object_dir "$__cdist_object")"
+__cdist_type="$(__cdist_type_from_object "$__cdist_object")"
+__cdist_object_id="$(__cdist_object_id_from_object "$__cdist_object")"
+
+# Full path to where the executable of the type should exist, if the type has one
+gencode="$(__cdist_type_gencode "$__cdist_type")-${__cdist_gencode_type}"
+
+# export variables for gencode
+export __object_id="$__cdist_object_id"
+export __object="$__cdist_object_dir"
+export __global="$__cdist_out_dir"
+
+cd "$__cdist_local_base_dir"
+
+cat << eof
+#
+# The following code is imported from output of $gencode
+#
+
+eof
+
+if [ -x "$gencode" ]; then
+   __cdist_exec_fail_on_error "$gencode"
+else
+   if [ -f "$gencode" ]; then
+      echo "Warning: $gencode exists, but is not executable" >&2
+   fi
+
+   # No gencode? also fine! Ensure we exit 0
+   exit 0
+fi
--- a/bin/cdist-object-gencode-all
+++ b/bin/cdist-object-gencode-all
@ -0,0 +1,45 @@
+#!/bin/sh
+#
+# 2010 Nico Schottelius (nico-cdist at schottelius.org)
+#
+# This file is part of cdist.
+#
+# cdist is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# cdist is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with cdist. If not, see <http://www.gnu.org/licenses/>.
+#
+# 
+# For each created object create the code to be executed on the target.
+#
+
+. cdist-config
+[ $# -eq 1 ] || __cdist_usage "<target host>"
+set -eu
+
+__cdist_target_host="$1"; shift
+
+__cdist_object_list "$__cdist_out_object_dir" > "$__cdist_tmp_file"
+
+while read object; do
+   code_local="$(__cdist_object_code "$object")-${__cdist_name_gencode_local}"
+   code_remote="$(__cdist_object_code "$object")-${__cdist_name_gencode_remote}"
+
+   echo "Generating local code for $object ..."
+   cdist-object-gencode "$__cdist_target_host" "$object" \
+      "${__cdist_name_gencode_local}" > "${code_local}"
+
+   echo "Generating remote code for $object ..."
+   cdist-object-gencode "$__cdist_target_host" "$object" \
+      "${__cdist_name_gencode_remote}" > "${code_remote}"
+
+   chmod u+x "${code_local}" "${code_remote}"
+done < "$__cdist_tmp_file"
--- a/bin/cdist-quickstart
+++ b/bin/cdist-quickstart
@ -0,0 +1,310 @@
+#!/bin/sh
+#
+# 2010-2011 Nico Schottelius (nico-cdist at schottelius.org)
+#
+# This file is part of cdist.
+#
+# cdist is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# cdist is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with cdist. If not, see <http://www.gnu.org/licenses/>.
+#
+#
+# Give the user an introduction into cdist
+#
+
+. cdist-config
+set -eu
+
+banner="cdist-quickstart>"
+continue="Press enter to continue or ctrl-c to abort."
+create_continue="Press enter to create the described files/directories"
+
+__prompt()
+{
+   echo -n "$banner" "$@"
+   read answer
+}
+
+################################################################################
+# Intro of quickstart
+#
+cat << eof
+$banner cdist version $__cdist_version
+
+Welcome to the interactive guide to cdist!
+This is the interactive tutorial and beginners help for cdist and here's
+our schedule:
+
+   - Stages:   How cdist operates
+   - Explorer: Explore facts of the target host
+   - Manifest: Map configurations to hosts
+   - Types:    Bundled functionality
+   - Deploy a configuration to the local host!
+
+eof
+__prompt "$continue"
+
+################################################################################
+# Stages
+#
+cat << eof
+
+To deploy configurations to a host, you call
+
+   cdist-deploy-to <hostname>
+
+which makes calls to other scripts, which realise the so called "stages".
+Usually you'll not notice this, but in case you want to debug or hack cdist,
+you can run each stage on its own. Besides that, you just need to remember
+that the command cdist-deploy-to is the main cdist command.
+
+See also:
+
+   Source of cdist-deploy-to(1), cdist-stages(7)
+
+eof
+__prompt "$continue"
+
+################################################################################
+# Explorer
+#
+cat << eof
+
+The first thing cdist always does is running different explorers on the
+target host. The explorers can be found in the directory
+
+   ${__cdist_explorer_dir}
+
+An explorer is executed on the target host and its output is saved to a file.
+You can use these files later to decide what or how to configure the host.
+
+For a demonstration, we'll call the OS explorer locally now, but remember:
+This is only for demonstration, normally it is run on the target host.
+The os explorer will which either displays the detected operating system or
+nothing if it does not know your OS.
+
+See also:
+
+   cdist-explorer(7)
+
+eof
+explorer="${__cdist_explorer_dir}/os"
+
+__prompt "Press enter to execute $explorer"
+
+set -x
+"$explorer"
+set +x
+
+################################################################################
+# Manifest
+#
+cat << eof
+
+The initial manifest is the entry point for cdist to find out, what you would
+like to have configured. It is located at
+
+   ${__cdist_manifest_init}
+
+And can be as simple as
+
+--------------------------------------------------------------------------------
+__file /etc/cdist-configured --type file
+--------------------------------------------------------------------------------
+
+See also:
+
+   cdist-manifest(7)
+
+eof
+__prompt "$continue"
+
+cat << eof
+
+Let's take a deeper look at the initial manifest to understand what it means:
+
+   __file /etc/cdist-configured --type file
+      |     |                    |        \\
+      |     |        The parameter type    \\ With the value file
+      |     |
+      |     |
+      |     | This is the object id
+      |
+   __file is a so called "type"
+
+
+This essentially looks like a standard command executed in the shell.
+eof
+__prompt "$continue"
+
+cat << eof
+
+And that's exactly true. Manifests are shell snippets that can use
+types as commands with arguments. cdist prepends a special path
+that contain links to the cdist-type-emulator, to \$PATH, so you
+can use your types as a command.
+
+This is also the reason why types should always be prefixed with
+"__", to prevent collisions with existing binaries.
+
+The object id is unique per type and used to prevent you from creating
+the same object twice.
+
+Parameters are type specific and are always specified as --parameter <value>.
+
+See also:
+
+   cdist-type-build-emulation(1), cdist-type-emulator(1)
+
+eof
+__prompt "$continue"
+
+################################################################################
+# Types
+#
+cat << eof
+
+Types are bundled functionality and are the main component of cdist.
+If you want to have a feature x, you write the type __x. Types are stored in
+
+   ${__cdist_type_dir}
+
+And cdist ships with some types already!
+
+See also:
+
+   cdist-type(7)
+
+eof
+__prompt "Press enter to see available types"
+
+set -x
+ls ${__cdist_type_dir}
+set +x
+
+cat << eof
+
+Types consist of the following parts:
+
+   - ${__cdist_name_parameter} (${__cdist_name_parameter_required}/${__cdist_name_parameter_optional}
+   - ${__cdist_name_manifest}
+   - ${__cdist_name_explorer}
+   - ${__cdist_name_gencode}
+
+eof
+__prompt "$continue"
+
+
+cat << eof
+
+Every type must have a directory named ${__cdist_name_parameter}, which
+contains required or optional parameters (in newline seperated files).
+
+If an object of a specific type was created in the initial manifest,
+the manifest of the type is run and may create other objects.
+
+A type may have ${__cdist_name_explorer}, which are very similar to the
+${__cdist_name_explorer} seen above, but with a different purpose:
+They are specific to the type and are not relevant for other types.
+
+You may use them for instance to find out details on the target host,
+so you can decide what to do on the target host eventually.
+
+After the ${__cdist_name_manifest} and the ${__cdist_name_explorer} of
+a type have been run, ${__cdist_name_gencode} is executed, which creates
+code to be executed on the target on stdout.
+
+eof
+__prompt "$continue"
+
+################################################################################
+# Deployment
+#
+
+cat << eof
+
+Now you've got some basic knowledge about cdist, let's configure your a host!
+
+Ensure that you have a ssh server running on the host and that you can login as root.
+
+eof
+
+__prompt "Enter hostname or press enter for localhost: "
+
+if [ "$answer" ]; then
+   host="$answer"
+else
+   host="localhost"
+fi
+
+manifestinit="conf/manifest/init"
+cat << eof
+
+I'll know setup $manifestinit, containing the following code:
+
+--------------------------------------------------------------------------------
+# Every machine becomes a marker, so sysadmins know that automatic
+# configurations are happening
+__file /etc/cdist-configured
+
+case "\$__target_host" in
+   $host)
+      __link /tmp/cdist-testfile --source /etc/cdist-configured  --type symbolic
+      __addifnosuchline /tmp/cdist-welcome --line "Welcome to cdist"
+   ;;
+esac
+--------------------------------------------------------------------------------
+
+WARNING: This will overwrite ${manifestinit}.
+
+eof
+
+cat > "$__cdist_abs_mydir/../$manifestinit" << eof
+
+# Every machine becomes a marker, so sysadmins know that automatic
+# configurations are happening
+__file /etc/cdist-configured
+
+case "\$__target_host" in
+   $host)
+      __link /tmp/cdist-testfile --source /etc/cdist-configured  --type symbolic
+      __addifnosuchline /tmp/cdist-welcome --line "Welcome to cdist"
+   ;;
+esac
+
+eof
+
+chmod u+x "$__cdist_abs_mydir/../$manifestinit"
+
+cmd="cdist-deploy-to $host"
+
+__prompt "Press enter to run \"$cmd\""
+
+# No quotes, we need field splitting
+$cmd
+
+################################################################################
+# End
+#
+
+cat << eof
+
+
+--------------------------------------------------------------------------------
+That's it, this is the end of the cdist-quickstart.
+
+I hope you've got some impression on how cdist works, here are again some
+pointers on where to continue to read:
+
+cdist(7), cdist-deploy-to(1), cdist-type(7), cdist-stages(7)
+
+eof
--- a/bin/cdist-remote-explorer-run
+++ b/bin/cdist-remote-explorer-run
@ -0,0 +1,72 @@
+#!/bin/sh
+#
+# 2011 Nico Schottelius (nico-cdist at schottelius.org)
+#
+# This file is part of cdist.
+#
+# cdist is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# cdist is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with cdist. If not, see <http://www.gnu.org/licenses/>.
+#
+#
+# This binary is executed on the remote side to execute explorers
+# 
+# It supports different variables names to be used, so __explorers
+# and __type_explorers can be submitted :-)
+#
+
+. cdist-config
+if [ $# -ne 3 ]; then
+   __cdist_usage "<variable name> <explorer dir> <out dir>"
+fi
+set -ue
+
+# Variable that defines the home of the explorers
+__cdist_variable_name="$1"; shift
+
+# Find explorers here
+__cdist_explorer_dir="$1"; shift
+
+# Write output here
+__cdist_my_out_dir="$1"; shift
+
+# Setup environment
+export $__cdist_variable_name="$__cdist_explorer_dir"
+export __global="$__cdist_remote_out_dir"
+
+mkdir -p "$__cdist_my_out_dir"
+
+# Ensure there is at least one explorer
+num="$(ls -1 "$__cdist_explorer_dir" | wc -l)"
+if [ "$num" -lt 1 ]; then
+   __cdist_exit_err "${__cdist_explorer_dir}: Contains no explorers"
+fi
+
+# Execute all explorers
+for explorer in "$__cdist_explorer_dir/"*; do
+   explorer_name="${explorer##*/}"
+
+   if [ -f "$explorer" ]; then
+      if [ ! -x "$explorer" ]; then
+         echo "Explorer \"$explorer\" exists, but is not executable."
+         continue
+      fi
+
+      # Execute explorers and save results in remote destination directory
+      "$explorer" > "${__cdist_my_out_dir}/$explorer_name"
+   else
+      if [ -e "$explorer" ]; then
+         echo "Explorer \"$explorer\" exists, but is not a file."
+         continue
+      fi
+   fi
+done
--- a/other/examples/types/__nico_sudo/parameter/manifest
+++ b/other/examples/types/__nico_sudo/parameter/manifest
@ -18,14 +18,14 @@
 # along with cdist. If not, see <http://www.gnu.org/licenses/>.
 #
 #
-# USEFUL DESCRIPTION
+# Run a cdist binary on the remote side
 #

-#
-# This is the manifest, which can be used to create other objects like this:
-# __file /path/to/destination --source /from/where/
-#
-# To tell cdist to make use of it, you need to make it executable (chmod +x)
-#
-#
+. cdist-config
+[ $# -ge 2 ] || __cdist_usage "<target_host> <binary> [opts]"
+set -ue

+__cdist_target_host="$1"; shift
+
+ssh "${__cdist_remote_user}@${__cdist_target_host}"   \
+   "PATH=\"${__cdist_remote_bin_dir}:\$PATH\"" "$@"
--- a/cdist/conf/type/__jail_freebsd10/explorer/status
+++ b/cdist/conf/type/__jail_freebsd10/explorer/status
@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# 2012 Jake Guffey (jake.guffey at eprotex.com)
+# 2010-2011 Nico Schottelius (nico-cdist at schottelius.org)
 #
 # This file is part of cdist.
 #
@ -17,36 +17,27 @@
 # You should have received a copy of the GNU General Public License
 # along with cdist. If not, see <http://www.gnu.org/licenses/>.
 #
-#
-# See if the requested jail is started
+# Build pseudo binaries for type emulation
 #

-# Debug
-#exec >&2
-#set -x
+. cdist-config
+[ $# -eq 1 ] || __cdist_usage "<out dir>"
+set -eu

-if [ -f "$__object/parameter/name" ]; then
-   name="$(cat "$__object/parameter/name")"
-else
-   name="$__object_id"
+__cdist_output_dir="$1"; shift
+
+__cdist_type_emulator="$__cdist_abs_mydir/cdist-type-emulator"
+
+if [ ! -d "${__cdist_type_dir}" ]; then
+   __cdist_exit_err "$__cdist_type_dir must exist and contain available types"
 fi

-if [ -f "$__object/parameter/jaildir" ]; then
-   jaildir="$(cat "$__object/parameter/jaildir")"
-else
-   jaildir="/usr/jail"
-fi
-# backslash-escaped $jaildir
-sjaildir="$(echo ${jaildir} | sed 's#/#\\/#g')"
-
-jls_output="$(jls | grep "[ 	]${sjaildir}\\/${name}\$")" || true
-
-if [ -n "${jls_output}" ]; then
-   echo "STARTED"
-else
-   echo "NOTSTART"
-fi
-
-# Debug
-#set +x
+# Get Types
+cd "${__cdist_type_dir}"
+ls -1 > "${__cdist_tmp_file}"

+# Create binaries
+mkdir -p "${__cdist_output_dir}"
+while read type; do
+   ln -sf "${__cdist_type_emulator}" "${__cdist_output_dir}/${type}"
+done < "${__cdist_tmp_file}"
--- a/bin/cdist-type-emulator
+++ b/bin/cdist-type-emulator
@ -0,0 +1,114 @@
+#!/bin/sh
+#
+# 2010-2011 Nico Schottelius (nico-cdist at schottelius.org)
+#
+# This file is part of cdist.
+#
+# cdist is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# cdist is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with cdist. If not, see <http://www.gnu.org/licenses/>.
+#
+# 
+# Wrapper script that generates cconfig from arguments
+#
+# This script will be called everytime the manifest decides to create
+# a new type
+#
+
+. cdist-config
+set -eu
+
+__cdist_type="$__cdist_myname"
+
+# Find out whether type is a singleton or regular type
+if [ -f "$(__cdist_type_singleton "$__cdist_type")" ]; then
+   __cdist_object_id="singleton"
+else
+   [ $# -ge 1 ] || __cdist_usage "<id> <options>"
+   __cdist_object_id="$1"; shift
+fi
+
+echo "$__cdist_object_id" | grep -q "^${__cdist_sane_regexp}\$" || \
+   __cdist_usage "Insane object id, ${__cdist_object_id}."
+
+__cdist_object="${__cdist_type}/${__cdist_object_id}"
+__cdist_ddir="$(__cdist_object_dir "$__cdist_object")"
+__cdist_parameter_dir="$(__cdist_object_parameter_dir "$__cdist_object")"
+
+# Append id for error messages
+__cdist_myname="$__cdist_myname ($__cdist_object_id)"
+
+if [ -e "${__cdist_ddir}" ]; then
+   source="$(__cdist_object_source "${__cdist_ddir}")"
+   __cdist_exit_err "${__cdist_object} already exists (source: $source)"
+fi
+
+mkdir -p "${__cdist_ddir}"
+mkdir -p "${__cdist_parameter_dir}"
+
+# Record (correct ;-) source
+echo "${__cdist_manifest}" > "${__cdist_ddir}/${__cdist_name_object_source}"
+
+# Record parameters to tmpdir
+tempparameter="${__cdist_tmp_dir}/${__cdist_name_parameter}"
+mkdir -p "$tempparameter"
+
+while [ $# -gt 0 ]; do
+   opt="$1"; shift
+
+   echo "$opt" | grep -q "^--${__cdist_sane_regexp}\$" || \
+      __cdist_usage "Provide sane options"
+
+   opt_file="$(echo $opt | sed 's/^--//')"
+
+   [ $# -ge 1 ] || __cdist_usage "Missing value for $opt"
+
+   value="$1"; shift
+
+   echo "${value}" > "${tempparameter}/${opt_file}"
+done
+
+# Ensure required parameters are given
+if [ -f "$(__cdist_type_parameter_required "$__cdist_type")" ]; then
+   while read required; do
+      if [ ! -f "${tempparameter}/${required}" ]; then
+         __cdist_usage "Missing required parameter $required"
+      fi
+
+      mv "${tempparameter}/${required}" "${__cdist_parameter_dir}"
+   done < "$(__cdist_type_parameter_required "$__cdist_type")"
+fi
+
+# Allow optional parameters
+if [ -f "$(__cdist_type_parameter_optional "$__cdist_type")" ]; then
+   while read optional; do
+      if [ -f "${tempparameter}/${optional}" ]; then
+         mv "${tempparameter}/${optional}" "${__cdist_parameter_dir}"
+      fi
+   done < "$(__cdist_type_parameter_optional "$__cdist_type")"
+fi
+
+# Error out on other paramaters
+cd "${tempparameter}"
+other="$(ls)"
+
+if [ "$other" ]; then
+   __cdist_usage "Unsupported parameter: $other"
+fi
+
+# Record requirements
+# it's fine, if it's not set
+set +u
+for requirement in $require; do
+   echo $requirement >> "$(__cdist_object_require "$__cdist_object")"
+   echo Recording: $__cdist_object requires $requirement
+done
--- a/bin/cdist-type-template
+++ b/bin/cdist-type-template
@ -0,0 +1,66 @@
+#!/bin/sh
+#
+# 2011 Nico Schottelius (nico-cdist at schottelius.org)
+#
+# This file is part of cdist.
+#
+# cdist is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# cdist is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with cdist. If not, see <http://www.gnu.org/licenses/>.
+#
+#
+# Create a new type from scratch
+#
+
+. cdist-config
+[ $# -eq 1 ] || __cdist_usage "<type>"
+set -eu
+
+__cdist_type="$1"; shift
+
+
+# Base
+mkdir -p "$(__cdist_type_dir "$__cdist_type")"
+
+# Parameter
+mkdir -p "$(__cdist_type_parameter_dir "$__cdist_type")"
+touch "$(__cdist_type_parameter_dir "$__cdist_type")/${__cdist_name_parameter_required}"
+touch "$(__cdist_type_parameter_dir "$__cdist_type")/${__cdist_name_parameter_optional}"
+
+# Manifest
+cat "$__cdist_abs_mydir/../doc/dev/header" - << eof > "$(__cdist_type_dir "$__cdist_type")/${__cdist_name_manifest}"
+
+#
+# This is the manifest, which can be used to create other objects like this:
+# __file /path/to/destination --source /from/where/ --type file
+#
+# To tell cdist to make use of it, you need to make it executable (chmod +x)
+#
+#
+
+eof
+
+# Gencode
+cat "$__cdist_abs_mydir/../doc/dev/header" - << eof > "$(__cdist_type_dir "$__cdist_type")/${__cdist_name_gencode}"
+
+#
+# This file should generate code on stdout, which will be collected by cdist
+# and run on the target.
+#
+# To tell cdist to make use of it, you need to make it executable (chmod +x)
+#
+#
+
+eof
+
+# Explorer
+mkdir -p "$(__cdist_type_dir "$__cdist_type")/${__cdist_name_explorer}"
--- a/cdist/init.py
+++ b/cdist/init.py
@ -1,271 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# 2010-2015 Nico Schottelius (nico-cdist at schottelius.org)
-# 2012-2017 Steven Armstrong (steven-cdist at armstrong.cc)
-#
-# This file is part of cdist.
-#
-# cdist is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# cdist is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with cdist. If not, see <http://www.gnu.org/licenses/>.
-#
-#
-
-import os
-import hashlib
-
-import cdist.log
-import cdist.version
-
-VERSION = cdist.version.VERSION
-
-BANNER = """
-             ..          .       .x+=:.        s
-           dF           @88>    z`    ^%      :8
-          '88bu.        %8P        .   <k    .88
-      .   '*88888bu      .       .@8Ned8"   :888ooo
- .udR88N    ^"*8888N   .@88u   .@^%8888"  -*8888888
-<888'888k  beWE "888L ''888E` x88:  `)8b.   8888
-9888 'Y"   888E  888E   888E  8888N=*8888   8888
-9888       888E  888E   888E   %8"    R88   8888
-9888       888E  888F   888E    @8Wou 9%   .8888Lu=
-?8888u../ .888N..888    888&  .888888P`    ^%888*
- "8888P'   `"888*""     R888" `   ^"F        'Y"
-   "P'        ""         ""
-"""
-
-REMOTE_COPY = "scp -o User=root -q"
-REMOTE_EXEC = "ssh -o User=root"
-REMOTE_CMDS_CLEANUP_PATTERN = "ssh -o User=root -O exit -S {}"
-
-
-class Error(Exception):
-    """Base exception class for this project"""
-    pass
-
-
-class UnresolvableRequirementsError(cdist.Error):
-    """Resolving requirements failed"""
-    pass
-
-
-class CdistBetaRequired(cdist.Error):
-    """Beta functionality is used but beta is not enabled"""
-
-    def __init__(self, command, arg=None):
-        self.command = command
-        self.arg = arg
-
-    def __str__(self):
-        if self.arg is None:
-            err_msg = ("\'{}\' command is beta, but beta is "
-                       "not enabled. If you want to use it please enable beta "
-                       "functionalities by using the -b/--beta command "
-                       "line flag or setting CDIST_BETA env var.")
-            fmt_args = [self.command, ]
-        else:
-            err_msg = ("\'{}\' argument of \'{}\' command is beta, but beta "
-                       "is not enabled. If you want to use it please enable "
-                       "beta functionalities by using the -b/--beta "
-                       "command line flag or setting CDIST_BETA env var.")
-            fmt_args = [self.arg, self.command, ]
-        return err_msg.format(*fmt_args)
-
-
-class CdistEntityError(Error):
-    """Something went wrong while executing cdist entity"""
-    def __init__(self, entity_name, entity_params, stdout_paths,
-                 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):
-        std_dict = {}
-        self._update_dict_list(std_dict, self._stdout())
-        self._update_dict_list(std_dict, self._stderr())
-        return std_dict
-
-    def __str__(self):
-        output = []
-        output.append(self.message)
-        output.append('\n\n')
-        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('\n')
-        for x in self.std_streams:
-            output.append(''.join(self.std_streams[x]))
-        return ''.join(output)
-
-
-class CdistObjectError(CdistEntityError):
-    """Something went wrong while working on a specific cdist object"""
-    def __init__(self, cdist_object, subject=''):
-        params = [
-            ('name', cdist_object.name, ),
-            ('path', cdist_object.absolute_path, ),
-            ('source', " ".join(cdist_object.source), ),
-            ('type', os.path.realpath(
-                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)
-
-
-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=''):
-        params = [
-            ('path', initial_manifest, ),
-        ]
-        stdout_paths = [
-            ('init', stdout_path, ),
-        ]
-        stderr_paths = [
-            ('init', stderr_path, ),
-        ]
-        super().__init__('initial manifest', params, stdout_paths,
-                         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):
-    """Return list from \n seperated file"""
-    if os.path.isfile(filename):
-        file_fd = open(filename, "r")
-        lines = file_fd.readlines()
-        file_fd.close()
-
-        # Remove \n from all lines
-        lines = map(lambda s: s.strip(), lines)
-    else:
-        lines = []
-
-    return lines
-
-
-def str_hash(s):
-    """Return hash of string s"""
-    if isinstance(s, str):
-        return hashlib.md5(s.encode('utf-8')).hexdigest()
-    else:
-        raise Error("Param should be string")
-
-
-def home_dir():
-    if 'HOME' in os.environ:
-        home = os.environ['HOME']
-        if home:
-            rv = os.path.join(home, ".cdist")
-        else:
-            rv = None
-    else:
-        rv = None
-    return rv
--- a/cdist/argparse.py
+++ b/cdist/argparse.py
@ -1,473 +0,0 @@
-import argparse
-import cdist
-import multiprocessing
-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', )),
-}
-EPILOG = "Get cdist at https://code.ungleich.ch/ungleich-public/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,
-    1: logging.INFO,
-    2: logging.VERBOSE,
-    3: logging.DEBUG,
-    4: logging.TRACE,
-}
-
-
-# Generate verbosity level constants:
-# VERBOSE_OFF, VERBOSE_ERROR, VERBOSE_WARNING, VERBOSE_INFO, VERBOSE_VERBOSE,
-# VERBOSE_DEBUG, VERBOSE_TRACE.
-this_globals = globals()
-for level in _verbosity_level:
-    const = 'VERBOSE_' + logging.getLevelName(_verbosity_level[level])
-    this_globals[const] = level
-
-
-# All verbosity levels above 4 are TRACE.
-_verbosity_level = collections.defaultdict(
-    lambda: logging.TRACE, _verbosity_level)
-
-
-def add_beta_command(cmd):
-    BETA_COMMANDS.add(cmd)
-
-
-def add_beta_arg(cmd, arg):
-    if cmd in BETA_ARGS:
-        if arg not in BETA_ARGS[cmd]:
-            BETA_ARGS[cmd].append(arg)
-    else:
-        BETA_ARGS[cmd] = set((arg, ))
-
-
-def check_beta(args_dict):
-    if 'beta' not in args_dict:
-        args_dict['beta'] = False
-    # Check only if beta is not enabled: if beta option is specified then
-    # raise error.
-    if not args_dict['beta']:
-        cmd = args_dict['command']
-        # first check if command is beta
-        if cmd in BETA_COMMANDS:
-            raise cdist.CdistBetaRequired(cmd)
-        # then check if some command's argument is beta
-        if cmd in BETA_ARGS:
-            for arg in BETA_ARGS[cmd]:
-                if arg in args_dict and args_dict[arg]:
-                    raise cdist.CdistBetaRequired(cmd, arg)
-
-
-def check_lower_bounded_int(value, lower_bound, name):
-    try:
-        val = int(value)
-    except ValueError:
-        raise argparse.ArgumentTypeError(
-                "{} is invalid int value".format(value))
-    if val < lower_bound:
-        raise argparse.ArgumentTypeError(
-                "{} is invalid {} value".format(val, name))
-    return val
-
-
-def get_parsers():
-    global parser
-
-    # Construct parser others can reuse
-    if parser:
-        return parser
-    else:
-        parser = {}
-    # Options _all_ parsers have in common
-    parser['loglevel'] = argparse.ArgumentParser(add_help=False)
-    parser['loglevel'].add_argument(
-            '-l', '--log-level', metavar='LOGLEVEL',
-            type=functools.partial(check_lower_bounded_int, lower_bound=-1,
-                                   name="log level"),
-            help=('Set the specified verbosity level. '
-                  'The levels, in order from the lowest to the highest, are: '
-                  'ERROR (-1), WARNING (0), INFO (1), VERBOSE (2), DEBUG (3) '
-                  'TRACE (4 or higher). If used along with -v then -v '
-                  'increases last set value and -l overwrites last set '
-                  'value.'),
-            action='store', dest='verbose', required=False)
-    parser['loglevel'].add_argument(
-            '-q', '--quiet',
-            help='Quiet mode: disables logging, including WARNING and ERROR.',
-            action='store_true', default=False)
-    parser['loglevel'].add_argument(
-            '-v', '--verbose',
-            help=('Increase the verbosity level. Every instance of -v '
-                  'increments the verbosity level by one. Its default value '
-                  'is 0 which includes ERROR and WARNING levels. '
-                  'The levels, in order from the lowest to the highest, are: '
-                  'ERROR (-1), WARNING (0), INFO (1), VERBOSE (2), DEBUG (3) '
-                  'TRACE (4 or higher). If used along with -l then -l '
-                  'overwrites last set value and -v increases last set '
-                  'value.'),
-            action='count', default=None)
-
-    parser['beta'] = argparse.ArgumentParser(add_help=False)
-    parser['beta'].add_argument(
-           '-b', '--beta',
-           help=('Enable beta functionality. '),
-           action='store_true', dest='beta', default=None)
-
-    # Main subcommand parser
-    parser['main'] = argparse.ArgumentParser(
-            description='cdist ' + cdist.VERSION)
-    parser['main'].add_argument(
-            '-V', '--version', help='Show version.', action='version',
-            version='%(prog)s ' + cdist.VERSION)
-    parser['sub'] = parser['main'].add_subparsers(
-            title="Commands", dest="command")
-
-    # Banner
-    parser['banner'] = parser['sub'].add_parser(
-            'banner', parents=[parser['loglevel']])
-    parser['banner'].set_defaults(func=cdist.banner.banner)
-
-    parser['inventory_common'] = argparse.ArgumentParser(add_help=False)
-    parser['inventory_common'].add_argument(
-           '-I', '--inventory',
-           help=('Use specified custom inventory directory. '
-                 'Inventory directory is set up by the following rules: '
-                 'if cdist configuration resolves this value then specified '
-                 'directory is used, '
-                 'if HOME env var is set then ~/.cdist/inventory is '
-                 'used, otherwise distribution inventory directory is used.'),
-           dest="inventory_dir", required=False)
-
-    parser['common'] = argparse.ArgumentParser(add_help=False)
-    parser['common'].add_argument(
-           '-g', '--config-file',
-           help=('Use specified custom configuration file.'),
-           dest="config_file", required=False)
-
-    # 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 '
-                  'it is not set then default hostdir is used.'),
-            dest='cache_path_pattern',
-            default=None)
-    parser['config_main'].add_argument(
-            '-c', '--conf-dir',
-            help=('Add configuration directory (can be repeated, '
-                  'last one wins).'), action='append')
-    parser['config_main'].add_argument(
-           '-i', '--initial-manifest',
-           help='Path to a cdist manifest or \'-\' to read from stdin.',
-           dest='manifest', required=False)
-    parser['config_main'].add_argument(
-           '-j', '--jobs', nargs='?',
-           type=functools.partial(check_lower_bounded_int, lower_bound=1,
-                                  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. '),
-           action='store', dest='jobs',
-           const=multiprocessing.cpu_count())
-    parser['config_main'].add_argument(
-           '-n', '--dry-run',
-           help='Do not execute code.', action='store_true')
-    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',),
-           help=('Operate by using archiving with compression where '
-                 'appropriate. Supported values are: tar - tar archive, '
-                 'tgz - gzip tar archive (the default), '
-                 'tbz2 - bzip2 tar archive and txz - lzma tar archive. '
-                 'Currently in beta.'),
-           action='store', dest='use_archiving',
-           const='tgz')
-
-    # remote-copy and remote-exec defaults are environment variables
-    # if set; if not then None - these will be futher handled after
-    # parsing to determine implementation default
-    parser['config_main'].add_argument(
-           '-r', '--remote-out-dir',
-           help='Directory to save cdist output in on the target host.',
-           dest="remote_out_path")
-    parser['config_main'].add_argument(
-           '--remote-copy',
-           help='Command to use for remote copy (should behave like scp).',
-           action='store', dest='remote_copy',
-           default=None)
-    parser['config_main'].add_argument(
-           '--remote-exec',
-           help=('Command to use for remote execution '
-                 '(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(
-             '-A', '--all-tagged',
-             help=('Use all hosts present in tags db. Currently in beta.'),
-             action="store_true", dest="all_tagged_hosts", default=False)
-    parser['config_args'].add_argument(
-             '-a', '--all',
-             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(
-            '-f', '--file',
-            help=('Read specified file for a list of additional hosts to '
-                  'operate on or if \'-\' is given, read stdin (one host per '
-                  'line). If no host or host file is specified then, by '
-                  'default, read hosts from stdin.'),
-            dest='hostfile', required=False)
-    parser['config_args'].add_argument(
-           '-p', '--parallel', nargs='?', metavar='HOST_MAX',
-           type=functools.partial(check_lower_bounded_int, lower_bound=1,
-                                  name="positive int"),
-           help=('Operate on multiple hosts in parallel for specified maximum '
-                 'hosts at a time. Without argument CPU count is used by '
-                 'default.'),
-           action='store', dest='parallel',
-           const=multiprocessing.cpu_count())
-    parser['config_args'].add_argument(
-           '-s', '--sequential',
-           help='Operate on multiple hosts sequentially (default).',
-           action='store_const', dest='parallel', const=0)
-    parser['config_args'].add_argument(
-             '-t', '--tag',
-             help=('Host is specified by tag, not hostname/address; '
-                   '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'],
-                               parser['config_main'],
-                               parser['inventory_common'],
-                               parser['config_args']])
-    parser['config'].set_defaults(func=cdist.config.Config.commandline)
-
-    # Install
-    parser['install'] = parser['sub'].add_parser('install', add_help=False,
-                                                 parents=[parser['config']])
-    parser['install'].set_defaults(func=cdist.install.Install.commandline)
-
-    # Inventory
-    parser['inventory'] = parser['sub'].add_parser('inventory')
-    parser['invsub'] = parser['inventory'].add_subparsers(
-            title="Inventory commands", dest="subcommand")
-
-    parser['add-host'] = parser['invsub'].add_parser(
-            'add-host', parents=[parser['loglevel'], parser['beta'],
-                                 parser['common'],
-                                 parser['inventory_common']])
-    parser['add-host'].add_argument(
-            'host', nargs='*', help='Host(s) to add.')
-    parser['add-host'].add_argument(
-           '-f', '--file',
-           help=('Read additional hosts to add from specified file '
-                 'or from stdin if \'-\' (each host on separate line). '
-                 'If no host or host file is specified then, by default, '
-                 'read from stdin.'),
-           dest='hostfile', required=False)
-
-    parser['add-tag'] = parser['invsub'].add_parser(
-            'add-tag', parents=[parser['loglevel'], parser['beta'],
-                                parser['common'],
-                                parser['inventory_common']])
-    parser['add-tag'].add_argument(
-           'host', nargs='*',
-           help='List of host(s) for which tags are added.')
-    parser['add-tag'].add_argument(
-           '-f', '--file',
-           help=('Read additional hosts to add tags from specified file '
-                 'or from stdin if \'-\' (each host on separate line). '
-                 'If no host or host file is specified then, by default, '
-                 'read from stdin. If no tags/tagfile nor hosts/hostfile'
-                 ' are specified then tags are read from stdin and are'
-                 ' added to all hosts.'),
-           dest='hostfile', required=False)
-    parser['add-tag'].add_argument(
-           '-T', '--tag-file',
-           help=('Read additional tags to add from specified file '
-                 'or from stdin if \'-\' (each tag on separate line). '
-                 'If no tag or tag file is specified then, by default, '
-                 'read from stdin. If no tags/tagfile nor hosts/hostfile'
-                 ' are specified then tags are read from stdin and are'
-                 ' added to all hosts.'),
-           dest='tagfile', required=False)
-    parser['add-tag'].add_argument(
-           '-t', '--taglist',
-           help=("Tag list to be added for specified host(s), comma separated"
-                 " values."),
-           dest="taglist", required=False)
-
-    parser['del-host'] = parser['invsub'].add_parser(
-            'del-host', parents=[parser['loglevel'], parser['beta'],
-                                 parser['common'],
-                                 parser['inventory_common']])
-    parser['del-host'].add_argument(
-            'host', nargs='*', help='Host(s) to delete.')
-    parser['del-host'].add_argument(
-            '-a', '--all', help=('Delete all hosts.'),
-            dest='all', required=False, action="store_true", default=False)
-    parser['del-host'].add_argument(
-            '-f', '--file',
-            help=('Read additional hosts to delete from specified file '
-                  'or from stdin if \'-\' (each host on separate line). '
-                  'If no host or host file is specified then, by default, '
-                  'read from stdin.'),
-            dest='hostfile', required=False)
-
-    parser['del-tag'] = parser['invsub'].add_parser(
-            'del-tag', parents=[parser['loglevel'], parser['beta'],
-                                parser['common'],
-                                parser['inventory_common']])
-    parser['del-tag'].add_argument(
-            'host', nargs='*',
-            help='List of host(s) for which tags are deleted.')
-    parser['del-tag'].add_argument(
-            '-a', '--all',
-            help=('Delete all tags for specified host(s).'),
-            dest='all', required=False, action="store_true", default=False)
-    parser['del-tag'].add_argument(
-            '-f', '--file',
-            help=('Read additional hosts to delete tags for from specified '
-                  'file or from stdin if \'-\' (each host on separate line). '
-                  'If no host or host file is specified then, by default, '
-                  'read from stdin. If no tags/tagfile nor hosts/hostfile'
-                  ' are specified then tags are read from stdin and are'
-                  ' deleted from all hosts.'),
-            dest='hostfile', required=False)
-    parser['del-tag'].add_argument(
-            '-T', '--tag-file',
-            help=('Read additional tags from specified file '
-                  'or from stdin if \'-\' (each tag on separate line). '
-                  'If no tag or tag file is specified then, by default, '
-                  'read from stdin. If no tags/tagfile nor'
-                  ' hosts/hostfile are specified then tags are read from'
-                  ' stdin and are added to all hosts.'),
-            dest='tagfile', required=False)
-    parser['del-tag'].add_argument(
-            '-t', '--taglist',
-            help=("Tag list to be deleted for specified host(s), "
-                  "comma separated values."),
-            dest="taglist", required=False)
-
-    parser['list'] = parser['invsub'].add_parser(
-            'list', parents=[parser['loglevel'], parser['beta'],
-                             parser['common'],
-                             parser['inventory_common']])
-    parser['list'].add_argument(
-            'host', nargs='*', help='Host(s) to list.')
-    parser['list'].add_argument(
-            '-a', '--all',
-            help=('List hosts that have all specified tags, '
-                  'if -t/--tag is specified.'),
-            action="store_true", dest="has_all_tags", default=False)
-    parser['list'].add_argument(
-            '-f', '--file',
-            help=('Read additional hosts to list from specified file '
-                  'or from stdin if \'-\' (each host on separate line). '
-                  'If no host or host file is specified then, by default, '
-                  'list all.'), dest='hostfile', required=False)
-    parser['list'].add_argument(
-            '-H', '--host-only', help=('Suppress tags listing.'),
-            action="store_true", dest="list_only_host", default=False)
-    parser['list'].add_argument(
-            '-t', '--tag',
-            help=('Host is specified by tag, not hostname/address; '
-                  'list all hosts that contain any of specified tags.'),
-            action="store_true", default=False)
-
-    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']])
-    parser['shell'].add_argument(
-            '-s', '--shell',
-            help=('Select shell to use, defaults to current shell. Used shell'
-                  ' should be POSIX compatible shell.'))
-    parser['shell'].set_defaults(func=cdist.shell.Shell.commandline)
-
-    for p in parser:
-        parser[p].epilog = EPILOG
-
-    return parser
-
-
-def handle_loglevel(args):
-    if hasattr(args, 'quiet') and args.quiet:
-        args.verbose = _verbosity_level_off
-
-    logging.root.setLevel(_verbosity_level[args.verbose])
-
-
-def parse_and_configure(argv, singleton=True):
-    parser = get_parsers()
-    parser_args = parser['main'].parse_args(argv)
-    try:
-        cfg = cdist.configuration.Configuration(parser_args,
-                                                singleton=singleton)
-        args = cfg.get_args()
-    except ValueError as e:
-        raise cdist.Error(str(e))
-    # Loglevels are handled globally in here
-    handle_loglevel(args)
-
-    log = logging.getLogger("cdist")
-
-    log.verbose("version %s" % cdist.VERSION)
-    log.trace('command line args: {}'.format(cfg.command_line_args))
-    log.trace('configuration: {}'.format(cfg.get_config()))
-    log.trace('configured args: {}'.format(args))
-
-    check_beta(vars(args))
-
-    return parser, cfg
--- a/cdist/autil.py
+++ b/cdist/autil.py
@ -1,71 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# 2017 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/>.
-#
-#
-
-
-import cdist
-import tarfile
-import os
-import glob
-import tempfile
-
-
-_ARCHIVING_MODES = {
-    'tar': '',
-    'tgz': 'gz',
-    'tbz2': 'bz2',
-    'txz': 'xz',
-}
-
-
-_UNARCHIVE_OPT = {
-    'tar': None,
-    'tgz': '-z',
-    'tbz2': '-j',
-    'txz': '-J',
-}
-
-
-# Archiving will be enabled if directory contains more than FILES_LIMIT files.
-FILES_LIMIT = 1
-
-
-def get_extract_option(mode):
-    return _UNARCHIVE_OPT[mode]
-
-
-def tar(source, mode="tgz"):
-    if mode not in _ARCHIVING_MODES:
-        raise cdist.Error("Unsupported archiving mode {}.".format(mode))
-
-    files = glob.glob1(source, '*')
-    fcnt = len(files)
-    if fcnt <= FILES_LIMIT:
-        return None, fcnt
-
-    tarmode = 'w:{}'.format(_ARCHIVING_MODES[mode])
-    _, tarpath = tempfile.mkstemp(suffix='.' + mode)
-    with tarfile.open(tarpath, tarmode, dereference=True) as tar:
-        if os.path.isdir(source):
-            for f in files:
-                tar.add(os.path.join(source, f), arcname=f)
-        else:
-            tar.add(source)
-    return tarpath, fcnt
--- a/cdist/banner.py
+++ b/cdist/banner.py
@ -1,30 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# 2011-2012 Nico Schottelius (nico-cdist at schottelius.org)
-#
-# This file is part of cdist.
-#
-# cdist is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# cdist is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with cdist. If not, see <http://www.gnu.org/licenses/>.
-#
-#
-
-import logging
-import cdist
-
-log = logging.getLogger(__name__)
-
-
-def banner(args):
-    """Guess what :-)"""
-    print(cdist.BANNER)
--- a/cdist/conf/explorer/cpu_cores
+++ b/cdist/conf/explorer/cpu_cores
@ -1,44 +0,0 @@
-#!/bin/sh
-#
-# 2014 Daniel Heule  (hda at sfs.biz)
-# 2014 Thomas Oettli (otho at sfs.biz)
-#
-# 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/>.
-#
-#
-
-# FIXME: other system types (not linux ...)
-
-os=$("$__explorer/os")
-case "$os" in
-    "macosx")
-        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
-                cores="1"
-            fi
-            echo "$cores"
-        fi
-    ;;
-esac
--- a/cdist/conf/explorer/cpu_sockets
+++ b/cdist/conf/explorer/cpu_sockets
@ -1,40 +0,0 @@
-#!/bin/sh
-#
-# 2014 Daniel Heule  (hda at sfs.biz)
-# 2014 Thomas Oettli (otho at sfs.biz)
-#
-# 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/>.
-#
-#
-
-# FIXME: other system types (not linux ...)
-
-os=$("$__explorer/os")
-case "$os" in
-    "macosx")
-        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)"
-        if [ "${sockets}" -eq 0 ]; then
-            sockets="$(grep -c "processor" /proc/cpuinfo)"
-        fi
-        echo "${sockets}"
-    fi
-    ;;
-esac
--- a/cdist/conf/explorer/disks
+++ b/cdist/conf/explorer/disks
@ -1,27 +0,0 @@
-#!/bin/sh
-
-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
--- a/cdist/conf/explorer/hostname
+++ b/cdist/conf/explorer/hostname
@ -1,25 +0,0 @@
-#!/bin/sh
-#
-# 2010-2014 Nico Schottelius (nico-cdist at schottelius.org)
-# 2012 Steven Armstrong (steven-cdist at armstrong.cc)
-#
-# This file is part of cdist.
-#
-# cdist is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# cdist is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with cdist. If not, see <http://www.gnu.org/licenses/>.
-#
-#
-
-if command -v uname >/dev/null; then
-   uname -n
-fi
--- a/cdist/conf/explorer/init
+++ b/cdist/conf/explorer/init
@ -1,39 +0,0 @@
-#!/bin/sh
-#
-# 2016 Daniel Heule (hda at sfs.biz)
-# Copyright 2017, Philippe Gregoire <pg@pgregoire.xyz>
-#
-# 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/>.
-#
-#
-# Returns the process name of pid 1 ( normaly the init system )
-# for example at linux this value is "init" or "systemd" in most cases
-#
-
-uname_s="$(uname -s)"
-
-case "$uname_s" in
-    Linux)
-        (pgrep -P0 -l | awk '/^1[ \t]/ {print $2;}') || true
-    ;;
-    FreeBSD|OpenBSD)
-        ps -o comm= -p 1 || true
-    ;;
-    *)
-        # return a empty string as unknown value
-        echo ""
-    ;;
-esac
--- a/cdist/conf/explorer/interfaces
+++ b/cdist/conf/explorer/interfaces
@ -1,28 +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 command -v ip >/dev/null
-then
-	ip -o link show | sed -n 's/^[0-9]\+: \(.\+\): <.*/\1/p'
-elif command -v ifconfig >/dev/null
-then
-	ifconfig -a | sed -n -E 's/^(.*)(:[[:space:]]*flags=|Link encap).*/\1/p'
-fi \
- | sort -u
--- a/cdist/conf/explorer/is-freebsd-jail
+++ b/cdist/conf/explorer/is-freebsd-jail
@ -1,2 +0,0 @@
-#!/bin/sh
-sysctl -n security.jail.jailed 2>/dev/null | grep "1" || true
--- a/cdist/conf/explorer/kernel_name
+++ b/cdist/conf/explorer/kernel_name
@ -1,2 +0,0 @@
-#!/bin/sh
-uname -s
--- a/cdist/conf/explorer/lsb_codename
+++ b/cdist/conf/explorer/lsb_codename
@ -1,34 +0,0 @@
-#!/bin/sh
-#
-# 2011 Steven Armstrong (steven-cdist at armstrong.cc)
-#
-# This file is part of cdist.
-#
-# cdist is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# cdist is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with cdist. If not, see <http://www.gnu.org/licenses/>.
-#
-#
-
-set +e
-case "$("$__explorer/os")" in
-   openwrt)
-      # shellcheck disable=SC1091
-      (. /etc/openwrt_release && echo "$DISTRIB_CODENAME")
-   ;;
-   *)
-      lsb_release=$(command -v lsb_release)
-      if [ -x "$lsb_release" ]; then
-         $lsb_release --short --codename
-      fi
-   ;;
-esac
--- a/cdist/conf/explorer/lsb_description
+++ b/cdist/conf/explorer/lsb_description
@ -1,34 +0,0 @@
-#!/bin/sh
-#
-# 2011 Steven Armstrong (steven-cdist at armstrong.cc)
-#
-# This file is part of cdist.
-#
-# cdist is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# cdist is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with cdist. If not, see <http://www.gnu.org/licenses/>.
-#
-#
-
-set +e
-case "$("$__explorer/os")" in
-   openwrt)
-      # shellcheck disable=SC1091
-      (. /etc/openwrt_release && echo "$DISTRIB_DESCRIPTION")
-   ;;
-   *)
-      lsb_release=$(command -v lsb_release)
-      if [ -x "$lsb_release" ]; then
-         $lsb_release --short --description
-      fi
-   ;;
-esac
--- a/cdist/conf/explorer/lsb_id
+++ b/cdist/conf/explorer/lsb_id
@ -1,34 +0,0 @@
-#!/bin/sh
-#
-# 2011 Steven Armstrong (steven-cdist at armstrong.cc)
-#
-# This file is part of cdist.
-#
-# cdist is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# cdist is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with cdist. If not, see <http://www.gnu.org/licenses/>.
-#
-#
-
-set +e
-case "$("$__explorer/os")" in
-   openwrt)
-      # shellcheck disable=SC1091
-      (. /etc/openwrt_release && echo "$DISTRIB_ID")
-   ;;
-   *)
-      lsb_release=$(command -v lsb_release)
-      if [ -x "$lsb_release" ]; then
-         $lsb_release --short --id
-      fi
-   ;;
-esac
--- a/cdist/conf/explorer/lsb_release
+++ b/cdist/conf/explorer/lsb_release
@ -1,34 +0,0 @@
-#!/bin/sh
-#
-# 2011 Steven Armstrong (steven-cdist at armstrong.cc)
-#
-# This file is part of cdist.
-#
-# cdist is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# cdist is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with cdist. If not, see <http://www.gnu.org/licenses/>.
-#
-#
-
-set +e
-case "$("$__explorer/os")" in
-   openwrt)
-      # shellcheck disable=SC1091
-      (. /etc/openwrt_release && echo "$DISTRIB_RELEASE")
-   ;;
-   *)
-      lsb_release=$(command -v lsb_release)
-      if [ -x "$lsb_release" ]; then
-         $lsb_release --short --release
-      fi
-   ;;
-esac
--- a/cdist/conf/explorer/machine_type
+++ b/cdist/conf/explorer/machine_type
@ -1,80 +0,0 @@
-#!/bin/sh
-#
-# 2014 Daniel Heule  (hda at sfs.biz)
-# 2014 Thomas Oettli (otho at sfs.biz)
-#
-# 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/>.
-#
-#
-
-# FIXME: other system types (not linux ...)
-
-if [ -d "/proc/vz" ] && [ ! -d "/proc/bc" ]; then
-    echo openvz
-    exit
-fi
-
-if [ -e "/proc/1/environ" ] &&
-    tr '\000' '\n' < "/proc/1/environ" | grep -Eiq '^container='; then
-    echo lxc
-    exit
-fi
-
-if [ -r /proc/cpuinfo ]; then
-    # this should only exist on virtual guest machines,
-    # tested on vmware, xen, kvm
-    if grep -q "hypervisor" /proc/cpuinfo; then
-        # this file is aviable in xen guest systems
-        if [ -r /sys/hypervisor/type ]; then
-            if grep -q -i "xen" /sys/hypervisor/type; then
-                echo virtual_by_xen
-                exit 
-            fi
-        else
-            if [ -r /sys/class/dmi/id/product_name ]; then
-                if grep -q -i 'vmware' /sys/class/dmi/id/product_name; then
-                    echo "virtual_by_vmware"
-                    exit
-                elif grep -q -i 'bochs' /sys/class/dmi/id/product_name; then
-                    echo "virtual_by_kvm"
-                    exit 
-                elif grep -q -i 'virtualbox' /sys/class/dmi/id/product_name; then
-                    echo "virtual_by_virtualbox"
-                    exit 
-                fi
-            fi
-
-            if [ -r /sys/class/dmi/id/sys_vendor ]; then
-                if grep -q -i 'qemu' /sys/class/dmi/id/sys_vendor; then
-                    echo "virtual_by_kvm"
-                    exit
-                fi
-            fi
-
-            if [ -r /sys/class/dmi/id/chassis_vendor ]; then
-                if grep -q -i 'qemu' /sys/class/dmi/id/chassis_vendor; then
-                    echo "virtual_by_kvm"
-                    exit
-                fi
-            fi                        
-        fi
-        echo "virtual_by_unknown"
-    else
-        echo "physical"
-    fi
-else
-    echo "unknown"
-fi
--- a/cdist/conf/explorer/memory
+++ b/cdist/conf/explorer/memory
@ -1,41 +0,0 @@
-#!/bin/sh
-#
-# 2014 Daniel Heule  (hda at sfs.biz)
-# 2014 Thomas Oettli (otho at sfs.biz)
-# Copyright 2017, Philippe Gregoire <pg@pgregoire.xyz>
-#
-# 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/>.
-#
-#
-
-# FIXME: other system types (not linux ...)
-
-os=$("$__explorer/os")
-case "$os" in
-    "macosx")
-        echo "$(sysctl -n hw.memsize)/1024" | bc
-    ;;
-
-    "openbsd")
-        echo "$(sysctl -n hw.physmem) / 1048576" | bc
-    ;;
-
-    *)
-    if [ -r /proc/meminfo ]; then
-        grep "MemTotal:" /proc/meminfo | awk '{print $2}'
-    fi
-    ;;
-esac
--- a/cdist/conf/explorer/os
+++ b/cdist/conf/explorer/os
@ -1,153 +0,0 @@
-#!/bin/sh
-#
-# 2010-2011 Nico Schottelius (nico-cdist at schottelius.org)
-# Copyright 2017, Philippe Gregoire <pg@pgregoire.xyz>
-#
-# 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/>.
-#
-#
-# All os variables are lower case.  Keep this file in alphabetical
-# order by os variable except in cases where order otherwise matters,
-# in which case keep the primary os and its derivatives together in
-# a block (see Debian and Redhat examples below).
-#
-
-if grep -q ^Amazon /etc/system-release 2>/dev/null; then
-   echo amazon
-   exit 0
-fi
-
-if [ -f /etc/arch-release ]; then
-   echo archlinux
-   exit 0
-fi
-
-if [ -f /etc/cdist-preos ]; then
-   echo cdist-preos
-   exit 0
-fi
-
-if [ -d /gnu/store ]; then
-   echo guixsd
-   exit 0
-fi
-
-### Debian and derivatives
-if grep -q ^DISTRIB_ID=Ubuntu /etc/lsb-release 2>/dev/null; then
-   echo ubuntu
-   exit 0
-fi
-
-# devuan ascii has both devuan_version and debian_version, so we need to check devuan_version first!
-if [ -f /etc/devuan_version ]; then
-   echo devuan
-   exit 0
-fi
-
-if [ -f /etc/debian_version ]; then
-   echo debian
-   exit 0
-fi
-
-###
-
-if [ -f /etc/gentoo-release ]; then
-   echo gentoo
-   exit 0
-fi
-
-if [ -f /etc/openwrt_version ]; then
-    echo openwrt
-    exit 0
-fi
-
-if [ -f /etc/owl-release ]; then
-   echo owl
-   exit 0
-fi
-
-### Redhat and derivatives
-if grep -q ^Scientific /etc/redhat-release 2>/dev/null; then
-    echo scientific
-    exit 0
-fi
-
-if grep -q ^CentOS /etc/redhat-release 2>/dev/null; then
-    echo centos
-    exit 0
-fi
-
-if grep -q ^Fedora /etc/redhat-release 2>/dev/null; then
-   echo fedora
-   exit 0
-fi
-
-if grep -q ^Mitel /etc/redhat-release 2>/dev/null; then
-   echo mitel
-   exit 0
-fi
-
-if [ -f /etc/redhat-release ]; then
-   echo redhat
-   exit 0
-fi
-###
-
-if [ -f /etc/SuSE-release ]; then
-   echo suse
-   exit 0
-fi
-
-if [ -f /etc/slackware-version ]; then
-   echo slackware
-   exit 0
-fi
-
-uname_s="$(uname -s)"
-
-# Assume there is no tr on the client -> do lower case ourselves
-case "$uname_s" in
-   Darwin)
-      echo macosx
-      exit 0
-   ;;
-   NetBSD)
-      echo netbsd
-      exit 0
-   ;;
-   FreeBSD)
-      echo freebsd
-      exit 0
-   ;;
-   OpenBSD)
-      echo openbsd
-      exit 0
-   ;;
-   SunOS)
-      echo solaris
-      exit 0
-   ;;
-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
-   exit 0
-fi
-
-echo "Unknown OS" >&2
-exit 1
--- a/cdist/conf/explorer/os_release
+++ b/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
--- a/cdist/conf/explorer/os_version
+++ b/cdist/conf/explorer/os_version
@ -1,73 +0,0 @@
-#!/bin/sh
-#
-# 2010-2011 Nico Schottelius (nico-cdist at schottelius.org)
-#
-# This file is part of cdist.
-#
-# cdist is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# cdist is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with cdist. If not, see <http://www.gnu.org/licenses/>.
-#
-#
-# All os variables are lower case
-#
-#
-
-case "$("$__explorer/os")" in
-   amazon)
-      cat /etc/system-release
-   ;;
-   archlinux)
-      # empty, but well...
-      cat /etc/arch-release
-   ;;
-   debian)
-      cat /etc/debian_version
-   ;;
-   devuan)
-      cat /etc/devuan_version
-   ;;
-   fedora)
-      cat /etc/fedora-release
-   ;;
-   gentoo)
-      cat /etc/gentoo-release
-   ;;
-   macosx)
-      sw_vers -productVersion
-   ;;
-   *bsd|solaris)
-      uname -r
-   ;;
-   openwrt)
-      cat /etc/openwrt_version
-   ;;
-   owl)
-      cat /etc/owl-release
-   ;;
-   redhat|centos|mitel|scientific)
-      cat /etc/redhat-release
-   ;;
-   slackware)
-      cat /etc/slackware-version
-   ;;
-   suse)
-      if [ -f /etc/os-release ]; then
-        cat /etc/os-release
-      else
-        cat /etc/SuSE-release
-      fi
-   ;;
-   ubuntu)
-      lsb_release -sr
-   ;;
-esac
--- a/cdist/conf/explorer/runlevel
+++ b/cdist/conf/explorer/runlevel
@ -1,26 +0,0 @@
-#!/bin/sh
-#
-# 2012 Nico Schottelius (nico-cdist at schottelius.org)
-#
-# This file is part of cdist.
-#
-# cdist is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# cdist is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with cdist. If not, see <http://www.gnu.org/licenses/>.
-#
-#
-
-set +e
-executable=$(command -v runlevel)
-if [ -x "$executable" ]; then
-   "$executable" | awk '{ print $2 }'
-fi
--- a/cdist/conf/manifest/sample-from-distribution
+++ b/cdist/conf/manifest/sample-from-distribution
@ -1,62 +0,0 @@
-## #
-## # Sample manifest from cdist distribution
-## #
-## 
-## # Every machine becomes a marker, so sysadmins know that automatic
-## # configurations are happening
-## __file /etc/cdist-configured
-## __cdistmarker
-## 
-## case "$__target_host" in
-##    # Everybody has this
-##    localhost)
-##       require="__file/etc/cdist-configured" __link /tmp/cdist-testfile \
-##          --source /etc/cdist-configured  --type symbolic
-##       require="__directory/tmp/cdist-test-dir" __file /tmp/cdist-test-dir/test-file \
-##          --mode 0750 --owner nobody --group root
-##       __directory /tmp/cdist-test-dir --mode 4777
-## 
-##       require="__file/etc/cdist-configured __link/tmp/cdist-testfile" \
-##          __file /tmp/cdist-another-testfile
-## 
-##    ;;
-## 
-##    #
-##    # Use an alias in /etc/hosts for localhost to use these hosts:
-##    # 
-##    # 127.0.0.1    localhost.localdomain   localhost cdist-archlinux
-##    #
-##    cdist-archlinux)
-##       # This is the specific package type for pacman
-##       __package_pacman zsh --state installed
-##       
-##       # The __package type autoselect the right type based on the os
-##       __package vim --state installed
-## 
-##       # If the type is a singleton, it does not take an object id
-##       __issue
-##    ;;
-##    # This is how it would look like on gentoo
-##    cdist-gentoo)
-##       # Same stuff for gentoo
-##       __package tree --state installed
-##    ;;
-## 
-##    cdist-debian)
-##       __package_apt atop --state installed
-##       __package apache2 --state removed
-##    ;;
-## 
-##    cdist-redhat)
-##       __issue
-##       __motd
-##    ;;
-## 
-##    # Real machines may be used with their hostname or fqdn,
-##    # depending on how you call cdist
-##    # ...
-##    # ;;
-##    # machine.example.org)
-##    # ...
-##    # ;;
-## esac
--- a/cdist/conf/type/__acl/explorer/acl_is
+++ b/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
--- a/cdist/conf/type/__acl/explorer/checks
+++ b/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
--- a/cdist/conf/type/__acl/explorer/file_is
+++ b/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
--- a/cdist/conf/type/__acl/gencode-remote
+++ b/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
--- a/cdist/conf/type/__acl/man.rst
+++ b/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.
--- a/cdist/conf/type/__acl/parameter/boolean
+++ b/cdist/conf/type/__acl/parameter/boolean
@ -1,3 +0,0 @@
-recursive
-default
-remove
--- a/cdist/conf/type/__acl/parameter/deprecated/group
+++ b/cdist/conf/type/__acl/parameter/deprecated/group
@ -1 +0,0 @@
-see manual for details
--- a/cdist/conf/type/__acl/parameter/deprecated/mask
+++ b/cdist/conf/type/__acl/parameter/deprecated/mask
@ -1 +0,0 @@
-see manual for details
--- a/cdist/conf/type/__acl/parameter/deprecated/other
+++ b/cdist/conf/type/__acl/parameter/deprecated/other
@ -1 +0,0 @@
-see manual for details
--- a/cdist/conf/type/__acl/parameter/deprecated/user
+++ b/cdist/conf/type/__acl/parameter/deprecated/user
@ -1 +0,0 @@
-see manual for details
--- a/cdist/conf/type/__acl/parameter/optional
+++ b/cdist/conf/type/__acl/parameter/optional
@ -1,2 +0,0 @@
-mask
-other
--- a/cdist/conf/type/__acl/parameter/optional_multiple
+++ b/cdist/conf/type/__acl/parameter/optional_multiple
@ -1,3 +0,0 @@
-acl
-user
-group
--- a/cdist/conf/type/__apt_default_release/man.rst
+++ b/cdist/conf/type/__apt_default_release/man.rst
@ -1,46 +0,0 @@
-cdist-type__apt_default_release(7)
-==================================
-
-NAME
----
-cdist-type__apt_default_release - Configure the default release for apt
-
-
-DESCRIPTION
-----------
-Configure the default release for apt, using the APT::Default-Release
-configuration value.
-
-REQUIRED PARAMETERS
-------------------
-release
-   The value to set APT::Default-Release to.
-
-   This can contain release name, codename or release version. Examples:
-   'stable', 'testing', 'unstable', 'stretch', 'buster', '4.0', '5.0*'.
-
-
-OPTIONAL PARAMETERS
-------------------
-None.
-
-
-EXAMPLES
--------
-
-.. code-block:: sh
-
-    __apt_default_release --release stretch
-
-
-AUTHORS
-------
-Matthijs Kooijman <matthijs--@--stdin.nl>
-
-
-COPYING
-------
-Copyright \(C) 2017 Matthijs Kooijman. 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.
--- a/cdist/conf/type/__apt_default_release/manifest
+++ b/cdist/conf/type/__apt_default_release/manifest
@ -1,41 +0,0 @@
-#!/bin/sh -e
-#
-# 2014 Steven Armstrong (steven-cdist at armstrong.cc)
-# 2017 Matthijs Kooijman (matthijs at stdin.nl)
-#
-# This file is part of cdist.
-#
-# cdist is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# cdist is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with cdist. If not, see <http://www.gnu.org/licenses/>.
-#
-
-
-os=$(cat "$__global/explorer/os")
-release="$(cat "$__object/parameter/release")"
-
-case "$os" in
-   ubuntu|debian|devuan)
-      __file /etc/apt/apt.conf.d/99-default-release \
-         --owner root --group root --mode 644 \
-         --source - << DONE
-APT::Default-Release "$release";
-DONE
-   ;;
-   *)
-      cat >&2 << DONE
-The developer of this type (${__type##*/}) did not think your operating system
-($os) would have any use for it. If you think otherwise please submit a patch.
-DONE
-      exit 1
-   ;;
-esac
--- a/cdist/conf/type/__apt_default_release/parameter/required
+++ b/cdist/conf/type/__apt_default_release/parameter/required
@ -1 +0,0 @@
-release
--- a/cdist/conf/type/__apt_key/explorer/state
+++ b/cdist/conf/type/__apt_key/explorer/state
@ -1,44 +0,0 @@
-#!/bin/sh
-#
-# 2011-2014 Steven Armstrong (steven-cdist at armstrong.cc)
-#
-# This file is part of cdist.
-#
-# cdist is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# cdist is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with cdist. If not, see <http://www.gnu.org/licenses/>.
-#
-#
-# Get the current state of the apt key.
-#
-
-if [ -f "$__object/parameter/keyid" ]; then
-   keyid="$(cat "$__object/parameter/keyid")"
-else
-   keyid="$__object_id"
-fi
-
-keydir="$(cat "$__object/parameter/keydir")"
-keyfile="$keydir/$__object_id.gpg"
-
-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
--- a/cdist/conf/type/__apt_key/gencode-remote
+++ b/cdist/conf/type/__apt_key/gencode-remote
@ -1,114 +0,0 @@
-#!/bin/sh -e
-#
-# 2011-2014 Steven Armstrong (steven-cdist at armstrong.cc)
-#
-# This file is part of cdist.
-#
-# cdist is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# cdist is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with cdist. If not, see <http://www.gnu.org/licenses/>.
-#
-
-if [ -f "$__object/parameter/keyid" ]; then
-   keyid="$(cat "$__object/parameter/keyid")"
-else
-   keyid="$__object_id"
-fi
-state_should="$(cat "$__object/parameter/state")"
-state_is="$(cat "$__object/explorer/state")"
-
-if [ "$state_should" = "$state_is" ]; then
-   # nothing to do
-   exit 0
-fi
-
-keydir="$(cat "$__object/parameter/keydir")"
-keyfile="$keydir/$__object_id.gpg"
-
-case "$state_should" in
-   present)
-      keyserver="$(cat "$__object/parameter/keyserver")"
-
-      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 "rm '$keyfile'"
-      else
-         # fallback to deprecated apt-key
-         echo "apt-key del \"$keyid\""
-      fi
-
-      echo "removed '$keyid'" >> "$__messages_out"
-   ;;
-esac
--- a/cdist/conf/type/__apt_key/man.rst
+++ b/cdist/conf/type/__apt_key/man.rst
@ -1,72 +0,0 @@
-cdist-type__apt_key(7)
-======================
-
-NAME
----
-cdist-type__apt_key - Manage the list of keys used by apt
-
-
-DESCRIPTION
-----------
-Manages the list of keys used by apt to authenticate packages.
-
-
-REQUIRED PARAMETERS
-------------------
-None.
-
-
-OPTIONAL PARAMETERS
-------------------
-state
-   'present' or 'absent'. Defaults to 'present'
-
-keyid
-   the id of the key to add. Defaults to __object_id
-
-keyserver
-   the keyserver from which to fetch the key. If omitted 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
--------
-
-.. code-block:: sh
-
-    # Add Ubuntu Archive Automatic Signing Key
-    __apt_key 437D05B5
-    # Same thing
-    __apt_key 437D05B5 --state present
-    # Get rid of it
-    __apt_key 437D05B5 --state absent
-
-    # same thing with human readable name and explicit keyid
-    __apt_key UbuntuArchiveKey --keyid 437D05B5
-
-    # same thing with other keyserver
-    __apt_key UbuntuArchiveKey --keyid 437D05B5 --keyserver keyserver.ubuntu.com
-
-    # 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
-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.
--- a/cdist/conf/type/__apt_key/manifest
+++ b/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
--- a/cdist/conf/type/__apt_key/parameter/default/keydir
+++ b/cdist/conf/type/__apt_key/parameter/default/keydir
@ -1 +0,0 @@
-/etc/apt/trusted.gpg.d
--- a/cdist/conf/type/__apt_key/parameter/default/keyserver
+++ b/cdist/conf/type/__apt_key/parameter/default/keyserver
@ -1 +0,0 @@
-pool.sks-keyservers.net
--- a/cdist/conf/type/__apt_key/parameter/default/state
+++ b/cdist/conf/type/__apt_key/parameter/default/state
@ -1 +0,0 @@
-present
--- a/cdist/conf/type/__apt_key/parameter/optional
+++ b/cdist/conf/type/__apt_key/parameter/optional
@ -1,5 +0,0 @@
-state
-keyid
-keyserver
-keydir
-uri
--- a/cdist/conf/type/__apt_key_uri/gencode-remote
+++ b/cdist/conf/type/__apt_key_uri/gencode-remote
@ -1,45 +0,0 @@
-#!/bin/sh -e
-#
-# 2011-2014 Steven Armstrong (steven-cdist at armstrong.cc)
-#
-# This file is part of cdist.
-#
-# cdist is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# cdist is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with cdist. If not, see <http://www.gnu.org/licenses/>.
-#
-
-if [ -f "$__object/parameter/name" ]; then
-   name="$(cat "$__object/parameter/name")"
-else
-   name="$__object_id"
-fi
-state_should="$(cat "$__object/parameter/state")"
-state_is="$(cat "$__object/explorer/state")"
-
-if [ "$state_should" = "$state_is" ]; then
-   # nothing to do
-   exit 0
-fi
-
-case "$state_should" in
-   present)
-      uri="$(cat "$__object/parameter/uri")"
-      printf 'curl -s -L "%s" | apt-key add -\n' "$uri"
-   ;;
-   absent)
-      cat << DONE
-keyid=\$(apt-key list | grep -B1 "$name" | awk '/pub/ { print \$2 }' | cut -d'/' -f 2)
-apt-key del \$keyid
-DONE
-   ;;
-esac
--- a/cdist/conf/type/__apt_key_uri/man.rst
+++ b/cdist/conf/type/__apt_key_uri/man.rst
@ -1,51 +0,0 @@
-cdist-type__apt_key_uri(7)
-==========================
-
-NAME
----
-cdist-type__apt_key_uri - Add apt key from uri
-
-
-DESCRIPTION
-----------
-Download a key from an uri and add it to the apt keyring.
-
-
-REQUIRED PARAMETERS
-------------------
-uri
-   the uri from which to download the key
-
-
-OPTIONAL PARAMETERS
-------------------
-state
-   'present' or 'absent', defaults to 'present'
-
-name
-   a name for this key, used when testing if it is already installed.
-   Defaults to __object_id
-
-
-EXAMPLES
--------
-
-.. code-block:: sh
-
-    __apt_key_uri rabbitmq \
-       --name 'RabbitMQ Release Signing Key <info@rabbitmq.com>' \
-       --uri http://www.rabbitmq.com/rabbitmq-signing-key-public.asc \
-       --state present
-
-
-AUTHORS
-------
-Steven Armstrong <steven-cdist--@--armstrong.cc>
-
-
-COPYING
-------
-Copyright \(C) 2011-2014 Steven Armstrong. 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.
--- a/cdist/conf/type/__apt_key_uri/manifest
+++ b/cdist/conf/type/__apt_key_uri/manifest
@ -1,21 +0,0 @@
-#!/bin/sh -e
-#
-# 2013-2014 Steven Armstrong (steven-cdist at armstrong.cc)
-#
-# This file is part of cdist.
-#
-# cdist is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# cdist is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with cdist. If not, see <http://www.gnu.org/licenses/>.
-#
-
-__package curl
--- a/cdist/conf/type/__apt_key_uri/parameter/default/state
+++ b/cdist/conf/type/__apt_key_uri/parameter/default/state
@ -1 +0,0 @@
-present
--- a/cdist/conf/type/__apt_key_uri/parameter/optional
+++ b/cdist/conf/type/__apt_key_uri/parameter/optional
@ -1,2 +0,0 @@
-state
-name
--- a/cdist/conf/type/__apt_key_uri/parameter/required
+++ b/cdist/conf/type/__apt_key_uri/parameter/required
@ -1 +0,0 @@
-uri
--- a/cdist/conf/type/__apt_mark/explorer/apt_version
+++ b/cdist/conf/type/__apt_mark/explorer/apt_version
@ -1,31 +0,0 @@
-#!/bin/sh -e
-#
-# 2016 Ander Punnar (cdist at kvlt.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/>.
-#
-
-apt_version_is=$(dpkg-query --show --showformat '${Version}' apt)
-
-# from APT changelog:
-#   apt (0.8.14.2) UNRELEASED; urgency=low
-#   provide a 'dpkg --set-selections' wrapper to set/release holds
-
-apt_version_should=0.8.14.2
-
-dpkg --compare-versions "$apt_version_should" le "$apt_version_is" \
-    && echo 0 \
-    || echo 1
--- a/cdist/conf/type/__apt_mark/explorer/package_installed
+++ b/cdist/conf/type/__apt_mark/explorer/package_installed
@ -1,30 +0,0 @@
-#!/bin/sh -e
-#
-# 2016 Ander Punnar (cdist at kvlt.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 [ -f "$__object/parameter/name" ]; then
-    name="$(cat "$__object/parameter/name")"
-else
-    name="$__object_id"
-fi
-
-dpkg-query --show --showformat '${Status}' "$name" 2>/dev/null \
-    | grep -Fq 'ok installed' \
-    && echo 0 \
-    || echo 1
--- a/cdist/conf/type/__apt_mark/explorer/state
+++ b/cdist/conf/type/__apt_mark/explorer/state
@ -1,27 +0,0 @@
-#!/bin/sh -e
-#
-# 2016 Ander Punnar (cdist at kvlt.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 [ -f "$__object/parameter/name" ]; then
-    name="$(cat "$__object/parameter/name")"
-else
-    name="$__object_id"
-fi
-
-apt-mark showhold | grep -Fq "$name" && echo hold || echo unhold
--- a/cdist/conf/type/__apt_mark/gencode-remote
+++ b/cdist/conf/type/__apt_mark/gencode-remote
@ -1,56 +0,0 @@
-#!/bin/sh -e
-#
-# 2016 Ander Punnar (cdist at kvlt.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 [ -f "$__object/parameter/name" ]; then
-    name="$(cat "$__object/parameter/name")"
-else
-    name="$__object_id"
-fi
-
-apt_version="$(cat "$__object/explorer/apt_version")"
-
-if [ "$apt_version" != '0' ]; then
-    echo 'APT version not supported' >&2
-    exit 1
-fi
-
-package_installed="$(cat "$__object/explorer/package_installed")"
-
-if [ "$package_installed" != '0' ]; then
-    exit 0
-fi
-
-state_should="$(cat "$__object/parameter/state")"
-
-state_is="$(cat "$__object/explorer/state")"
-
-if [ "$state_should" = "$state_is" ]; then
-    exit 0
-fi
-
-case "$state_should" in
-    hold|unhold)
-        echo "apt-mark $state_should $name > /dev/null"
-    ;;
-    *)
-        echo "Unknown state: $state_should" >&2
-        exit 1
-    ;;
-esac
--- a/cdist/conf/type/__apt_mark/man.rst
+++ b/cdist/conf/type/__apt_mark/man.rst
@ -1,47 +0,0 @@
-cdist-type__apt_mark(7)
-=======================
-
-NAME
----
-cdist-type__apt_mark - set package state as 'hold' or 'unhold'
-
-
-DESCRIPTION
-----------
-See apt-mark(8) for details.
-
-
-REQUIRED PARAMETERS
-------------------
-state
-   Either "hold" or "unhold".
-
-
-OPTIONAL PARAMETERS
-------------------
-name
-   If supplied, use the name and not the object id as the package name.
-
-
-EXAMPLES
--------
-
-.. code-block:: sh
-
-    # hold package
-    __apt_mark quagga --state hold
-    # unhold package
-    __apt_mark quagga --state unhold
-
-
-AUTHORS
-------
-Ander Punnar <cdist--@--kvlt.ee>
-
-
-COPYING
-------
-Copyright \(C) 2016 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.
--- a/cdist/conf/type/__apt_norecommends/man.rst
+++ b/cdist/conf/type/__apt_norecommends/man.rst
@ -1,42 +0,0 @@
-cdist-type__apt_norecommends(7)
-===============================
-
-NAME
----
-cdist-type__apt_norecommends - Configure apt to not install recommended packages
-
-
-DESCRIPTION
-----------
-Configure apt to not install any recommended or suggested packages.
-
-
-REQUIRED PARAMETERS
-------------------
-None.
-
-
-OPTIONAL PARAMETERS
-------------------
-None.
-
-
-EXAMPLES
--------
-
-.. code-block:: sh
-
-    __apt_norecommends
-
-
-AUTHORS
-------
-Steven Armstrong <steven-cdist--@--armstrong.cc>
-
-
-COPYING
-------
-Copyright \(C) 2014 Steven Armstrong. 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.
--- a/cdist/conf/type/__apt_norecommends/manifest
+++ b/cdist/conf/type/__apt_norecommends/manifest
@ -1,44 +0,0 @@
-#!/bin/sh -e
-#
-# 2014 Steven Armstrong (steven-cdist at armstrong.cc)
-#
-# This file is part of cdist.
-#
-# cdist is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# cdist is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with cdist. If not, see <http://www.gnu.org/licenses/>.
-#
-
-
-os=$(cat "$__global/explorer/os")
-
-case "$os" in
-   ubuntu|debian|devuan)
-      # No stinking recommends thank you very much.
-      # If I want something installed I will do so myself.
-      __file /etc/apt/apt.conf.d/99-no-recommends \
-         --owner root --group root --mode 644 \
-         --source - << DONE
-APT::Install-Recommends "0";
-APT::Install-Suggests "0";
-APT::AutoRemove::RecommendsImportant "0";
-APT::AutoRemove::SuggestsImportant "0";
-DONE
-   ;;
-   *)
-      cat >&2 << DONE
-The developer of this type (${__type##*/}) did not think your operating system
-($os) would have any use for it. If you think otherwise please submit a patch.
-DONE
-      exit 1
-   ;;
-esac
--- a/cdist/conf/type/__apt_ppa/explorer/state
+++ b/cdist/conf/type/__apt_ppa/explorer/state
@ -1,34 +0,0 @@
-#!/bin/sh
-#
-# 2011 Steven Armstrong (steven-cdist at armstrong.cc)
-#
-# This file is part of cdist.
-#
-# cdist is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# cdist is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with cdist. If not, see <http://www.gnu.org/licenses/>.
-#
-#
-# Get the current state of the ppa.
-#
-
-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"
-
-[ -s "/etc/apt/sources.list.d/${repo_file_name}" ] \
-   && echo present || echo absent
-
--- a/cdist/conf/type/__apt_ppa/files/remove-apt-repository
+++ b/cdist/conf/type/__apt_ppa/files/remove-apt-repository
@ -1,55 +0,0 @@
-#!/usr/bin/env python
-#
-# Remove the given apt repository.
-#
-# Exit with:
-#   0: if it worked
-#   1: if not
-#   2: on other error
-
-import os
-import sys
-from aptsources import distro, sourceslist
-from softwareproperties import ppa
-from softwareproperties.SoftwareProperties import SoftwareProperties
-
-
-def remove_if_empty(file_name):
-    with open(file_name, 'r') as f:
-        if f.read().strip():
-            return
-        os.unlink(file_name)
-
-def remove_repository(repository):
-    #print 'repository:', repository
-    codename = distro.get_distro().codename
-    #print 'codename:', codename
-    (line, file) = ppa.expand_ppa_line(repository.strip(), codename)
-    #print 'line:', line
-    #print 'file:', file
-    deb_source_entry = sourceslist.SourceEntry(line, file)
-    src_source_entry = sourceslist.SourceEntry('deb-src{}'.format(line[3:]), file)
-
-    try:
-        sp = SoftwareProperties()
-        sp.remove_source(deb_source_entry)
-        try:
-            # If there's a deb-src entry, remove that too
-            sp.remove_source(src_source_entry)
-        except:
-            pass
-        remove_if_empty(file)
-        return True
-    except ValueError:
-        print >> sys.stderr, "Error: '%s' doesn't exists in a sourcelist file" % line
-        return False
-
-if __name__ == '__main__':
-    if (len(sys.argv) != 2):
-        print >> sys.stderr, 'Error: need a repository as argument'
-        sys.exit(2)
-    repository = sys.argv[1]
-    if remove_repository(repository):
-        sys.exit(0)
-    else:
-        sys.exit(1)
--- a/cdist/conf/type/__apt_ppa/gencode-remote
+++ b/cdist/conf/type/__apt_ppa/gencode-remote
@ -1,37 +0,0 @@
-#!/bin/sh -e
-#
-# 2011 Steven Armstrong (steven-cdist at armstrong.cc)
-#
-# This file is part of cdist.
-#
-# cdist is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# cdist is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with cdist. If not, see <http://www.gnu.org/licenses/>.
-#
-
-name="$__object_id"
-state_should="$(cat "$__object/parameter/state")"
-state_is="$(cat "$__object/explorer/state")"
-
-if [ "$state_should" = "$state_is" ]; then
-   # Nothing to do, move along
-   exit 0
-fi
-
-case "$state_should" in
-   present)
-      echo "add-apt-repository '$name'"
-   ;;
-   absent)
-      echo "remove-apt-repository '$name'"
-   ;;
-esac
--- a/cdist/conf/type/__apt_ppa/man.rst
+++ b/cdist/conf/type/__apt_ppa/man.rst
@ -1,50 +0,0 @@
-cdist-type__apt_ppa(7)
-======================
-
-NAME
----
-cdist-type__apt_ppa - Manage ppa repositories
-
-
-DESCRIPTION
-----------
-This cdist type allows manage ubuntu ppa repositories.
-
-
-REQUIRED PARAMETERS
-------------------
-state
-   The state the ppa should be in, either 'present' or 'absent'.
-   Defaults to 'present'
-
-
-OPTIONAL PARAMETERS
-------------------
-None.
-
-
-EXAMPLES
--------
-
-.. code-block:: sh
-
-    # Enable a ppa repository
-    __apt_ppa ppa:sans-intern/missing-bits
-    # same as
-    __apt_ppa ppa:sans-intern/missing-bits --state present
-
-    # Disable a ppa repository
-    __apt_ppa ppa:sans-intern/missing-bits --state absent
-
-
-AUTHORS
-------
-Steven Armstrong <steven-cdist--@--armstrong.cc>
-
-
-COPYING
-------
-Copyright \(C) 2011-2014 Steven Armstrong. 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.
--- a/cdist/conf/type/__apt_ppa/manifest
+++ b/cdist/conf/type/__apt_ppa/manifest
@ -1,28 +0,0 @@
-#!/bin/sh -e
-#
-# 2011-2016 Steven Armstrong (steven-cdist at armstrong.cc)
-#
-# This file is part of cdist.
-#
-# cdist is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# cdist is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with cdist. If not, see <http://www.gnu.org/licenses/>.
-#
-
-__package software-properties-common
-
-require="__package/software-properties-common" \
-   __file /usr/local/bin/remove-apt-repository \
-   --source "$__type/files/remove-apt-repository" \
-   --mode 0755
-
-require="$__object_name" __apt_update_index
--- a/cdist/conf/type/__apt_ppa/parameter/default/state
+++ b/cdist/conf/type/__apt_ppa/parameter/default/state
@ -1 +0,0 @@
-present
--- a/cdist/conf/type/__apt_source/files/source.list.template
+++ b/cdist/conf/type/__apt_source/files/source.list.template
@ -1,15 +0,0 @@
-#!/bin/sh
-set -u
-
-entry="$uri $distribution $component"
-cat << DONE
-# Created by cdist ${__type##*/}
-# Do not change. Changes will be overwritten.
-#
-
-# $name
-deb ${forcedarch} $entry
-DONE
-if [ -f "$__object/parameter/include-src" ]; then
-   echo "deb-src $entry"
-fi
--- a/cdist/conf/type/__apt_source/gencode-remote
+++ b/cdist/conf/type/__apt_source/gencode-remote
@ -1,28 +0,0 @@
-#!/bin/sh -e
-#
-# 2018 Steven Armstrong (steven-cdist at armstrong.cc)
-#
-# This file is part of cdist.
-#
-# cdist is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# cdist is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with cdist. If not, see <http://www.gnu.org/licenses/>.
-#
-#
-
-name="$__object_id"
-destination="/etc/apt/sources.list.d/${name}.list"
-
-if grep -q "^__file${destination}" "$__messages_in"; then
-   printf 'apt-get update || apt-get update\n'
-fi
-
--- a/cdist/conf/type/__apt_source/man.rst
+++ b/cdist/conf/type/__apt_source/man.rst
@ -1,70 +0,0 @@
-cdist-type__apt_source(7)
-=========================
-
-NAME
----
-cdist-type__apt_source - Manage apt sources
-
-
-DESCRIPTION
-----------
-This cdist type allows you to manage apt sources. It invokes index update
-internally when needed so call of index updating type is not needed.
-
-
-REQUIRED PARAMETERS
-------------------
-uri
-   the uri to the apt repository
-
-
-OPTIONAL PARAMETERS
-------------------
-arch
-   set this if you need to force and specific arch (ubuntu specific)
-
-state
-   'present' or 'absent', defaults to 'present'
-
-distribution
-   the distribution codename to use. Defaults to DISTRIB_CODENAME from
-   the targets /etc/lsb-release
-
-component
-   space delimited list of components to enable. Defaults to an empty string.
-
-
-BOOLEAN PARAMETERS
------------------
-include-src
-   include deb-src entries
-
-
-EXAMPLES
--------
-
-.. code-block:: sh
-
-    __apt_source rabbitmq \
-       --uri http://www.rabbitmq.com/debian/ \
-       --distribution testing \
-       --component main \
-       --include-src \
-       --state present
-
-    __apt_source canonical_partner \
-       --uri http://archive.canonical.com/ \
-       --component partner --state present
-
-
-AUTHORS
-------
-Steven Armstrong <steven-cdist--@--armstrong.cc>
-
-
-COPYING
-------
-Copyright \(C) 2011-2018 Steven Armstrong. 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.
--- a/cdist/conf/type/__apt_source/manifest
+++ b/cdist/conf/type/__apt_source/manifest
@ -1,52 +0,0 @@
-#!/bin/sh -e
-#
-# 2011-2018 Steven Armstrong (steven-cdist at armstrong.cc)
-#
-# This file is part of cdist.
-#
-# cdist is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# cdist is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with cdist. If not, see <http://www.gnu.org/licenses/>.
-#
-
-name="$__object_id"
-state="$(cat "$__object/parameter/state")"
-uri="$(cat "$__object/parameter/uri")"
-
-if [ -f "$__object/parameter/distribution" ]; then
-   distribution="$(cat "$__object/parameter/distribution")"
-else
-   distribution="$(cat "$__global/explorer/lsb_codename")"
-fi
-
-component="$(cat "$__object/parameter/component")"
-
-if [ -f "$__object/parameter/arch" ]; then
-   forcedarch="[arch=$(cat "$__object/parameter/arch")]"
-else
-   forcedarch=""
-fi
-
-# export variables for use in template
-export name
-export uri
-export distribution
-export component
-export forcedarch
-
-# generate file from template
-mkdir "$__object/files"
-"$__type/files/source.list.template" > "$__object/files/source.list"
-__file "/etc/apt/sources.list.d/${name}.list" \
-   --source "$__object/files/source.list" \
-   --owner root --group root --mode 0644 \
-   --state "$state"
--- a/cdist/conf/type/__apt_source/parameter/boolean
+++ b/cdist/conf/type/__apt_source/parameter/boolean
@ -1 +0,0 @@
-include-src
--- a/cdist/conf/type/__apt_source/parameter/default/component
+++ b/cdist/conf/type/__apt_source/parameter/default/component
--- a/cdist/conf/type/__apt_source/parameter/default/state
+++ b/cdist/conf/type/__apt_source/parameter/default/state
@ -1 +0,0 @@
-present
--- a/Show more
+++ b/Show more