593 changed files with 3258 additions and 21056 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,22 +1,5 @@
 # -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
@ -24,8 +7,6 @@ docs/src/man1/*.1
 docs/src/man7/*.7
 docs/src/man7/cdist-type__*.rst
 docs/src/cdist-reference.rst
-docs/src/cdist-types.rst
-docs/src/cdist.cfg.skeleton

 # Ignore cdist cache for version control
 /cache/
@ -36,7 +17,7 @@ cdist/inventory/
 # Python: cache, distutils, distribution in general
 __pycache__/
 *.pyc
-/MANIFEST
+MANIFEST
 dist/
 cdist/version.py
 cdist.egg-info/
@ -46,7 +27,6 @@ _build/
 docs/dist

 # Ignore temp files used for signing
-cdist-*.tar
 cdist-*.tar.gz
 cdist-*.tar.gz.asc

--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -1,18 +0,0 @@
-stages:
-    - test
-
-unit_tests:
-    stage: test
-    script:
-        - ./bin/build-helper version
-        - ./bin/build-helper test
-
-pycodestyle:
-    stage: test
-    script:
-        - ./bin/build-helper pycodestyle
-
-shellcheck:
-    stage: test
-    script:
-        - ./bin/build-helper shellcheck
--- a/674
+++ b/674
@ -1,674 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    cdist
-    Copyright (C) 2019  ungleich-public
-
-    This program 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.
-
-    This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    cdist  Copyright (C) 2019  ungleich-public
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
--- a/202
+++ b/202
@ -18,30 +18,31 @@
 #
 #

-.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"
+helper=./bin/build-helper

-DOCS_SRC_DIR=./docs/src
-SPEECHDIR=./docs/speeches
-TYPEDIR=./cdist/conf/type
+DOCS_SRC_DIR=docs/src
+SPEECHDIR=docs/speeches
+TYPEDIR=cdist/conf/type
+
+WEBSRCDIR=docs/web
+
+WEBDIR=$$HOME/vcs/www.nico.schottelius.org
+WEBBLOG=$(WEBDIR)/blog
+WEBBASE=$(WEBDIR)/software/cdist
+WEBPAGE=$(WEBBASE).mdwn
+
+CHANGELOG_VERSION=$(shell $(helper) changelog-version)
+CHANGELOG_FILE=docs/changelog
+
+PYTHON_VERSION=cdist/version.py

 SPHINXM=make -C $(DOCS_SRC_DIR) man
 SPHINXH=make -C $(DOCS_SRC_DIR) html
 SPHINXC=make -C $(DOCS_SRC_DIR) clean
-
 ################################################################################
 # Manpages
 #
+MAN1DSTDIR=$(DOCS_SRC_DIR)/man1
 MAN7DSTDIR=$(DOCS_SRC_DIR)/man7

 # Manpages #1: Types
@ -53,7 +54,6 @@ MANTYPES=$(subst /man.rst,.rst,$(MANTYPEPREFIX))

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

 # Manpages #2: reference
@ -63,28 +63,11 @@ DOCSREFSH=$(DOCS_SRC_DIR)/cdist-reference.rst.sh
 $(DOCSREF): $(DOCSREFSH)
 	$(DOCSREFSH)

-# Html types list with references
-DOCSTYPESREF=$(MAN7DSTDIR)/cdist-types.rst
-DOCSTYPESREFSH=$(DOCS_SRC_DIR)/cdist-types.rst.sh
-
-$(DOCSTYPESREF): $(DOCSTYPESREFSH)
-	$(DOCSTYPESREFSH)
-
-DOCSCFGSKEL=./configuration/cdist.cfg.skeleton
-
-configskel: $(DOCSCFGSKEL)
-	cp -f "$(DOCSCFGSKEL)" "$(DOCS_SRC_DIR)/"
-
-version:
-	@[ -f "cdist/version.py" ] || { \
-		printf "Missing 'cdist/version.py', please generate it first.\n" && exit 1; \
-	}
-
 # Manpages #3: generic part
-man: version $(MANTYPES) $(DOCSREF)
+man: $(MANTYPES) $(DOCSREF) $(PYTHON_VERSION)
 	$(SPHINXM)

-html: version configskel $(MANTYPES) $(DOCSREF) $(DOCSTYPESREF)
+html: $(MANTYPES) $(DOCSREF) $(PYTHON_VERSION)
 	$(SPHINXH)

 docs: man html
@ -92,6 +75,24 @@ docs: man html
 docs-clean:
 	$(SPHINXC)

+# Manpages #5: release part
+MANWEBDIR=$(WEBBASE)/man/$(CHANGELOG_VERSION)
+HTMLBUILDDIR=docs/dist/html
+
+docs-dist: html
+	rm -rf "${MANWEBDIR}"
+	mkdir -p "${MANWEBDIR}"
+	# mkdir -p "${MANWEBDIR}/man1" "${MANWEBDIR}/man7"
+	# cp ${MAN1DSTDIR}/*.html ${MAN1DSTDIR}/*.css ${MANWEBDIR}/man1
+	# cp ${MAN7DSTDIR}/*.html ${MAN7DSTDIR}/*.css ${MANWEBDIR}/man7
+	cp -R ${HTMLBUILDDIR}/* ${MANWEBDIR}
+	cd ${MANWEBDIR} && git add . && git commit -m "cdist manpages update: $(CHANGELOG_VERSION)" || true
+
+man-latest-link: web-pub
+	# Fix ikiwiki, which does not like symlinks for pseudo security
+	ssh staticweb.ungleich.ch \
+		"cd /home/services/www/nico/nico.schottelius.org/www/software/cdist/man/ && rm -f latest && ln -sf "$(CHANGELOG_VERSION)" latest"
+
 # Manpages: .cdist Types
 DOT_CDIST_PATH=${HOME}/.cdist
 DOTMAN7DSTDIR=$(MAN7DSTDIR)
@ -104,7 +105,8 @@ DOTMANTYPES=$(subst /man.rst,.rst,$(DOTMANTYPEPREFIX))
 $(DOTMAN7DSTDIR)/cdist-type%.rst: $(DOTTYPEDIR)/%/man.rst
 	ln -sf "$^" $@

-dotman: version $(DOTMANTYPES)
+# Manpages #3: generic part
+dotman: $(DOTMANTYPES)
 	$(SPHINXM)

 ################################################################################
@ -112,6 +114,7 @@ dotman: version $(DOTMANTYPES)
 #
 SPEECHESOURCES=$(SPEECHDIR)/*.tex
 SPEECHES=$(SPEECHESOURCES:.tex=.pdf)
+SPEECHESWEBDIR=$(WEBBASE)/speeches

 # Create speeches and ensure Toc is up-to-date
 $(SPEECHDIR)/%.pdf: $(SPEECHDIR)/%.tex
@ -121,28 +124,131 @@ $(SPEECHDIR)/%.pdf: $(SPEECHDIR)/%.tex

 speeches: $(SPEECHES)

+speeches-dist: speeches
+	rm -rf "${SPEECHESWEBDIR}"
+	mkdir -p "${SPEECHESWEBDIR}"
+	cp ${SPEECHES} "${SPEECHESWEBDIR}"
+	cd ${SPEECHESWEBDIR} && git add . && git commit -m "cdist speeches updated" || true
+
 ################################################################################
-# Misc
+# Website
 #
-clean: docs-clean
+
+BLOGFILE=$(WEBBLOG)/cdist-$(CHANGELOG_VERSION)-released.mdwn
+
+$(BLOGFILE): $(CHANGELOG_FILE)
+	$(helper) blog $(CHANGELOG_VERSION) $(BLOGFILE)
+
+web-blog: $(BLOGFILE)
+
+web-doc:
+	# Go to top level, because of cdist.mdwn
+	rsync -av "$(WEBSRCDIR)/" "${WEBBASE}/.."
+	cd "${WEBBASE}/.." && git add cdist* && git commit -m "cdist doc update" cdist* || true
+
+web-dist: web-blog web-doc
+
+web-pub: web-dist docs-dist speeches-dist
+	cd "${WEBDIR}" && make pub
+
+web-release-all: man-latest-link
+web-release-all-no-latest: web-pub
+
+################################################################################
+# Release: Mailinglist
+#
+ML_FILE=.lock-ml
+
+# Only send mail once - lock until new changelog things happened
+$(ML_FILE): $(CHANGELOG_FILE)
+	$(helper) ml-release $(CHANGELOG_VERSION)
+	touch $@
+
+ml-release: $(ML_FILE)
+
+
+################################################################################
+# pypi
+#
+PYPI_FILE=.pypi-release
+$(PYPI_FILE): man $(PYTHON_VERSION)
+	python3 setup.py sdist upload
+	touch $@
+
+pypi-release: $(PYPI_FILE)
+################################################################################
+# archlinux
+#
+ARCHLINUX_FILE=.lock-archlinux
+ARCHLINUXTAR=cdist-$(CHANGELOG_VERSION)-1.src.tar.gz
+
+$(ARCHLINUXTAR): PKGBUILD
+	umask 022; mkaurball
+
+PKGBUILD: PKGBUILD.in $(PYTHON_VERSION)
+	./PKGBUILD.in $(CHANGELOG_VERSION)
+
+$(ARCHLINUX_FILE): $(ARCHLINUXTAR) $(PYTHON_VERSION)
+	burp -c system $(ARCHLINUXTAR)
+	touch $@
+
+archlinux-release: $(ARCHLINUX_FILE)
+
+################################################################################
+# Release
+#
+
+$(PYTHON_VERSION) version: .git/refs/heads/master
+	$(helper) version
+
+# Code that is better handled in a shell script
+check-%:
+	$(helper) $@
+
+release:
+	$(helper) $@
+
+################################################################################
+# Cleanup
+#
+
+clean:
 	rm -f $(DOCS_SRC_DIR)/cdist-reference.rst
-	rm -f $(DOCS_SRC_DIR)/cdist-types.rst
-	rm -f $(DOCS_SRC_DIR)/cdist.cfg.skeleton

 	find "$(DOCS_SRC_DIR)" -mindepth 2 -type l \
 	| xargs rm -f

+	make -C $(DOCS_SRC_DIR) clean
+
 	find * -name __pycache__  | xargs rm -rf

-	# distutils
-	rm -rf ./build
+	# 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
+
+distclean: clean
+	rm -f cdist/version.py

 ################################################################################
-# install
+# Misc
 #

-install:
-	python3 setup.py install
+# The pub is Nico's "push to all git remotes" way ("make pub")
+pub:
+	git push --mirror

-install-user:
-	python3 setup.py install --user
+test:
+	$(helper) $@
+
+test-remote:
+	$(helper) $@
+
+pep8:
+	$(helper) $@
--- a/PKGBUILD.in
+++ b/PKGBUILD.in
@ -9,7 +9,7 @@ pkgver=$version
 pkgrel=1
 pkgdesc='A Usable Configuration Management System"'
 arch=('any')
-url='https://www.cdi.st/'
+url='http://www.nico.schottelius.org/software/cdist/'
 license=('GPL3')
 depends=('python>=3.2.0')
 source=("http://pypi.python.org/packages/source/c/cdist/cdist-\${pkgver}.tar.gz")
--- a/3
+++ b/3
@ -3,5 +3,4 @@ cdist

 cdist is a usable configuration management system.

-For the web documentation have a look at https://www.cdi.st/
-or at docs/src for reStructuredText manual.
+For the web documentation have a look at docs/web/.
--- 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,7 +1,6 @@
 #!/bin/sh
 #
 # 2011-2013 Nico Schottelius (nico-cdist at schottelius.org)
-# 2016-2019 Darko Poljak (darko.poljak at gmail.com)
 #
 # This file is part of cdist.
 #
@ -19,67 +18,17 @@
 # along with cdist. If not, see <http://www.gnu.org/licenses/>.
 #
 #
-# This file contains the heavy lifting found usually in the Makefile.
+# This file contains the heavy lifting found usually in the Makefile
 #

-usage() {
-    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"
-}
+basedir=${0%/*}/../
+# Change to checkout directory
+cd "$basedir"

-basename="${0##*/}"
-
-if [ $# -lt 1 ]
-then
-    usage "${basename}"
-    exit 1
-fi
+version=$(git describe)

 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\]'
-SHELLCHECKTMP=".shellcheck.tmp"
-
-# Change to checkout directory
-basedir="${0%/*}/../"
-cd "$basedir"
-
 case "$option" in
    changelog-changes)
        if [ "$#" -eq 1 ]; then
@ -117,8 +66,8 @@ case "$option" in
        date_changelog=$(grep '^[[:digit:]]' "$basedir/docs/changelog" | head -n1 | sed 's/.*: //')

        if [ "$date_today" != "$date_changelog" ]; then
-            printf "Date in changelog is not today\n"
-            printf "Changelog date: %s\n" "${date_changelog}"
+            echo "Date in changelog is not today"
+            echo "Changelog: $date_changelog"
            exit 1
        fi
    ;;
@ -127,17 +76,54 @@ case "$option" in
        "$0" test
    ;;

+    blog)
+        version=$1; shift
+        blogfile=$1; shift
+        dir=${blogfile%/*}
+        file=${blogfile##*/}
+
+
+        cat << eof > "$blogfile"
+[[!meta title="Cdist $version released"]]
+
+Here's a short overview about the changes found in version ${version}:
+
+eof
+
+        $0 changelog-changes "$version" >> "$blogfile"
+
+        cat << eof >> "$blogfile"
+For more information visit the [[cdist homepage|software/cdist]].
+
+[[!tag cdist config unix]]
+eof
+        cd "$dir"
+        git add "$file"
+        # Allow git commit to fail if there are no changes
+        git commit -m "cdist blog update: $version" "$blogfile" || true
+    ;;
+
    ml-release)
        if [ $# -ne 1 ]; then
-            printf "%s ml-release version\n" "$0" >&2
+            echo "$0 ml-release version" >&2
            exit 1
        fi

        version=$1; shift

+        to_a=cdist
+        to_d=l.schottelius.org
+        to=${to_a}@${to_d}
+
+        from_a=nico-cdist
+        from_d=schottelius.org
+        from=${from_a}@${from_d}
+
        ( 
        cat << eof
-Subject: cdist $version has been released
+From: Nico -telmich- Schottelius <$from>
+To: cdist mailing list <$to>
+Subject: cdist $version released

 Hello .*,

@ -148,41 +134,25 @@ eof
        "$0" changelog-changes "$version"
        cat << eof

+Cheers,
+
+Nico
+
+-- 
+Automatisation at its best level. With cdist.
 eof
-        ) > mailinglist.tmp
+        ) | /usr/sbin/sendmail -f "$from" "$to"
    ;;

-    archlinux-release)
-        if [ $# -ne 1 ]; then
-            printf "%s archlinux-release version\n" "$0" >&2
-            exit 1
-        fi
-        version=$1; shift
-
-        ARCHLINUXTAR="cdist-${version}-1.src.tar.gz"
-        ./PKGBUILD.in "${version}"
-        umask 022
-        mkaurball
-        burp -c system "${ARCHLINUXTAR}"
-    ;;
-
-    pypi-release)
-        # Ensure that pypi release has the right version
-        "$0" version
-
-        make docs-clean
-        make docs
-        python3 setup.py sdist upload
-    ;;

    release-git-tag)
        target_version=$($0 changelog-version)
-        if git rev-parse --verify "refs/tags/${target_version}" 2>/dev/null; then
-            printf "Tag for %s exists, aborting\n" "${target_version}"
+        if git rev-parse --verify refs/tags/$target_version 2>/dev/null; then
+            echo "Tag for $target_version exists, aborting"
            exit 1
        fi
-        printf "Enter tag description for %s: " "${target_version}"
-        read -r tagmessage
+        printf "Enter tag description for ${target_version}: "
+        read tagmessage

        # setup for signed tags:
        # gpg --fulL-gen-key
@ -200,8 +170,7 @@ eof
        # gpg --verify <asc-file> <file>
        # gpg --no-default-keyring --keyring <pubkey.gpg> --verify <asc-file> <file>
        # Ensure gpg-agent is running.
-        GPG_TTY=$(tty)
-        export GPG_TTY
+        export GPG_TTY=$(tty)
        gpg-agent

        git tag -s "$target_version" -m "$tagmessage"
@ -211,14 +180,14 @@ eof
    sign-git-release)
        if [ $# -lt 2 ]
        then
-            printf "usage: %s sign-git-release TAG TOKEN [ARCHIVE]\n" "$0"
+            printf "usage: $0 sign-git-release TAG TOKEN [ARCHIVE]\n"
            printf "    if ARCHIVE is not specified then it is created\n"
            exit 1
        fi
        tag="$1"
        if ! git rev-parse -q --verify "${tag}" >/dev/null 2>&1
        then
-            printf "Tag \"%s\" not found.\n" "${tag}"
+            printf "Tag \"${tag}\" not found.\n"
            exit 1
        fi
        token="$2"
@ -226,53 +195,44 @@ eof
        then
            archivename="$3"
        else
-            archivename="cdist-${tag}.tar"
+            archivename="cdist-${tag}.tar.gz"
            git archive --prefix="cdist-${tag}/" -o "${archivename}" "${tag}" \
                || exit 1
-            # make sure target version is generated
-            "$0" target-version
-            tar -x -f "${archivename}" || exit 1
-            cp cdist/version.py "cdist-${tag}/cdist/version.py" || exit 1
-            tar -c -f "${archivename}" "cdist-${tag}/" || exit 1
-            rm -r -f "cdist-${tag}/"
-            gzip "${archivename}" || exit 1
-            archivename="${archivename}.gz"
        fi
        gpg --armor --detach-sign "${archivename}" || exit 1

-        project="ungleich-public%2Fcdist"
-        sed_cmd='s/^.*"markdown":"\([^"]*\)".*$/\1/'
+        # make github release
+        curl -H "Authorization: token ${token}" \
+            --request POST \
+            --data "{ \"tag_name\":\"${tag}\", \
+                      \"target_commitish\":\"master\", \
+                      \"name\": \"${tag}\", \
+                      \"body\":\"${tag}\", \
+                      \"draft\":false, \
+                      \"prerelease\": false}" \
+            "https://api.github.com/repos/ungleich/cdist/releases" || exit 1

-        # 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
+        # get release ID
+        repoid=$(curl "https://api.github.com/repos/ungleich/cdist/releases/tags/${tag}" \
+            | python3 -c 'import json; import sys; print(json.loads(sys.stdin.read())["id"])') \
+            || exit 1

-        # upload archive 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" \
+        # upload archive and then signature
+        curl -H "Authorization: token ${token}" \
+             -H "Accept: application/vnd.github.manifold-preview" \
+             -H "Content-Type: application/x-gtar" \
+             --data-binary @${archivename} \
+            "https://uploads.github.com/repos/ungleich/cdist/releases/${repoid}/assets?name=${archivename}" \
+            || exit 1
+        curl -H "Authorization: token ${token}" \
+             -H "Accept: application/vnd.github.manifold-preview" \
+             -H "Content-Type: application/pgp-signature" \
+             --data-binary @${archivename}.asc \
+            "https://uploads.github.com/repos/ungleich/cdist/releases/${repoid}/assets?name=${archivename}.asc" \
            || exit 1

        # remove generated files (archive and asc)
-        if [ $# -eq 2 ]
+        if [ $# -eq 2]
        then
            rm -f "${archivename}"
        fi
@ -284,30 +244,29 @@ eof
        target_version=$($0 changelog-version)
        target_branch=$($0 version-branch)

-        printf "Beginning release process for %s\n" "${target_version}"
+        echo "Beginning release process for $target_version"

        # First check everything is sane
        "$0" check-date
        "$0" check-unittest
-        "$0" check-pycodestyle
-        "$0" check-shellcheck
+        "$0" check-pep8

        # Generate version file to be included in packaging
        "$0" target-version

        # Ensure the git status is clean, else abort
        if ! git diff-index --name-only --exit-code HEAD ; then
-            printf "Unclean tree, see files above, aborting.\n"
+            echo "Unclean tree, see files above, aborting"
            exit 1
        fi

        # Ensure we are on the master branch
        masterbranch=yes
        if [ "$(git rev-parse --abbrev-ref HEAD)" != "master" ]; then
-            printf "Releases are happening from the master branch, aborting.\n"
+            echo "Releases are happening from the master branch, aborting"

-            printf "Enter the magic word to release anyway:"
-            read -r magicword
+            echo "Enter the magic word to release anyway"
+            read magicword

            if [ "$magicword" = "iknowwhatido" ]; then
                masterbranch=no
@ -318,7 +277,7 @@ eof

        if [ "$masterbranch" = yes ]; then
            # Ensure version branch exists
-            if ! git rev-parse --verify "refs/heads/${target_branch}" 2>/dev/null; then
+            if ! git rev-parse --verify refs/heads/$target_branch 2>/dev/null; then
                git branch "$target_branch"
            fi

@ -336,12 +295,20 @@ eof
        make docs-clean
        make docs

+        # Generate speeches (indirect check if they build)
+        make speeches
+
        ############################################################# 
        # Everything green, let's do the release

        # Tag the current commit
        "$0" release-git-tag

+        # sign git tag
+        printf "Enter github authentication token: "
+        read token
+        "$0" sign-git-release "${target_version}" "${token}"
+
        # Also merge back the version branch
        if [ "$masterbranch" = yes ]; then
            git checkout master
@ -349,41 +316,41 @@ eof
        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
+        make pub
+
+        # publish man, speeches, website
+        if [ "$masterbranch" = yes ]; then
+            make web-release-all
+        else
+            make web-release-all-no-latest
+        fi
+
+        # Ensure that pypi release has the right version
+        "$0" version

        # Create and publish package for pypi
-        "$0" pypi-release
+        make pypi-release

-        # sign git tag
-        printf "Enter upstream repository authentication token: "
-        read -r token
-        "$0" sign-git-release "${target_version}" "${token}"
+        # Archlinux release is based on pypi
+        make archlinux-release

        # Announce change on ML
-        "$0" ml-release "${target_version}"
+        make ml-release

        cat << eof
 Manual steps post release:
-    - cdist-web
-    - send generated mailinglist.tmp mail
+
+    - linkedin
+    - hackernews
+    - reddit
    - 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
+        export PYTHONPATH="$(pwd -P)"

        if [ $# -lt 1 ]; then
            python3 -m cdist.test
@ -393,30 +360,22 @@ eof
    ;;

    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
-
+        export PYTHONPATH="$(pwd -P)"
        python3 -m cdist.test.exec.remote
    ;;

-    pycodestyle|pep8)
-        pycodestyle "${basedir}" "${basedir}/scripts/cdist"
+    pep8)
+        pep8 "${basedir}" "${basedir}/scripts/cdist" | less
    ;;

-    check-pycodestyle)
-        "$0" pycodestyle
-        printf "\\nPlease review pycodestyle report.\\n"
+    check-pep8)
+        "$0" pep8
+        echo "Please review pep8 report."
        while true
        do
-            printf "Continue (yes/no)?\n"
+            echo "Continue (yes/no)?"
            any=
-            read -r any
+            read any
            case "$any" in
                yes)
                    break
@ -425,97 +384,7 @@ eof
                    exit 1
                ;;
                *)
-                    printf "Please answer with 'yes' or 'no' explicitly.\n"
-                ;;
-        esac
-        done
-    ;;
-
-    shellcheck-global-explorers)
-        # shellcheck disable=SC2086
-        find cdist/conf/explorer -type f -exec ${SHELLCHECKCMD} {} + | grep -v "${SHELLCHECK_SKIP}" > "${SHELLCHECKTMP}"
-        test ! -s "${SHELLCHECKTMP}" || { cat "${SHELLCHECKTMP}"; exit 1; }
-    ;;
-
-    shellcheck-type-explorers)
-        # shellcheck disable=SC2086
-        find cdist/conf/type -type f -path "*/explorer/*" -exec ${SHELLCHECKCMD} {} + | grep -v "${SHELLCHECK_SKIP}" > "${SHELLCHECKTMP}"
-        test ! -s "${SHELLCHECKTMP}" || { cat "${SHELLCHECKTMP}"; exit 1; }
-    ;;
-
-    shellcheck-manifests)
-        # shellcheck disable=SC2086
-        find cdist/conf/type -type f -name manifest -exec ${SHELLCHECKCMD} {} + | grep -v "${SHELLCHECK_SKIP}" > "${SHELLCHECKTMP}"
-        test ! -s "${SHELLCHECKTMP}" || { cat "${SHELLCHECKTMP}"; exit 1; }
-    ;;
-
-    shellcheck-local-gencodes)
-        # shellcheck disable=SC2086
-        find cdist/conf/type -type f -name gencode-local -exec ${SHELLCHECKCMD} {} + | grep -v "${SHELLCHECK_SKIP}" > "${SHELLCHECKTMP}"
-        test ! -s "${SHELLCHECKTMP}" || { cat "${SHELLCHECKTMP}"; exit 1; }
-    ;;
-
-    shellcheck-remote-gencodes)
-        # shellcheck disable=SC2086
-        find cdist/conf/type -type f -name gencode-remote -exec ${SHELLCHECKCMD} {} + | grep -v "${SHELLCHECK_SKIP}" > "${SHELLCHECKTMP}"
-        test ! -s "${SHELLCHECKTMP}" || { cat "${SHELLCHECKTMP}"; exit 1; }
-    ;;
-
-    shellcheck-scripts)
-        # shellcheck disable=SC2086
-        ${SHELLCHECKCMD} scripts/cdist-dump scripts/cdist-new-type > "${SHELLCHECKTMP}"
-        test ! -s "${SHELLCHECKTMP}" || { cat "${SHELLCHECKTMP}"; exit 1; }
-    ;;
-
-    shellcheck-gencodes)
-        "$0" shellcheck-local-gencodes || exit 1
-        "$0" shellcheck-remote-gencodes || exit 1
-    ;;
-
-    shellcheck-types)
-        "$0" shellcheck-type-explorers || exit 1
-        "$0" shellcheck-manifests || exit 1
-        "$0" shellcheck-gencodes || exit 1
-    ;;
-
-    shellcheck)
-        "$0" shellcheck-global-explorers || exit 1
-        "$0" shellcheck-types || exit 1
-        "$0" shellcheck-scripts || exit 1
-    ;;
-
-    shellcheck-type-files)
-        # shellcheck disable=SC2086
-        find cdist/conf/type -type f -path "*/files/*" -exec ${SHELLCHECKCMD} {} + | grep -v "${SHELLCHECK_SKIP}" > "${SHELLCHECKTMP}"
-        test ! -s "${SHELLCHECKTMP}" || { cat "${SHELLCHECKTMP}"; exit 1; }
-    ;;
-
-    shellcheck-with-files)
-        "$0" shellcheck || exit 1
-        "$0" shellcheck-type-files || exit 1
-    ;;
-
-    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"
+                    echo "Please answer with 'yes' or 'no' explicitly."
                ;;
        esac
        done
@ -526,40 +395,16 @@ eof
    ;;

    version)
-        printf "VERSION = \"%s\"\n" "$(git describe)" > cdist/version.py
+        echo "VERSION = \"$(git describe)\"" > cdist/version.py
    ;;

    target-version)
        target_version=$($0 changelog-version)
-        printf "VERSION = \"%s\"\n" "${target_version}" > cdist/version.py
+        echo "VERSION = \"${target_version}\"" > cdist/version.py
    ;;

-    clean)
-        make clean
-
-        # Archlinux
-        rm -f cdist-*.pkg.tar.xz cdist-*.tar.gz
-        rm -rf pkg/ src/
-
-        rm -f MANIFEST PKGBUILD
-        rm -rf dist/
-
-        # Signed release
-        rm -f cdist-*.tar.gz
-        rm -f cdist-*.tar.gz.asc
-
-        # Temp files
-        rm -f ./*.tmp
-        rm -f ./.*.tmp
-    ;;
-
-    distclean)
-        "$0" clean
-        rm -f cdist/version.py
-    ;;
    *)
-        printf "Unknown target: '%s'.\n" "${option}" >&2
-        usage "${basename}"
+        echo "Unknown helper target $@ - aborting"
        exit 1
    ;;

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

 class CdistEntityError(Error):
    """Something went wrong while executing cdist entity"""
-    def __init__(self, entity_name, entity_params, stdout_paths,
-                 stderr_paths, subject=''):
+    def __init__(self, entity_name, entity_params, 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 stderr(self):
+        output = []
+        for stderr_name, stderr_path in self.stderr_paths:
+            if (os.path.exists(stderr_path) and
+                    os.path.getsize(stderr_path) > 0):
+                label_begin = '---- BEGIN ' + stderr_name + ':stderr ----'
+                label_end = '---- END ' + stderr_name + ':stderr ----'
+                output.append('\n' + label_begin)
+                with open(stderr_path, 'r') as fd:
+                    output.append(fd.read())
+                output.append(label_end)
+        return '\n'.join(output)

    def __str__(self):
        output = []
        output.append(self.message)
-        output.append('\n\n')
-        header = "Error processing " + self.entity_name
+        header = "\nError 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)
+        output.append(self.stderr + '\n')
+        return '\n'.join(output)


 class CdistObjectError(CdistEntityError):
@ -164,76 +127,28 @@ class CdistObjectError(CdistEntityError):
            ('name', cdist_object.name, ),
            ('path', cdist_object.absolute_path, ),
            ('source', " ".join(cdist_object.source), ),
-            ('type', os.path.realpath(
-                cdist_object.cdist_type.absolute_path), ),
+            ('type', 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)
+                         params, stderr_paths, subject)


 class InitialManifestError(CdistEntityError):
    """Something went wrong while executing initial manifest"""
-    def __init__(self, initial_manifest, stdout_path, stderr_path, subject=''):
+    def __init__(self, initial_manifest, stderr_path, subject=''):
        params = [
            ('path', initial_manifest, ),
        ]
-        stdout_paths = [
-            ('init', stdout_path, ),
-        ]
+        stderr_paths = []
        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)
+        super().__init__('initial manifest', params, stderr_paths, subject)


 def file_to_list(filename):
--- a/cdist/argparse.py
+++ b/cdist/argparse.py
@ -5,24 +5,21 @@ import logging
 import collections
 import functools
 import cdist.configuration
-import cdist.preos
-import cdist.info


 # set of beta sub-commands
 BETA_COMMANDS = set(('install', 'inventory', ))
 # set of beta arguments for sub-commands
 BETA_ARGS = {
-    'config': set(('tag', 'all_tagged_hosts', 'use_archiving', )),
+    'config': set(('jobs', 'tag', 'all_tagged_hosts', 'use_archiving', )),
 }
-EPILOG = "Get cdist at https://code.ungleich.ch/ungleich-public/cdist"
+EPILOG = "Get cdist at http://www.nico.schottelius.org/software/cdist/"
 # Parser others can reuse
 parser = None


 _verbosity_level_off = -2
 _verbosity_level = {
-    None: logging.WARNING,
    _verbosity_level_off: logging.OFF,
    -1: logging.ERROR,
    0: logging.WARNING,
@ -104,7 +101,7 @@ def get_parsers():
                                   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), '
+                  '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.'),
@ -164,16 +161,6 @@ def get_parsers():

    # Config
    parser['config_main'] = argparse.ArgumentParser(add_help=False)
-    parser['config_main'].add_argument(
-           '-4', '--force-ipv4',
-           help=('Force to use IPv4 addresses only. No influence for custom'
-                 ' remote commands.'),
-           action='store_const', dest='force_ipv', const=4)
-    parser['config_main'].add_argument(
-           '-6', '--force-ipv6',
-           help=('Force to use IPv6 addresses only. No influence for custom'
-                 ' remote commands.'),
-           action='store_const', dest='force_ipv', const=6)
    parser['config_main'].add_argument(
            '-C', '--cache-path-pattern',
            help=('Specify custom cache path pattern. If '
@ -194,7 +181,8 @@ def get_parsers():
                                  name="positive int"),
           help=('Operate in parallel in specified maximum number of jobs. '
                 'Global explorers, object prepare and object run are '
-                 'supported. Without argument CPU count is used by default. '),
+                 'supported. Without argument CPU count is used by default. '
+                 'Currently in beta.'),
           action='store', dest='jobs',
           const=multiprocessing.cpu_count())
    parser['config_main'].add_argument(
@ -203,11 +191,6 @@ def get_parsers():
    parser['config_main'].add_argument(
           '-o', '--out-dir',
           help='Directory to save cdist output in.', dest="out_path")
-    parser['config_main'].add_argument(
-           '-P', '--timestamp',
-           help=('Timestamp log messages with the current local date and time '
-                 'in the format: YYYYMMDDHHMMSS.us.'),
-           action='store_true', dest='timestamp')
    parser['config_main'].add_argument(
           '-R', '--use-archiving', nargs='?',
           choices=('tar', 'tgz', 'tbz2', 'txz',),
@ -237,13 +220,19 @@ def get_parsers():
                 '(should behave like ssh).'),
           action='store', dest='remote_exec',
           default=None)
-    parser['config_main'].add_argument(
-           '-S', '--disable-saving-output-streams',
-           help='Disable saving output streams.',
-           action='store_false', dest='save_output_streams', default=True)

    # Config
    parser['config_args'] = argparse.ArgumentParser(add_help=False)
+    parser['config_args'].add_argument(
+           '-4', '--force-ipv4',
+           help=('Force to use IPv4 addresses only. No influence for custom'
+                 ' remote commands.'),
+           action='store_const', dest='force_ipv', const=4)
+    parser['config_args'].add_argument(
+           '-6', '--force-ipv6',
+           help=('Force to use IPv6 addresses only. No influence for custom'
+                 ' remote commands.'),
+           action='store_const', dest='force_ipv', const=6)
    parser['config_args'].add_argument(
             '-A', '--all-tagged',
             help=('Use all hosts present in tags db. Currently in beta.'),
@ -253,6 +242,8 @@ def get_parsers():
             help=('List hosts that have all specified tags, '
                   'if -t/--tag is specified.'),
             action="store_true", dest="has_all_tags", default=False)
+    parser['config_args'].add_argument(
+            'host', nargs='*', help='Host(s) to operate on.')
    parser['config_args'].add_argument(
            '-f', '--file',
            help=('Read specified file for a list of additional hosts to '
@ -269,6 +260,10 @@ def get_parsers():
                 'default.'),
           action='store', dest='parallel',
           const=multiprocessing.cpu_count())
+    parser['config_args'].add_argument(
+           '-S', '--disable-saving-output-streams',
+           help='Disable saving output streams.',
+           action='store_false', dest='save_output_streams', default=True)
    parser['config_args'].add_argument(
           '-s', '--sequential',
           help='Operate on multiple hosts sequentially (default).',
@ -279,8 +274,6 @@ def get_parsers():
                   'list all hosts that contain any of specified tags. '
                   'Currently in beta.'),
             dest='tag', required=False, action="store_true", default=False)
-    parser['config_args'].add_argument(
-            'host', nargs='*', help='Host(s) to operate on.')
    parser['config'] = parser['sub'].add_parser(
            'config', parents=[parser['loglevel'], parser['beta'],
                               parser['common'],
@ -425,9 +418,6 @@ def get_parsers():
    parser['inventory'].set_defaults(
            func=cdist.inventory.Inventory.commandline)

-    # PreOS
-    parser['preos'] = parser['sub'].add_parser('preos', add_help=False)
-
    # Shell
    parser['shell'] = parser['sub'].add_parser(
            'shell', parents=[parser['loglevel']])
@ -437,37 +427,6 @@ def get_parsers():
                  ' should be POSIX compatible shell.'))
    parser['shell'].set_defaults(func=cdist.shell.Shell.commandline)

-    # Info
-    parser['info'] = parser['sub'].add_parser('info')
-    parser['info'].add_argument(
-            '-a', '--all', help='Display all info. This is the default.',
-            action='store_true', default=False)
-    parser['info'].add_argument(
-            '-c', '--conf-dir',
-            help='Add configuration directory (can be repeated).',
-            action='append')
-    parser['info'].add_argument(
-            '-e', '--global-explorers',
-            help='Display info for global explorers.', action='store_true',
-            default=False)
-    parser['info'].add_argument(
-            '-F', '--fixed-string',
-            help='Interpret pattern as a fixed string.', action='store_true',
-            default=False)
-    parser['info'].add_argument(
-            '-f', '--full', help='Display full details.',
-            action='store_true', default=False)
-    parser['info'].add_argument(
-           '-g', '--config-file',
-           help='Use specified custom configuration file.',
-           dest="config_file", required=False)
-    parser['info'].add_argument(
-            '-t', '--types', help='Display info for types.',
-            action='store_true', default=False)
-    parser['info'].add_argument(
-            'pattern', nargs='?', help='Glob pattern.')
-    parser['info'].set_defaults(func=cdist.info.Info.commandline)
-
    for p in parser:
        parser[p].epilog = EPILOG

--- a/cdist/conf/explorer/cpu_cores
+++ b/cdist/conf/explorer/cpu_cores
@ -25,17 +25,13 @@
 os=$("$__explorer/os")
 case "$os" in
    "macosx")
-        sysctl -n hw.physicalcpu
-    ;;
-
-    "openbsd")
-        sysctl -n hw.ncpuonline
+        echo "$(sysctl -n hw.physicalcpu)"
    ;;

    *)
        if [ -r /proc/cpuinfo ]; then
            cores="$(grep "core id" /proc/cpuinfo | sort | uniq | wc -l)"
-            if [ "${cores}" -eq 0 ]; then
+            if [ ${cores} -eq 0 ]; then
                cores="1"
            fi
            echo "$cores"
--- a/cdist/conf/explorer/cpu_sockets
+++ b/cdist/conf/explorer/cpu_sockets
@ -25,14 +25,14 @@
 os=$("$__explorer/os")
 case "$os" in
    "macosx")
-        system_profiler SPHardwareDataType | grep "Number of Processors" | awk -F': ' '{print $2}'
+        echo "$(system_profiler SPHardwareDataType | grep "Number of Processors" | awk -F': ' '{print $2}')"
    ;;

    *)
    if [ -r /proc/cpuinfo ]; then
-        sockets="$(grep "physical id" /proc/cpuinfo | sort -u | wc -l)"
-        if [ "${sockets}" -eq 0 ]; then
-            sockets="$(grep -c "processor" /proc/cpuinfo)"
+        sockets="$(grep "physical id" /proc/cpuinfo | sort | uniq | wc -l)"
+        if [ ${sockets} -eq 0 ]; then
+            sockets="$(cat /proc/cpuinfo | grep "processor" | wc -l)"
        fi
        echo "${sockets}"
    fi
--- a/cdist/conf/explorer/disks
+++ b/cdist/conf/explorer/disks
@ -1,27 +1,2 @@
-#!/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
+cd /dev
+echo sd? hd? vd?
--- a/cdist/conf/explorer/hostname
+++ b/cdist/conf/explorer/hostname
@ -1,6 +1,7 @@
 #!/bin/sh
 #
-# 2019 Dennis Camera (dennis.camera at ssrq-sds-fds.ch)
+# 2010-2014 Nico Schottelius (nico-cdist at schottelius.org)
+# 2012 Steven Armstrong (steven-cdist at armstrong.cc)
 #
 # This file is part of cdist.
 #
@ -18,12 +19,7 @@
 # along with cdist. If not, see <http://www.gnu.org/licenses/>.
 #
 #
-# Retrieve the running hostname
-#

-if command -v hostname >/dev/null
-then
-	hostname
-else
-	uname -n
+if command -v uname >/dev/null; then
+   uname -n
 fi
--- a/cdist/conf/explorer/init
+++ b/cdist/conf/explorer/init
@ -29,7 +29,7 @@ case "$uname_s" in
    Linux)
        (pgrep -P0 -l | awk '/^1[ \t]/ {print $2;}') || true
    ;;
-    FreeBSD|OpenBSD)
+    FreeBSD)
        ps -o comm= -p 1 || true
    ;;
    *)
--- a/cdist/conf/explorer/interfaces
+++ b/cdist/conf/explorer/interfaces
@ -1,6 +1,6 @@
-#!/bin/sh -e
+#!/bin/sh
 #
-# 2019 Ander Punnar (ander-at-kvlt-dot-ee)
+# 2012 Sébastien Gross <seb•ɑƬ•chezwam•ɖɵʈ•org>
 #
 # This file is part of cdist.
 #
@ -17,12 +17,35 @@
 # You should have received a copy of the GNU General Public License
 # along with cdist. If not, see <http://www.gnu.org/licenses/>.
 #
+#
+# List all network interfaces in explorer/ifaces. One interface per line.
+#
+# If your OS is not supported please provide a ifconfig output
+#

-if command -v ip >/dev/null
-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
+# Use ip, if available
+if command -v ip >/dev/null; then
+    ip -o link show | sed -n 's/^[0-9]\+: \(.\+\): <.*/\1/p'
+    exit 0
+fi
+
+if ! command -v ifconfig >/dev/null; then
+   # no ifconfig, nothing we could do
+   exit 0
+fi
+
+uname_s="$(uname -s)"
+REGEXP='s/^(.*)(:[[:space:]]*flags=|Link encap).*/\1/p'
+
+case "$uname_s" in
+    Darwin)
+	ifconfig -a | sed -n -E "$REGEXP"
+	;;
+    Linux|*BSD)
+	ifconfig -a | sed -n -r "$REGEXP"
+	;;
+    *)
+	echo "Unsupported ifconfig output for $uname_s" >&2
+	exit 1
+	;;
+esac
--- 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 +1 @@
-#!/bin/sh
 uname -s
--- a/cdist/conf/explorer/lsb_codename
+++ b/cdist/conf/explorer/lsb_codename
@ -20,9 +20,8 @@
 #

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

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

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

 set +e
-case "$("$__explorer/os")" in
+case "$($__explorer/os)" in
   openwrt)
-      # shellcheck disable=SC1091
      (. /etc/openwrt_release && echo "$DISTRIB_RELEASE")
   ;;
   *)
--- a/cdist/conf/explorer/machine
+++ b/cdist/conf/explorer/machine
@ -22,6 +22,6 @@
 #
 #

-if command -v uname >/dev/null 2>&1 ; then
+if command -v uname 2>&1 >/dev/null; then
   uname -m
 fi
--- a/cdist/conf/explorer/machine_type
+++ b/cdist/conf/explorer/machine_type
@ -22,13 +22,13 @@

 # FIXME: other system types (not linux ...)

-if [ -d "/proc/vz" ] && [ ! -d "/proc/bc" ]; then
+if [ -d "/proc/vz" -a ! -d "/proc/bc" ]; then
    echo openvz
    exit
 fi

 if [ -e "/proc/1/environ" ] &&
-    tr '\000' '\n' < "/proc/1/environ" | grep -Eiq '^container='; then
+    cat "/proc/1/environ" | tr '\000' '\n' | grep -Eiq '^container='; then
    echo lxc
    exit
 fi
--- a/cdist/conf/explorer/os
+++ b/cdist/conf/explorer/os
@ -145,7 +145,7 @@ esac
 if [ -f /etc/os-release ]; then
   # already lowercase, according to:
   # https://www.freedesktop.org/software/systemd/man/os-release.html
-   awk -F= '/^ID=/ { if ($2 ~ /^'"'"'(.*)'"'"'$/ || $2 ~ /^"(.*)"$/) { print substr($2, 2, length($2) - 2) } else { print $2 } }' /etc/os-release
+   awk -F= '/^ID=/ {print $2;}' /etc/os-release
   exit 0
 fi

--- a/cdist/conf/explorer/os_version
+++ b/cdist/conf/explorer/os_version
@ -22,7 +22,7 @@
 #
 #

-case "$("$__explorer/os")" in
+case "$($__explorer/os)" in
   amazon)
      cat /etc/system-release
   ;;
--- 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,129 +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/entry" ]
-then
-    acl_should="$( cat "$__object/parameter/entry" )"
-elif [ -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
----------------------------
-entry
-   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 ``acl``, ``user``, ``group``, ``mask`` and ``other`` are deprecated and they
-will be removed in future versions. Please use ``entry`` parameter instead.
-
-
-EXAMPLES
--------
-
-.. code-block:: sh
-
-    __acl /srv/project \
-        --default \
-        --recursive \
-        --remove \
-        --entry user:alice:rwx \
-        --entry user:bob:r-x \
-        --entry group:project-group:rwx \
-        --entry group:some-other-group:r-x \
-        --entry mask::r-x \
-        --entry other::r-x
-
-    # give Alice read-only access to subdir,
-    # but don't allow her to see parent content.
-
-    __acl /srv/project2 \
-        --remove \
-        --entry default:group:secret-project:rwx \
-        --entry group:secret-project:rwx \
-        --entry user:alice:--x
-
-    __acl /srv/project2/subdir \
-        --default \
-        --remove \
-        --entry group:secret-project:rwx \
-        --entry 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/acl
+++ b/cdist/conf/type/__acl/parameter/deprecated/acl
@ -1 +0,0 @@
-see manual for details
--- 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,4 +0,0 @@
-entry
-acl
-user
-group
--- a/cdist/conf/type/__apt_key/explorer/state
+++ b/cdist/conf/type/__apt_key/explorer/state
@ -27,18 +27,6 @@ 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
+apt-key export "$keyid" | head -n 1 | grep -Fqe "BEGIN PGP PUBLIC KEY BLOCK" \
+   && echo present \
+   || echo absent
--- a/cdist/conf/type/__apt_key/gencode-remote
+++ b/cdist/conf/type/__apt_key/gencode-remote
@ -31,82 +31,12 @@ if [ "$state_should" = "$state_is" ]; then
   exit 0
 fi

-keydir="$(cat "$__object/parameter/keydir")"
-keyfile="$keydir/$__object_id.gpg"
-
 case "$state_should" in
   present)
      keyserver="$(cat "$__object/parameter/keyserver")"
-
-      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
-         # 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
-
-gpgtmphome="\$( mktemp -d )"
-
-if timeout 30s \\
-    gpg --homedir "\$gpgtmphome" \\
-        --keyserver "$keyserver" \\
-        --recv-keys "$keyid"
-then
-    gpg --homedir "\$gpgtmphome" \\
-        --export "$keyid" \\
-        > "$keyfile"
-else
-    export GPG_GOT_STUCK=1
-fi
-
-GNUPGHOME="\$gpgtmphome" gpgconf --kill dirmngr
-
-rm -rf "\$gpgtmphome"
-
-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"
+      echo "apt-key adv --keyserver \"$keyserver\" --recv-keys \"$keyid\""
   ;;
   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"
+      echo "apt-key del \"$keyid\""
   ;;
 esac
--- a/cdist/conf/type/__apt_key/man.rst
+++ b/cdist/conf/type/__apt_key/man.rst
@ -28,12 +28,6 @@ keyserver
   the keyserver from which to fetch the key. If omitted the default set
   in ./parameter/default/keyserver is used.

-keydir
-   key save location, defaults to ``/etc/apt/trusted.pgp.d``
-
-uri
-   the URI from which to download the key
-

 EXAMPLES
 --------
@ -53,20 +47,15 @@ EXAMPLES
    # same thing with other keyserver
    __apt_key UbuntuArchiveKey --keyid 437D05B5 --keyserver keyserver.ubuntu.com

-    # download key from the internet
-    __apt_key rabbitmq \
-       --uri http://www.rabbitmq.com/rabbitmq-signing-key-public.asc
-

 AUTHORS
 -------
 Steven Armstrong <steven-cdist--@--armstrong.cc>
-Ander Punnar <ander-at-kvlt-dot-ee>


 COPYING
 -------
-Copyright \(C) 2011-2019 Steven Armstrong and Ander Punnar. You can
-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
+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/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/optional
+++ b/cdist/conf/type/__apt_key/parameter/optional
@ -1,5 +1,3 @@
 state
 keyid
 keyserver
-keydir
-uri
--- a/cdist/conf/type/__apt_ppa/explorer/state
+++ b/cdist/conf/type/__apt_ppa/explorer/state
@ -23,11 +23,10 @@

 name="$__object_id"

-# shellcheck disable=SC1091
 . /etc/lsb-release

 repo_name="${name#ppa:}"
-repo_file_name="$(echo "$repo_name" | sed -e 's|[/:]|-|' -e 's|\.|_|')-${DISTRIB_CODENAME}.list"
+repo_file_name="$(echo "$repo_name" | sed -e "s|[/:]|-|" -e "s|\.|_|")-${DISTRIB_CODENAME}.list"

 [ -s "/etc/apt/sources.list.d/${repo_file_name}" ] \
   && echo present || echo absent
--- a/cdist/conf/type/__apt_ppa/gencode-remote
+++ b/cdist/conf/type/__apt_ppa/gencode-remote
@ -29,9 +29,9 @@ fi

 case "$state_should" in
   present)
-      echo "add-apt-repository '$name'"
+      echo add-apt-repository \"$name\"
   ;;
   absent)
-      echo "remove-apt-repository '$name'"
+      echo remove-apt-repository \"$name\"
   ;;
 esac
--- a/cdist/conf/type/__apt_ppa/manifest
+++ b/cdist/conf/type/__apt_ppa/manifest
@ -18,6 +18,8 @@
 # along with cdist. If not, see <http://www.gnu.org/licenses/>.
 #

+name="$__object_id"
+
 __package software-properties-common

 require="__package/software-properties-common" \
--- a/cdist/conf/type/__apt_source/nonparallel
+++ b/cdist/conf/type/__apt_source/nonparallel
--- a/cdist/conf/type/__block/gencode-remote
+++ b/cdist/conf/type/__block/gencode-remote
@ -18,11 +18,6 @@
 # along with cdist. If not, see <http://www.gnu.org/licenses/>.
 #

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

+
+file="$(cat "$__object/parameter/file" 2>/dev/null || echo "/$__object_id")"
 prefix=$(cat "$__object/parameter/prefix" 2>/dev/null || echo "#cdist:__block/$__object_id")
 suffix=$(cat "$__object/parameter/suffix" 2>/dev/null || echo "#/cdist:__block/$__object_id")
 text=$(cat "$__object/parameter/text")
--- a/cdist/conf/type/__ccollect_source/gencode-remote
+++ b/cdist/conf/type/__ccollect_source/gencode-remote
@ -42,20 +42,21 @@ get_current_value() {
 }

 set_group() {
-    echo "chgrp '$1' '$destination'"
-    echo "chgrp '$1'" >> "$__messages_out"
+    echo chgrp \"$1\" \"$destination\"
+    echo chgrp $1 >> "$__messages_out"
 }

 set_owner() {
-    echo "chown '$1' '$destination'"
-    echo "chown '$1'" >> "$__messages_out"
+    echo chown \"$1\" \"$destination\"
+    echo chown $1 >> "$__messages_out"
 }

 set_mode() {
-   echo "chmod '$1' '$destination'"
-   echo "chmod '$1'" >> "$__messages_out"
+   echo chmod \"$1\" \"$destination\"
+   echo chmod $1 >> "$__messages_out"
 }

+set_attributes=
 case "$state_should" in
    present|exists)
    # Note: Mode - needs to happen last as a chown/chgrp can alter mode by
@ -66,11 +67,11 @@ case "$state_should" in

            # change 0xxx format to xxx format => same as stat returns
            if [ "$attribute" = mode ]; then
-                value_should="$(echo "$value_should" | sed 's/^0\(...\)/\1/')"
+                value_should="$(echo $value_should | sed 's/^0\(...\)/\1/')"
            fi
            
            value_is="$(get_current_value "$attribute" "$value_should")"
-            if [ -f "$__object/files/set-attributes" ] || [ "$value_should" != "$value_is" ]; then
+            if [ -f "$__object/files/set-attributes" -o "$value_should" != "$value_is" ]; then
                "set_$attribute" "$value_should"
            fi
        fi
@ -80,7 +81,7 @@ case "$state_should" in

    absent)
        if [ "$type" = "file" ]; then
-            echo "rm -f '$destination'"
+            echo rm -f \"$destination\"
            echo remove >> "$__messages_out"
        fi
    ;;
--- a/cdist/conf/type/__ccollect_source/manifest
+++ b/cdist/conf/type/__ccollect_source/manifest
@ -22,7 +22,7 @@ name="$__object_id"
 state="$(cat "$__object/parameter/state")"
 source="$(cat "$__object/parameter/source")"
 destination="$(cat "$__object/parameter/destination")"
-ccollectconf="$(sed 's,/$,,' "$__object/parameter/ccollectconf")"
+ccollectconf="$(cat "$__object/parameter/ccollectconf" | sed 's,/$,,')"

 sourcedir="$ccollectconf/sources"
 basedir="$sourcedir/$name"
@ -55,5 +55,5 @@ if [ -f "$__object/parameter/exclude" ]; then
 fi

 if [ -f "$__object/parameter/create-destination" ]; then
-    __directory "${destination}" --parents --state "${state}"
+    __directory "${destination}" --parents --state ${state}
 fi
--- a/cdist/conf/type/__cdist/man.rst
+++ b/cdist/conf/type/__cdist/man.rst
@ -30,7 +30,7 @@ username

 source
    Select the source from which to clone cdist from.
-    Defaults to "git@code.ungleich.ch:ungleich-public/cdist.git".
+    Defaults to "git://github.com/ungleich/cdist.git".


 branch
@ -47,7 +47,7 @@ EXAMPLES
    __cdist /home/cdist/cdist

    # Use alternative source
-    __cdist --source "git@code.ungleich.ch:ungleich-public/cdist.git" /home/cdist/cdist
+    __cdist --source "git://github.com/ungleich/cdist" /home/cdist/cdist


 AUTHORS
--- a/cdist/conf/type/__cdist/parameter/default/source
+++ b/cdist/conf/type/__cdist/parameter/default/source
@ -1 +1 @@
-git@code.ungleich.ch:ungleich-public/cdist.git
+git://github.com/ungleich/cdist.git
--- a/cdist/conf/type/__check_messages/gencode-remote
+++ b/cdist/conf/type/__check_messages/gencode-remote
@ -1,26 +0,0 @@
-#!/bin/sh -e
-#
-# 2019 Ander Punnar (ander-at-kvlt-dot-ee)
-#
-# This file is part of cdist.
-#
-# cdist is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# cdist is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with cdist. If not, see <http://www.gnu.org/licenses/>.
-#
-
-if grep -Eq \
-    "$( cat "$__object/parameter/pattern" )" \
-    "$__messages_in"
-then
-    tee "$__messages_out" < "$__object/parameter/execute"
-fi
--- a/cdist/conf/type/__check_messages/man.rst
+++ b/cdist/conf/type/__check_messages/man.rst
@ -1,52 +0,0 @@
-cdist-type__check_messages(7)
-=============================
-
-NAME
----
-cdist-type__check_messages - Check messages for pattern and execute command on match.
-
-
-DESCRIPTION
-----------
-Check messages for pattern and execute command on match.
-
-This type is useful if you chain together multiple related types using
-dependencies and want to restart service if at least one type changes
-something.
-
-For more information about messages see `cdist messaging <cdist-messaging.html>`_.
-
-For more information about dependencies and execution order see
-`cdist manifest <cdist-manifest.html#dependencies>`_ documentation.
-
-
-REQUIRED PARAMETERS
-------------------
-pattern
-   Extended regular expression pattern for search (passed to ``grep -E``).
-
-execute
-   Command to execute on pattern match.
-
-
-EXAMPLES
--------
-
-.. code-block:: sh
-
-    __check_messages munin \
-        --pattern '^__(file|link|line)/etc/munin/' \
-        --execute 'service munin-node restart'
-
-
-AUTHORS
-------
-Ander Punnar <ander-at-kvlt-dot-ee>
-
-
-COPYING
-------
-Copyright \(C) 2019 Ander Punnar. You can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
--- a/cdist/conf/type/__check_messages/parameter/required
+++ b/cdist/conf/type/__check_messages/parameter/required
@ -1,2 +0,0 @@
-pattern
-execute
--- a/cdist/conf/type/__clean_path/explorer/list
+++ b/cdist/conf/type/__clean_path/explorer/list
@ -1,35 +0,0 @@
-#!/bin/sh -e
-#
-# 2019 Ander Punnar (ander-at-kvlt-dot-ee)
-#
-# This file is part of cdist.
-#
-# cdist is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# cdist is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with cdist. If not, see <http://www.gnu.org/licenses/>.
-#
-
-path="/$__object_id"
-
-[ ! -d "$path" ] && exit 0
-
-pattern="$( cat "$__object/parameter/pattern" )"
-
-if [ -f "$__object/parameter/exclude" ]
-then
-    exclude="$( cat "$__object/parameter/exclude" )"
-
-    find "$path" -mindepth 1 -maxdepth 1 -regex "$pattern" \
-        -and -not -regex "$exclude"
-else
-    find "$path" -mindepth 1 -maxdepth 1 -regex "$pattern"
-fi
--- a/cdist/conf/type/__clean_path/gencode-remote
+++ b/cdist/conf/type/__clean_path/gencode-remote
@ -1,48 +0,0 @@
-#!/bin/sh -e
-#
-# 2019 Ander Punnar (ander-at-kvlt-dot-ee)
-#
-# This file is part of cdist.
-#
-# cdist is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# cdist is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with cdist. If not, see <http://www.gnu.org/licenses/>.
-#
-
-[ ! -s "$__object/explorer/list" ] && exit 0
-
-path="/$__object_id"
-
-pattern="$( cat "$__object/parameter/pattern" )"
-
-if [ -f "$__object/parameter/exclude" ]
-then
-    exclude="$( cat "$__object/parameter/exclude" )"
-
-    echo "find '$path' -mindepth 1 -maxdepth 1 -regex '$pattern'" \
-        "-and -not -regex '$exclude'" \
-        '-exec rm -rf {} \;'
-else
-    echo "find '$path' -mindepth 1 -maxdepth 1 -regex '$pattern'" \
-        '-exec rm -rf {} \;'
-fi
-
-while read -r f
-do
-    echo "removed '$f'" >> "$__messages_out"
-done \
-< "$__object/explorer/list"
-
-if [ -f "$__object/parameter/onchange" ]
-then
-    cat "$__object/parameter/onchange"
-fi
--- a/cdist/conf/type/__clean_path/man.rst
+++ b/cdist/conf/type/__clean_path/man.rst
@ -1,60 +0,0 @@
-cdist-type__clean_path(7)
-=========================
-
-NAME
----
-cdist-type__clean_path - Remove files and directories which match the pattern.
-
-
-DESCRIPTION
-----------
-Remove files and directories which match the pattern.
-
-Provided path (as __object_id) must be a directory.
-
-Patterns are passed to ``find``'s ``-regex`` - see ``find(1)`` for more details.
-
-Look up of files and directories is non-recursive (``-maxdepth 1``).
-
-Parent directory is excluded (``-mindepth 1``).
-
-This type is not POSIX compatible (sorry, Solaris users).
-
-
-REQUIRED PARAMETERS
-------------------
-pattern
-   Pattern of files which are removed from path.
-
-
-OPTIONAL PARAMETERS
-------------------
-exclude
-   Pattern of files which are excluded from removal.
-
-onchange
-   The code to run if files or directories were removed.
-
-
-EXAMPLES
--------
-
-.. code-block:: sh
-
-    __clean_path /etc/apache2/conf-enabled \
-        --pattern '.+' \
-        --exclude '.+\(charset\.conf\|security\.conf\)' \
-        --onchange 'service apache2 restart'
-
-
-AUTHORS
-------
-Ander Punnar <ander-at-kvlt-dot-ee>
-
-
-COPYING
-------
-Copyright \(C) 2019 Ander Punnar. You can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
--- a/cdist/conf/type/__clean_path/parameter/optional
+++ b/cdist/conf/type/__clean_path/parameter/optional
@ -1,2 +0,0 @@
-exclude
-onchange
--- a/cdist/conf/type/__clean_path/parameter/required
+++ b/cdist/conf/type/__clean_path/parameter/required
@ -1 +0,0 @@
-pattern
--- a/cdist/conf/type/__config_file/manifest
+++ b/cdist/conf/type/__config_file/manifest
@ -19,8 +19,7 @@
 #

 set -- "/${__object_id}"
-cd "$__object/parameter/"
-for param in *; do
+for param in $(ls "$__object/parameter/"); do
   case "$param" in
      source)
         source="$(cat "$__object/parameter/source")"
--- a/cdist/conf/type/__consul/files/versions/1.2.3/cksum
+++ b/cdist/conf/type/__consul/files/versions/1.2.3/cksum
@ -1 +0,0 @@
-191982 110369685
--- a/cdist/conf/type/__consul/files/versions/1.2.3/source
+++ b/cdist/conf/type/__consul/files/versions/1.2.3/source
@ -1 +0,0 @@
-https://releases.hashicorp.com/consul/1.2.3/consul_1.2.3_linux_amd64.zip
--- a/cdist/conf/type/__consul/files/versions/1.3.0/cksum
+++ b/cdist/conf/type/__consul/files/versions/1.3.0/cksum
@ -1 +0,0 @@
-1714523667 98363467 consul
--- a/cdist/conf/type/__consul/files/versions/1.3.0/source
+++ b/cdist/conf/type/__consul/files/versions/1.3.0/source
@ -1 +0,0 @@
-https://releases.hashicorp.com/consul/1.3.0/consul_1.3.0_linux_amd64.zip
--- a/cdist/conf/type/__consul/files/versions/1.5.0/cksum
+++ b/cdist/conf/type/__consul/files/versions/1.5.0/cksum
@ -1 +0,0 @@
-886614099 103959898 consul
--- a/cdist/conf/type/__consul/files/versions/1.5.0/source
+++ b/cdist/conf/type/__consul/files/versions/1.5.0/source
@ -1 +0,0 @@
-https://releases.hashicorp.com/consul/1.5.0/consul_1.5.0_linux_amd64.zip
--- a/cdist/conf/type/__consul/gencode-remote
+++ b/cdist/conf/type/__consul/gencode-remote
@ -39,10 +39,10 @@ version_dir="$versions_dir/$version"

 source=$(cat "$version_dir/source")
 source_file_name="${source##*/}"
-cksum_should=$(cut -d' ' -f1,2 "$version_dir/cksum")
+cksum_should=$(cat "$version_dir/cksum" | cut -d' ' -f1,2)

 cat << eof
-    tmpdir=\$(mktemp -d -p /tmp "${__type##*/}.XXXXXXXXXX")
+    tmpdir=\$(mktemp -d --tmpdir="/tmp" "${__type##*/}.XXXXXXXXXX")
    curl -s -L "$source" > "\$tmpdir/$source_file_name"
    unzip -p "\$tmpdir/$source_file_name" > "${destination}.tmp"
    rm -rf "\$tmpdir"
--- a/cdist/conf/type/__consul/man.rst
+++ b/cdist/conf/type/__consul/man.rst
@ -40,11 +40,9 @@ MESSAGES
 If consul binary is created using __staged_file then underlaying __file type messages are emitted.

 If consul binary is created by direct method then the following messages are emitted:
-
 /usr/local/bin/consul created
    consul binary was created

-
 EXAMPLES
 --------

--- a/cdist/conf/type/__consul/manifest
+++ b/cdist/conf/type/__consul/manifest
@ -24,7 +24,7 @@
 os=$(cat "$__global/explorer/os")

 case "$os" in
-   alpine|scientific|centos|redhat|ubuntu|debian|devuan|archlinux|gentoo)
+   scientific|centos|redhat|ubuntu|debian|devuan|archlinux|gentoo)
      # any linux should work
      :
   ;;
@ -47,7 +47,6 @@ fi

 if [ -f "$__object/parameter/direct" ]; then
    __package unzip
-    __package curl
 else
    __staged_file /usr/local/bin/consul \
       --source "$(cat "$version_dir/source")" \
--- a/cdist/conf/type/__consul_agent/files/consul.sys-openrc
+++ b/cdist/conf/type/__consul_agent/files/consul.sys-openrc
@ -1,38 +0,0 @@
-#!/sbin/openrc-run
-# 2019 Nico Schottelius (nico-cdist at schottelius.org)
-
-description="consul agent"
-
-pidfile="${CONSUL_PIDFILE:-"/var/run/$RC_SVCNAME/pidfile"}"
-command="${CONSUL_BINARY:-"/usr/local/bin/consul"}"
-
-
-checkconfig() {
-	if [ ! -d /var/run/consul ] ; then
-		mkdir -p /var/run/consul || return 1
-        chown consul:consul /var/run/$NAME || return 1
-        chmod 2770 /var/run/$NAME || return 1
-	fi
-}
-
-start() {
-    need net
-
-    start-stop-daemon --start --quiet --oknodo \
-            --pidfile "$pidfile" --background \
-            --exec $command -- agent -pid-file="$pidfile" -config-dir /etc/consul/conf.d
-}
-start_pre() {
-	checkconfig
-}
-
-stop() {
-	if [ "${RC_CMD}" = "restart" ] ; then
-		checkconfig || return 1
-	fi
-
-	ebegin "Stopping $RC_SVCNAME"
-	start-stop-daemon --stop --exec "$command" \
-		--pidfile "$pidfile" --quiet
-	eend $?
-}
--- a/cdist/conf/type/__consul_agent/files/consul.sysv-debian
+++ b/cdist/conf/type/__consul_agent/files/consul.sysv-debian
@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# 2015-2018 Nico Schottelius (nico-cdist at schottelius.org)
+# 2015 Nico Schottelius (nico-cdist at schottelius.org)
 # 2015 Steven Armstrong (steven-cdist at armstrong.cc)
 #
 # This file is part of cdist.
@ -18,24 +18,11 @@
 # You should have received a copy of the GNU General Public License
 # along with cdist. If not, see <http://www.gnu.org/licenses/>.
 #
-### BEGIN INIT INFO
-# Provides:          consul
-# Required-Start:    $network $local_fs $remote_fs
-# Required-Stop:     $local_fs
-# Should-Start:
-# Should-Stop:
-# Short-Description: consul
-# Description:       consul agent
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-### END INIT INFO

 if [ -f "/etc/default/consul" ]; then
-    # shellcheck disable=SC1091
    . /etc/default/consul
 fi

-# shellcheck disable=SC1091
 . /lib/lsb/init-functions

 NAME=consul
--- a/cdist/conf/type/__consul_agent/files/consul.sysv-redhat
+++ b/cdist/conf/type/__consul_agent/files/consul.sysv-redhat
@ -11,52 +11,49 @@
 # pidfile: /var/run/consul/pidfile

 # Source function library.
-
-# shellcheck disable=SC1091
 . /etc/init.d/functions
 NAME=consul
 CONSUL=/usr/local/bin/consul
-CONFIG="/etc/$NAME/conf.d"
-PID_FILE="/var/run/$NAME/pidfile"
-LOG_FILE="/var/log/$NAME"
+CONFIG=/etc/$NAME/conf.d
+PID_FILE=/var/run/$NAME/pidfile
+LOG_FILE=/var/log/$NAME

-# shellcheck disable=SC1090
-[ -e "/etc/sysconfig/$NAME" ] && . "/etc/sysconfig/$NAME"
-export GOMAXPROCS="${GOMAXPROCS:-2}"
+[ -e /etc/sysconfig/$NAME ] && . /etc/sysconfig/$NAME
+export GOMAXPROCS=${GOMAXPROCS:-2}

-mkdir -p "/var/run/$NAME"
-chown consul:consul "/var/run/$NAME"
-chmod 2770 "/var/run/$NAME"
+mkdir -p /var/run/$NAME
+chown consul:consul /var/run/$NAME
+chmod 2770 /var/run/$NAME


 start() {
-   printf "Starting %s: " "$NAME"
+   echo -n "Starting $NAME: "
   daemon --user=consul \
      --pidfile="$PID_FILE" \
      "$CONSUL" agent -pid-file="$PID_FILE" -config-dir "$CONFIG" >> "$LOG_FILE" &
   retcode=$?
-   touch "/var/lock/subsys/$NAME"
-   return "$retcode"
+   touch /var/lock/subsys/$NAME
+   return $retcode
 }

 stop() {
-   printf "Shutting down %s: " "$NAME"
-   killproc -p "$PID_FILE" "$NAME"
+   echo -n "Shutting down $NAME: "
+   killproc -p "$PID_FILE" $NAME
   retcode=$?
-   rm -f "/var/lock/subsys/$NAME"
-   return "$retcode"
+   rm -f /var/lock/subsys/$NAME
+   return $retcode
 }

 case "$1" in
   start)
-      if status -p "$PID_FILE" "$NAME" >/dev/null; then
+      if $(status -p "$PID_FILE" $NAME >/dev/null); then
         echo "$NAME already running"
      else
         start
      fi
   ;;
   stop)
-      if status -p "$PID_FILE" "$NAME" >/dev/null; then
+      if $(status -p "$PID_FILE" $NAME >/dev/null); then
         stop
      else
         echo "$NAME not running"
@ -66,25 +63,25 @@ case "$1" in
      "$CONSUL" info
   ;;
   status)
-      status -p "$PID_FILE" "$NAME"
+      status -p "$PID_FILE" $NAME
      exit $?
   ;;
   restart)
-      if status -p "$PID_FILE" "$NAME" >/dev/null; then
+      if $(status -p "$PID_FILE" $NAME >/dev/null); then
         stop
      fi
      start
   ;;
   reload)
-      if status -p "$PID_FILE" "$NAME" >/dev/null; then
-         kill -HUP "$(cat "$PID_FILE")"
+      if $(status -p "$PID_FILE" $NAME >/dev/null); then
+         kill -HUP `cat $PID_FILE`
      else
         echo "$NAME not running"
      fi
   ;;
   condrestart)
-      if [ -f "/var/lock/subsys/$NAME" ]; then
-         if status -p "$PID_FILE" "$NAME" >/dev/null; then
+      if [ -f /var/lock/subsys/$NAME ]; then
+         if $(status -p "$PID_FILE" $NAME >/dev/null); then
            stop
         fi
         start
--- a/cdist/conf/type/__consul_agent/manifest
+++ b/cdist/conf/type/__consul_agent/manifest
@ -1,7 +1,7 @@
 #!/bin/sh -e
 #
 # 2015 Steven Armstrong (steven-cdist at armstrong.cc)
-# 2015-2019 Nico Schottelius (nico-cdist at schottelius.org)
+# 2015 Nico Schottelius (nico-cdist at schottelius.org)
 #
 # This file is part of cdist.
 #
@ -23,7 +23,7 @@
 os=$(cat "$__global/explorer/os")

 case "$os" in
-   alpine|scientific|centos|debian|devuan|redhat|ubuntu)
+   scientific|centos|debian|devuan|redhat|ubuntu)
      # whitelist safeguard
      :
   ;;
@ -66,7 +66,7 @@ require="__directory/etc/consul" \
   __directory "$conf_dir" \
      --owner root --group "$group" --mode 750 --state "$state"

-if [ -f "$__object/parameter/ca-file-source" ] || [ -f "$__object/parameter/cert-file-source" ] || [ -f "$__object/parameter/key-file-source" ]; then
+if [ -f "$__object/parameter/ca-file-source" -o -f "$__object/parameter/cert-file-source" -o -f "$__object/parameter/key-file-source" ]; then
   # create directory for ssl certs
   require="__directory/etc/consul" \
      __directory /etc/consul/ssl \
@ -84,8 +84,7 @@ echo "{"
 # parameters we define ourself
 printf '   "data_dir": "%s"\n' "$data_dir"

-cd "$__object/parameter/"
-for param in *; do
+for param in $(ls "$__object/parameter/"); do
   case "$param" in
      state|user|group|json-config) continue ;;
      ca-file-source|cert-file-source|key-file-source)
@ -181,25 +180,22 @@ init_upstart()

 # Install init script to start on boot
 case "$os" in
-    devuan)
-        init_sysvinit debian
-        ;;
-    centos|redhat)
-        os_version="$(sed 's/[^0-9.]//g' "$__global/explorer/os_version")"
-        major_version="${os_version%%.*}"
-        case "$major_version" in
-            [456])
-                init_sysvinit redhat
-                ;;
-            7)
-                init_systemd
-                ;;
-            *)
-                echo "Unsupported CentOS/Redhat version: $os_version" >&2
-                exit 1
-                ;;
-        esac
-        ;;
+   centos|redhat)
+      os_version="$(sed 's/[^0-9.]//g' "$__global/explorer/os_version")"
+      major_version="${os_version%%.*}"
+      case "$major_version" in
+         [456])
+            init_sysvinit redhat
+         ;;
+         7)
+            init_systemd
+         ;;
+         *)
+            echo "Unsupported CentOS/Redhat version: $os_version" >&2
+            exit 1
+         ;;
+      esac
+   ;;

    debian)
        os_version=$(cat "$__global/explorer/os_version")
@ -209,7 +205,7 @@ case "$os" in
            [567])
                init_sysvinit debian
            ;;
-            [89])
+            8)
                init_systemd
            ;;
            *)
@ -217,9 +213,13 @@ case "$os" in
                exit 1
            ;;
        esac
-        ;;
+    ;;
+
+    devuan)
+        init_sysvinit debian
+    ;;

    ubuntu)
        init_upstart
-        ;;
+    ;;
 esac
--- a/cdist/conf/type/__consul_check/manifest
+++ b/cdist/conf/type/__consul_check/manifest
@ -40,7 +40,7 @@ if [ ! -f "$__object/parameter/interval" ]; then
      fi
   done
 fi
-if [ -f "$__object/parameter/docker-container-id" ] && [ ! -f "$__object/parameter/script" ]; then
+if [ -f "$__object/parameter/docker-container-id" -a ! -f "$__object/parameter/script" ]; then
   echo "When using --docker-container-id you must also define --script." >&2
   exit 1
 fi
@ -50,8 +50,7 @@ fi
 echo "{"
 printf '   "check": {\n'
 printf '      "name": "%s"\n' "$name"
-cd "$__object/parameter/"
-for param in *; do
+for param in $(ls "$__object/parameter/"); do
   case "$param" in
      state|name) continue ;;
      *)
--- a/cdist/conf/type/__consul_service/manifest
+++ b/cdist/conf/type/__consul_service/manifest
@ -24,15 +24,15 @@ conf_file="service_${name}.json"
 state="$(cat "$__object/parameter/state")"

 # Sanity checks
-if [ -f "$__object/parameter/check-script" ] && [ -f "$__object/parameter/check-ttl" ]; then
+if [ -f "$__object/parameter/check-script" -a -f "$__object/parameter/check-ttl" ]; then
   echo "Use either --check-script together with --check-interval OR --check-ttl, but not both" >&2
   exit 1
 fi
-if [ -f "$__object/parameter/check-script" ] && [ ! -f "$__object/parameter/check-interval" ]; then
+if [ -f "$__object/parameter/check-script" -a ! -f "$__object/parameter/check-interval" ]; then
   echo "When using --check-script you must also define --check-interval" >&2
   exit 1
 fi
-if [ -f "$__object/parameter/check-http" ] && [ ! -f "$__object/parameter/check-interval" ]; then
+if [ -f "$__object/parameter/check-http" -a ! -f "$__object/parameter/check-interval" ]; then
   echo "When using --check-http you must also define --check-interval" >&2
   exit 1
 fi
@ -42,8 +42,7 @@ fi
 echo "{"
 printf '   "service": {\n'
 printf '      "name": "%s"\n' "$name"
-cd "$__object/parameter/"
-for param in *; do
+for param in $(ls "$__object/parameter/"); do
   case "$param" in
      state|name|check-interval) continue ;;
      check-script)
--- a/cdist/conf/type/__consul_template/files/consul-template.sysv
+++ b/cdist/conf/type/__consul_template/files/consul-template.sysv
@ -10,75 +10,72 @@
 # pidfile: /var/run/consul-template/pidfile

 # Source function library.
-
-# shellcheck disable=SC1091
 . /etc/init.d/functions
 NAME=consul-template
 CONSUL_TEMPLATE=/usr/local/bin/consul-template
-CONFIG="/etc/$NAME/conf.d"
-PID_FILE="/var/run/$NAME/pidfile"
-LOG_FILE="/var/log/$NAME"
+CONFIG=/etc/$NAME/conf.d
+PID_FILE=/var/run/$NAME/pidfile
+LOG_FILE=/var/log/$NAME

-# shellcheck disable=SC1090
-[ -e "/etc/sysconfig/$NAME" ] && . "/etc/sysconfig/$NAME"
-export CONSUL_TEMPLATE_LOG="${CONSUL_TEMPLATE_LOG:-info}"
-export GOMAXPROCS="${GOMAXPROCS:-2}"
+[ -e /etc/sysconfig/$NAME ] && . /etc/sysconfig/$NAME
+export CONSUL_TEMPLATE_LOG=${CONSUL_TEMPLATE_LOG:-info}
+export GOMAXPROCS=${GOMAXPROCS:-2}

-mkdir -p "/var/run/$NAME"
+mkdir -p /var/run/$NAME

 start() {
-   printf "Starting %s: " "$NAME"
+   echo -n "Starting $NAME: "
   daemon --pidfile="$PID_FILE" \
      "$CONSUL_TEMPLATE" -config "$CONFIG" >> "$LOG_FILE" 2>&1 &
-   echo "$!" > "$PID_FILE"
+   echo $! > "$PID_FILE"
   retcode=$?
-   touch "/var/lock/subsys/$NAME"
-   return "$retcode"
+   touch /var/lock/subsys/$NAME
+   return $retcode
 }

 stop() {
-   printf "Shutting down %s: " "$NAME"
-   killproc -p "$PID_FILE" "$CONSUL_TEMPLATE"
+   echo -n "Shutting down $NAME: "
+   killproc -p $PID_FILE $CONSUL_TEMPLATE
   retcode=$?
-   rm -f "/var/lock/subsys/$NAME"
-   return "$retcode"
+   rm -f /var/lock/subsys/$NAME
+   return $retcode
 }

 case "$1" in
   start)
-      if status -p "$PID_FILE" "$NAME" >/dev/null; then
+      if $(status -p "$PID_FILE" $NAME >/dev/null); then
         echo "$NAME already running"
      else
         start
      fi
   ;;
   stop)
-      if status -p "$PID_FILE" "$NAME" >/dev/null; then
+      if $(status -p "$PID_FILE" $NAME >/dev/null); then
         stop
      else
         echo "$NAME not running"
      fi
   ;;
   status)
-      status -p "$PID_FILE" "$NAME"
+      status -p "$PID_FILE" $NAME
      exit $?
   ;;
   restart)
-      if status -p "$PID_FILE" "$NAME" >/dev/null; then
+      if $(status -p "$PID_FILE" $NAME >/dev/null); then
         stop
      fi
      start
   ;;
   reload)
-      if status -p "$PID_FILE" "$NAME" >/dev/null; then
-          kill -HUP "$(cat "$PID_FILE")"
+      if $(status -p "$PID_FILE" $NAME >/dev/null); then
+         kill -HUP `cat $PID_FILE`
      else
         echo "$NAME not running"
      fi
   ;;
   condrestart)
-      if [ -f "/var/lock/subsys/$NAME" ]; then
-         if status -p "$PID_FILE" "$NAME" >/dev/null; then
+      if [ -f /var/lock/subsys/$NAME ]; then
+         if $(status -p "$PID_FILE" $NAME >/dev/null); then
            stop
         fi
         start
--- a/cdist/conf/type/__consul_template/manifest
+++ b/cdist/conf/type/__consul_template/manifest
@ -75,8 +75,7 @@ require="__directory/etc/consul-template" \

 # Generate hcl config file
 (
-cd "$__object/parameter/"
-for param in *; do
+for param in $(ls "$__object/parameter/"); do
   case "$param" in
      auth-password|state|ssl-*|syslog-*|version|vault-token|vault-ssl*) continue ;;
      auth-username)
--- a/cdist/conf/type/__consul_template_template/manifest
+++ b/cdist/conf/type/__consul_template_template/manifest
@ -26,36 +26,32 @@ template_dir="/etc/consul-template/template"
 require=""

 # Sanity checks
-if [ -f "$__object/parameter/source" ] && [ -f "$__object/parameter/source-file" ]; then
+if [ -f "$__object/parameter/source" -a -f "$__object/parameter/source-file" ]; then
   echo "Use either --source OR --source-file, but not both." >&2
   exit 1
 fi
-if [ ! -f "$__object/parameter/source" ] && [ ! -f "$__object/parameter/source-file" ]; then
+if [ ! -f "$__object/parameter/source" -a ! -f "$__object/parameter/source-file" ]; then
   echo "Either --source OR --source-file must be given." >&2
   exit 1
 fi

-if [ -f "$__object/parameter/source-file" ]; then
-    destination="${template_dir}/${name}"
-    require="__file${destination}"
-fi
-
 # Generate hcl config file
-{
+(
 printf 'template {\n'
-cd "$__object/parameter/"
-for param in *; do
+for param in $(ls "$__object/parameter/"); do
   case "$param" in
      source-file)
         source="$(cat "$__object/parameter/$param")"
         if [ "$source" = "-" ]; then
            source="$__object/stdin"
         fi
+         destination="${template_dir}/${name}"
         require="__directory${template_dir}" \
            __file "$destination" \
               --owner root --group root --mode 640 \
               --source "$source" \
               --state "$state"
+         export require="__file${destination}"
         printf '   source = "%s"\n' "$destination"

      ;;
@ -69,7 +65,7 @@ for param in *; do
   esac
 done
 printf '}\n'
-} | \
+) | \
 require="$require __directory${conf_dir}" \
   __config_file "${conf_dir}/${conf_file}" \
      --owner root --group root --mode 640 \
--- a/cdist/conf/type/__consul_watch_checks/manifest
+++ b/cdist/conf/type/__consul_watch_checks/manifest
@ -25,7 +25,7 @@ conf_file="watch_${watch_type}_${__object_id}.json"
 state="$(cat "$__object/parameter/state")"

 # Sanity checks
-if [ -f "$__object/parameter/filter-service" ] && [ -f "$__object/parameter/filter-state" ]; then
+if [ -f "$__object/parameter/filter-service" -a -f "$__object/parameter/filter-state" ]; then
   echo "Use either --filter-service or --filter-state but not both." >&2
   exit 1
 fi
@ -35,8 +35,7 @@ fi
 echo "{"
 printf '   "watches": [{\n'
 printf '      "type": "%s"\n' "$watch_type"
-cd "$__object/parameter/"
-for param in *; do
+for param in $(ls "$__object/parameter/"); do
   case "$param" in
      state) continue ;;
      filter-*)
--- a/cdist/conf/type/__consul_watch_event/manifest
+++ b/cdist/conf/type/__consul_watch_event/manifest
@ -29,8 +29,7 @@ state="$(cat "$__object/parameter/state")"
 echo "{"
 printf '   "watches": [{\n'
 printf '      "type": "%s"\n' "$watch_type"
-cd "$__object/parameter/"
-for param in *; do
+for param in $(ls "$__object/parameter/"); do
   case "$param" in
      state) continue ;;
      *)
--- a/cdist/conf/type/__consul_watch_key/manifest
+++ b/cdist/conf/type/__consul_watch_key/manifest
@ -29,8 +29,7 @@ state="$(cat "$__object/parameter/state")"
 echo "{"
 printf '   "watches": [{\n'
 printf '      "type": "%s"\n' "$watch_type"
-cd "$__object/parameter/"
-for param in *; do
+for param in $(ls "$__object/parameter/"); do
   case "$param" in
      state) continue ;;
      *)
--- a/cdist/conf/type/__consul_watch_keyprefix/manifest
+++ b/cdist/conf/type/__consul_watch_keyprefix/manifest
@ -29,8 +29,7 @@ state="$(cat "$__object/parameter/state")"
 echo "{"
 printf '   "watches": [{\n'
 printf '      "type": "%s"\n' "$watch_type"
-cd "$__object/parameter/"
-for param in *; do
+for param in $(ls "$__object/parameter/"); do
   case "$param" in
      state) continue ;;
      *)
--- a/cdist/conf/type/__consul_watch_nodes/manifest
+++ b/cdist/conf/type/__consul_watch_nodes/manifest
@ -29,8 +29,7 @@ state="$(cat "$__object/parameter/state")"
 echo "{"
 printf '   "watches": [{\n'
 printf '      "type": "%s"\n' "$watch_type"
-cd "$__object/parameter/"
-for param in *; do
+for param in $(ls "$__object/parameter/"); do
   case "$param" in
      state) continue ;;
      *)
--- a/cdist/conf/type/__consul_watch_service/manifest
+++ b/cdist/conf/type/__consul_watch_service/manifest
@ -29,8 +29,7 @@ state="$(cat "$__object/parameter/state")"
 echo "{"
 printf '   "watches": [{\n'
 printf '      "type": "%s"\n' "$watch_type"
-cd "$__object/parameter/"
-for param in *; do
+for param in $(ls "$__object/parameter/"); do
   case "$param" in
      state) continue ;;
      passingonly)
--- a/cdist/conf/type/__consul_watch_services/manifest
+++ b/cdist/conf/type/__consul_watch_services/manifest
@ -29,8 +29,7 @@ state="$(cat "$__object/parameter/state")"
 echo "{"
 printf '   "watches": [{\n'
 printf '      "type": "%s"\n' "$watch_type"
-cd "$__object/parameter/"
-for param in *; do
+for param in $(ls "$__object/parameter/"); do
   case "$param" in
      state) continue ;;
      *)
--- a/cdist/conf/type/__cron/explorer/entry
+++ b/cdist/conf/type/__cron/explorer/entry
@ -24,7 +24,7 @@ user="$(cat "$__object/parameter/user")"

 if [ -f "$__object/parameter/raw_command" ]; then
    command="$(cat "$__object/parameter/command")"
-    crontab -u "$user" -l 2>/dev/null | grep "^$command\$" || true
+    crontab -u $user -l 2>/dev/null | grep "^$command\$" || true
 else
-    crontab -u "$user" -l 2>/dev/null | grep "# $name\$" || true
+    crontab -u $user -l 2>/dev/null | grep "# $name\$" || true
 fi
--- a/cdist/conf/type/__cron/gencode-remote
+++ b/cdist/conf/type/__cron/gencode-remote
@ -58,7 +58,7 @@ state_should="$(cat "$__object/parameter/state" 2>/dev/null || echo "present")"
 # These are the old markers
 prefix="#cdist:__cron/$__object_id"
 suffix="#/cdist:__cron/$__object_id"
-filter='^# DO NOT EDIT THIS FILE|^# \(.* installed on |^# \(Cron version V|^# \(Cronie version .\..\)$'
+filter="^# DO NOT EDIT THIS FILE|^# \(.* installed on |^# \(Cron version V|^# \(Cronie version .\..\)$"
 cat << DONE
 crontab -u $user -l 2>/dev/null | grep -v -E "$filter" | awk -v prefix="$prefix" -v suffix="$suffix" '
 {
--- a/cdist/conf/type/__daemontools/files/init.d-svscan
+++ b/cdist/conf/type/__daemontools/files/init.d-svscan
@ -23,9 +23,9 @@ fi

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

-__package "$pkg"
-__directory "$servicedir" --mode 700
+__package $pkg
+__directory $servicedir --mode 700

 os=$(cat "$__global/explorer/os")
 init=$(cat "$__global/explorer/init")

-require=""
 case $os in
 	freebsd)
 		# TODO change to __start_on_boot once it supports freebsd
--- a/cdist/conf/type/__daemontools_service/explorer/svc
+++ b/cdist/conf/type/__daemontools_service/explorer/svc
@ -1,2 +1 @@
-#!/bin/sh
 command -v svc || true
--- a/cdist/conf/type/__daemontools_service/manifest
+++ b/cdist/conf/type/__daemontools_service/manifest
@ -25,14 +25,14 @@ badusage() {
 [ -z "$run$runfile" ] && badusage
 [ -n "$run" ] && [ -n "$runfile" ] && badusage

-__directory "$servicedir/$name/log/main" --parents
+__directory $servicedir/$name/log/main --parents

 echo "$RUN_PREFIX$run" | require="__directory/$servicedir/$name/log/main" __config_file "$servicedir/$name/run" \
 	--onchange "svc -t '$servicedir/$name' 2>/dev/null" \
 	--mode 755 \
 	--source "${runfile:--}"

-echo "$RUN_PREFIX$logrun" | require="__directory/$servicedir/$name/log/main" __config_file "$servicedir/$name/log/run" \
+echo "$RUN_PREFIX$logrun" | require="__directory/$servicedir/$name/log/main" __config_file $servicedir/$name/log/run \
 	--onchange "svc -t '$servicedir/$name/log' 2>/dev/null" \
 	--mode 755 \
 	--source "-"
--- a/cdist/conf/type/__directory/explorer/stat
+++ b/cdist/conf/type/__directory/explorer/stat
@ -25,51 +25,23 @@ destination="/$__object_id"

 os=$("$__explorer/os")
 case "$os" in
-   "freebsd"|"netbsd"|"openbsd"|"macosx")
-      stat -f "type: %HT
+   "freebsd"|"netbsd"|"openbsd")
+      # FIXME: should be something like this based on man page, but can not test
+      stat -f "type: %ST
 owner: %Du %Su
 group: %Dg %Sg
-mode: %Lp %Sp
-" "$destination" | awk '/^type/ { print tolower($0); next; } { print; }'
-      ;;
-   alpine)
-      stat -c "type: %F
-owner: %u %U
-group: %g %G
-mode: %a %A
+mode: %Op %Sp
 " "$destination"
-      ;;
-    solaris)
-        ls1="$( ls -ld "$destination" )"
-        ls2="$( ls -ldn "$destination" )"
-
-        if [ -f "$__object/parameter/mode" ]
-        then mode_should="$( cat "$__object/parameter/mode" )"
-        fi
-
-        # yes, it is ugly hack, but if you know better way...
-        if [ -z "$( find "$destination" -perm "$mode_should" )" ]
-        then octets=888
-        else octets="$( echo "$mode_should" | sed 's/^0//' )"
-        fi
-
-        case "$( echo "$ls1" | cut -c1-1 )" in
-            -) echo 'type: regular file' ;;
-            d) echo 'type: directory' ;;
-        esac
-
-        echo "owner: $( echo "$ls2" \
-            | awk '{print $3}' ) $( echo "$ls1" \
-                | awk '{print $3}' )"
-
-        echo "group: $( echo "$ls2" \
-            | awk '{print $4}' ) $( echo "$ls1" \
-                | awk '{print $4}' )"
-
-        echo "mode: $octets $( echo "$ls1" | awk '{print $1}' )"
+   ;;
+    "macosx")
+       stat -f "type: %HT
+ owner: %Du %Su
+ group: %Dg %Sg
+ mode: %Lp %Sp
+ " "$destination"
    ;;
   *)
-       stat --printf="type: %F
+      stat --printf="type: %F
 owner: %u %U
 group: %g %G
 mode: %a %A
--- a/cdist/conf/type/__directory/gencode-remote
+++ b/cdist/conf/type/__directory/gencode-remote
@ -57,18 +57,18 @@ get_current_value() {
 }

 set_group() {
-    echo "chgrp $recursive '$1' '$destination'"
-    echo "chgrp $recursive '$1'" >> "$__messages_out"
+    echo chgrp $recursive \"$1\" \"$destination\"
+    echo chgrp $recursive $1 >> "$__messages_out"
 }

 set_owner() {
-    echo "chown $recursive '$1' '$destination'"
-    echo "chown $recursive '$1'" >> "$__messages_out"
+    echo chown $recursive \"$1\" \"$destination\"
+    echo chown $recursive $1 >> "$__messages_out"
 }

 set_mode() {
-    echo "chmod $recursive '$1' '$destination'"
-    echo "chmod $recursive '$1'" >> "$__messages_out"
+    echo chmod $recursive \"$1\" \"$destination\"
+    echo chmod $recursive $1 >> "$__messages_out"
 }

 case "$state_should" in
@ -78,10 +78,10 @@ case "$state_should" in
         if [ "$type" != "none" ]; then
            # our destination is not a directory, remove whatever is there
            # and then create our directory and set all attributes
-            echo "rm -f '$destination'"
+            echo rm -f "\"$destination\""
            echo "remove non directory" >> "$__messages_out"
         fi
-         echo "mkdir $mkdiropt '$destination'"
+         echo "mkdir $mkdiropt \"$destination\""
         echo "create" >> "$__messages_out"
      fi

@ -94,7 +94,7 @@ case "$state_should" in

            # change 0xxx format to xxx format => same as stat returns
            if [ "$attribute" = mode ]; then
-                value_should="$(echo "$value_should" | sed 's/^0\(...\)/\1/')"
+                value_should="$(echo $value_should | sed 's/^0\(...\)/\1/')"
            fi

            if [ "$set_attributes" = 1 ] || [ "$value_should" != "$value_is" ]; then
@ -105,7 +105,7 @@ case "$state_should" in
   ;;
   absent)
        if [ "$type" = "directory" ]; then
-            echo "rm -rf '$destination'"
+            echo rm -rf \"$destination\"
            echo remove >> "$__messages_out"
        fi
   ;;
--- a/cdist/conf/type/__docker/man.rst
+++ b/cdist/conf/type/__docker/man.rst
@ -3,12 +3,12 @@ cdist-type__docker(7)

 NAME
 ----
-cdist-type__docker - install Docker CE
+cdist-type__docker - install docker-engine


 DESCRIPTION
 -----------
-Installs latest Docker Community Edition package.
+Installs latest docker-engine package from dockerproject.org.


 REQUIRED PARAMETERS
@ -18,16 +18,16 @@ None.

 OPTIONAL PARAMETERS
 -------------------
-state
-   'present' or 'absent', defaults to 'present'
-version
-   The specific version to install. Defaults to the special value 'latest',
-   meaning the version the package manager will install by default.
+None.


 BOOLEAN PARAMETERS
 ------------------
-None.
+experimental
+   Install the experimental docker-engine package instead of the latest stable release.
+
+state
+   'present' or 'absent', defaults to 'present'


 EXAMPLES
@ -38,11 +38,12 @@ EXAMPLES
    # Install docker
    __docker

+    # Install experimental
+    __docker --experimental
+
    # Remove docker
    __docker --state absent

-    # Install specific version
-    __docker --state present --version 18.03.0.ce

 AUTHORS
 -------
--- a/Show more
+++ b/Show more
				`@ -1 +0,0 @@`
				`https://releases.hashicorp.com/consul/1.2.3/consul_1.2.3_linux_amd64.zip`