.gitignore

@@ -24,8 +24,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 +34,7 @@ cdist/inventory/
 # Python: cache, distutils, distribution in general
 __pycache__/
 *.pyc
-/MANIFEST
+MANIFEST
 dist/
 cdist/version.py
 cdist.egg-info/

.gitlab-ci.yml

@@ -1,20 +0,0 @@
-stages:
-    - test
-
-image: code.ungleich.ch:5050/ungleich-public/cdist/cdist-ci:latest
-
-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

LICENSE

@@ -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>.

Makefile

@@ -31,9 +31,9 @@ help:
 	@echo "docs-clean      clean documentation"
 	@echo "clean           clean"
 
-DOCS_SRC_DIR=./docs/src
+DOCS_SRC_DIR=docs/src
-SPEECHDIR=./docs/speeches
+SPEECHDIR=docs/speeches
-TYPEDIR=./cdist/conf/type
+TYPEDIR=cdist/conf/type
 
 SPHINXM=make -C $(DOCS_SRC_DIR) man
 SPHINXH=make -C $(DOCS_SRC_DIR) html
@@ -63,18 +63,6 @@ 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; \
@@ -84,7 +72,7 @@ version:
 man: version $(MANTYPES) $(DOCSREF)
 	$(SPHINXM)
 
-html: version configskel $(MANTYPES) $(DOCSREF) $(DOCSTYPESREF)
+html: version $(MANTYPES) $(DOCSREF)
 	$(SPHINXH)
 
 docs: man html
@@ -126,8 +114,6 @@ speeches: $(SPEECHES)
 #
 clean: docs-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

bin/build-helper

@@ -74,7 +74,6 @@ 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%/*}/../"
@@ -370,7 +369,7 @@ eof
         cat << eof
 Manual steps post release:
     - cdist-web
-    - send generated mailinglist.tmp mail
+    - send mail body generated in mailinglist.tmp and inform Dmitry for deb
     - twitter
 eof
     ;;
@@ -406,7 +405,7 @@ eof
     ;;
 
     pycodestyle|pep8)
-        pycodestyle "${basedir}" "${basedir}/scripts/cdist"
+        pycodestyle "${basedir}" "${basedir}/scripts/cdist" | less
     ;;
 
     check-pycodestyle)
@@ -432,67 +431,53 @@ eof
     ;;
 
     shellcheck-global-explorers)
-        # shellcheck disable=SC2086
+        find cdist/conf/explorer -type f -exec ${SHELLCHECKCMD} {} + | grep -v "${SHELLCHECK_SKIP}" || exit 0
-        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}" || exit 0
-        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}" || exit 0
-        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}" || exit 0
-        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}" || exit 0
-        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 || exit 0
-        ${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-local-gencodes
-        "$0" shellcheck-remote-gencodes || exit 1
+        "$0" shellcheck-remote-gencodes
     ;;
 
     shellcheck-types)
-        "$0" shellcheck-type-explorers || exit 1
+        "$0" shellcheck-type-explorers
-        "$0" shellcheck-manifests || exit 1
+        "$0" shellcheck-manifests
-        "$0" shellcheck-gencodes || exit 1
+        "$0" shellcheck-gencodes
     ;;
 
     shellcheck)
-        "$0" shellcheck-global-explorers || exit 1
+        "$0" shellcheck-global-explorers
-        "$0" shellcheck-types || exit 1
+        "$0" shellcheck-types
-        "$0" shellcheck-scripts || exit 1
+        "$0" shellcheck-scripts
     ;;
 
     shellcheck-type-files)
-        # shellcheck disable=SC2086
+        find cdist/conf/type -type f -path "*/files/*" -exec ${SHELLCHECKCMD} {} + | grep -v "${SHELLCHECK_SKIP}" || exit 0
-        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
-        "$0" shellcheck-type-files || exit 1
+        "$0" shellcheck-type-files
     ;;
 
     shellcheck-build-helper)
@@ -550,7 +535,6 @@ eof
 
         # Temp files
         rm -f ./*.tmp
-        rm -f ./.*.tmp
     ;;
 
     distclean)

cdist/argparse.py

@@ -5,8 +5,6 @@ import logging
 import collections
 import functools
 import cdist.configuration
-import cdist.preos
-import cdist.info
 
 
 # set of beta sub-commands
@@ -22,7 +20,6 @@ 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.'),
@@ -425,9 +422,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 +431,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
 

cdist/conf/explorer/disks

@@ -1,67 +1,27 @@
-#!/bin/sh -e
+#!/bin/sh
-#
-# based on previous work by other people, modified by:
-# 2020 Dennis Camera <dennis.camera at ssrq-sds-fds.ch>
-#
-# 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/>.
-#
-# Finds disks of the system (excl. ram disks, floppy, cdrom)
 
 uname_s="$(uname -s)"
 
-case $uname_s in
+case "${uname_s}" in
     FreeBSD)
         sysctl -n kern.disks
     ;;
-    OpenBSD)
+    OpenBSD|NetBSD)
-        sysctl -n hw.disknames | grep -Eo '[lsw]d[0-9]+'
+        sysctl -n hw.disknames | grep -Eo '[lsw]d[0-9]+' | xargs
-    ;;
-    NetBSD)
-        PATH="${PATH}:/usr/local/sbin:/usr/sbin:/sbin"
-        sysctl -n hw.disknames \
-        | awk 'BEGIN { RS = " " } /^[lsw]d[0-9]+/'
     ;;
     Linux)
-        # list of major device numbers toexclude:
+        if command -v lsblk > /dev/null
-        #  ram disks, floppies, cdroms
+        then
+            # exclude ram disks, floppies and cdroms
             # https://www.kernel.org/doc/Documentation/admin-guide/devices.txt
-        ign_majors='1 2 11'
+            lsblk -e 1,2,11 -dno name | xargs
-
-        if command -v lsblk >/dev/null 2>&1
-        then
-            lsblk -e "$(echo "$ign_majors" | tr ' ' ',')" -dno name
-        elif test -d /sys/block/
-        then
-            # shellcheck disable=SC2012
-            ls -1 /sys/block/ \
-            | awk -v ign_majors="$(echo "$ign_majors" | tr ' ' '|')" '
-                {
-                  devfile = "/sys/block/" $0 "/dev"
-                  getline devno < devfile
-                  close(devfile)
-                  if (devno !~ "^(" ign_majors "):") print
-                }'
         else
-            echo "Don't know how to list disks on Linux without lsblk and sysfs." >&2
+            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
-            echo 'If you can, please submit a patch.'>&2
         fi
     ;;
     *)
-        printf "Don't know how to list disks for %s operating system.\n" "${uname_s}" >&2
+        printf "Don't know how to list disks for %s operating system, if you can please submit a patch\n" "${uname_s}" >&2
-        printf 'If you can please submit a patch\n' >&2
     ;;
-esac \
+esac
-| xargs
+
+exit 0

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
+if command -v uname >/dev/null; then
-then
-	hostname
-else
    uname -n
 fi

cdist/conf/explorer/init

@@ -1,8 +1,7 @@
-#!/bin/sh -e
+#!/bin/sh
 #
 # 2016 Daniel Heule (hda at sfs.biz)
 # Copyright 2017, Philippe Gregoire <pg@pgregoire.xyz>
-# 2020 Dennis Camera (dennis.camera at ssrq-sds-fds.ch)
 #
 # This file is part of cdist.
 #
@@ -20,423 +19,21 @@
 # along with cdist. If not, see <http://www.gnu.org/licenses/>.
 #
 #
-# Returns the name of the init system (PID 1)
+# Returns the process name of pid 1 ( normaly the init system )
-
+# for example at linux this value is "init" or "systemd" in most cases
-# Expected values:
-# Linux:
-#  Adélie Linux:
-#    sysvinit+openrc
-#  Alpine Linux:
-#    busybox-init+openrc
-#  ArchLinux:
-#    systemd, sysvinit
-#  CRUX:
-#    sysvinit
-#  Debian:
-#    systemd, upstart, sysvinit, openrc, ???
-#  Devuan:
-#    sysvinit, sysvinit+openrc
-#  Gentoo:
-#    sysvinit+openrc, openrc-init, systemd
-#  OpenBMC:
-#    systemd
-#  OpenWrt:
-#    procd, init???
-#  RedHat (RHEL, CentOS, Fedora, RedHat Linux, ...):
-#    systemd, upstart, upstart-legacy, sysvinit
-#  Slackware:
-#    sysvinit
-#  SuSE:
-#    systemd, sysvinit
-#  Ubuntu:
-#    systemd, upstart, upstart-legacy, sysvinit
-#  VoidLinux:
-#    runit
 #
-# GNU:
-#   Debian:
-#     sysvinit, hurd-init
-#
-# BSD:
-#  {Free,Open,Net}BSD:
-#    init
-#
-# Mac OS X:
-#   launchd, init+SystemStarter
-#
-# Solaris/Illumos:
-#   smf, init???
 
-# NOTE: init systems can be stacked. This is popular to run OpenRC on top of
+uname_s="$(uname -s)"
-# sysvinit (Gentoo) or busybox-init (Alpine), but can also be used to run runit
-# as a systemd service.  This makes init system detection very complicated
-# (which result is expected?)  This script tries to untangle some combinations,
-# OpenRC on top of sysv or busybox (X+openrc), but will ignore others (runit as
-# a systemd service)
 
-# NOTE: When we have no idea, nothing will be printed!
+case "$uname_s" in
-
-# NOTE:
-# When trying to gather information about the init system make sure to do so
-# without calling the binary!   On some systems this triggers a reinitialisation
-# of the system which we don't want (e.g. embedded systems).
-
-
-set -e
-
-KERNEL_NAME=$(uname -s)
-
-KNOWN_INIT_SYSTEMS=$(cat <<EOF
-systemd
-sysvinit
-upstart
-runit
-procd
-smf
-launchd
-init
-hurd_init
-systemstarter
-EOF
-)
-
-
-common_candidates_by_kernel() {
-	case $KERNEL_NAME
-	in
-		FreeBSD|NetBSD|OpenBSD)
-			echo init
-			;;
     Linux)
-			echo systemd
+        (pgrep -P0 -l | awk '/^1[ \t]/ {print $2;}') || true
-			echo sysvinit
-			echo upstart
     ;;
-		GNU)
+    FreeBSD|OpenBSD)
-			echo sysvinit
+        ps -o comm= -p 1 || true
-			echo hurd-init
-			;;
-		Darwin)
-			echo launchd
-			echo systemstarter
-			;;
-		SunOS)
-			echo smf
-			;;
-	esac
-}
-
-
-## Helpers
-
-trim() {
-	sed -e 's/^[[:blank:]]*//' -e 's/[[:blank:]]*$//' -e '/^[[:blank:]]*$/d'
-}
-
-unique() {
-	# Delete duplicate lines (keeping input order)
-	# NOTE: Solaris AWK breaks without if/print construct.
-	awk '{ if (!x[$0]++) print }'
-}
-
-
-## Check functions
-# These functions are used to verify if a guess is correct by checking some
-# common property of a running system (presence of a directory in /run etc.)
-
-check_busybox_init() (
-	busybox_path=${1:-/bin/busybox}
-	test -x "${busybox_path}" || return 1
-	grep -q 'BusyBox v[0-9]' "${busybox_path}" || return 1
-
-	# It is quite common to use Busybox init to stack other init systemd
-	# (like OpenRC) on top of it. So we check for that, too.
-	if stacked=$(check_openrc)
-	then
-		echo "busybox-init+${stacked}"
-	else
-		echo busybox-init
-	fi
-)
-
-check_hurd_init() (
-	init_exe=${1:-/hurd/init}
-	test -x "${init_exe}" || return 1
-	grep -q 'GNU Hurd' "${init_exe}" || return 1
-	echo hurd-init
-)
-
-check_init() {
-	# Checks for various BSD inits...
-	test -x /sbin/init || return 1
-
-	if grep -q -E '(Free|Net|Open)BSD' /sbin/init
-	then
-		echo init
-		return 0
-	fi
-}
-
-check_launchd() {
-	command -v launchctl >/dev/null 2>&1 || return 1
-	launchctl getenv PATH >/dev/null || return 1
-	echo launchd
-}
-
-check_openrc() {
-	test -f /run/openrc/softlevel || return 1
-	echo openrc
-}
-
-check_procd() (
-	procd_path=${1:-/sbin/procd}
-	test -x "${procd_path}" || return 1
-	grep -q 'procd' "${procd_path}" || return 1
-	echo procd
-)
-
-check_runit() {
-	test -d /run/runit || return 1
-	echo runit
-}
-
-check_smf() {
-	# XXX: Is this the correct way??
-	test -f /etc/svc/volatile/svc_nonpersist.db || return 1
-	echo smf
-}
-
-check_systemd() {
-	# NOTE: sd_booted(3)
-	test -d /run/systemd/system/ || return 1
-	# systemctl --version | sed -e '/^systemd/!d;s/^systemd //'
-	echo systemd
-}
-
-check_systemstarter() {
-	test -d /System/Library/StartupItems/ || return 1
-	test -f /System/Library/StartupItems/LoginWindow/StartupParameters.plist || return 1
-	echo init+SystemStarter
-}
-
-check_sysvinit() (
-	init_path=${1:-/sbin/init}
-	test -x "${init_path}" || return 1
-	grep -q 'INIT_VERSION=sysvinit-[0-9.]*' "${init_path}" || return 1
-
-	# It is quite common to use SysVinit to stack other init systemd
-	# (like OpenRC) on top of it. So we check for that, too.
-	if stacked=$(check_openrc)
-	then
-		echo "sysvinit+${stacked}"
-	else
-		echo sysvinit
-	fi
-	unset stacked
-)
-
-check_upstart() {
-	test -x "$(command -v initctl)" || return 1
-	case $(initctl version)
-	in
-		*'(upstart '*')')
-			if test -d /etc/init
-			then
-				# modern (DBus-based?) upstart >= 0.5
-				echo upstart
-			elif test -d /etc/event.d
-			then
-				# ancient upstart
-				echo upstart-legacy
-			else
-				# whatever...
-				echo upstart
-			fi
     ;;
     *)
-			return 1
+        # return a empty string as unknown value
+        echo ""
     ;;
 esac
-}
-
-find_init_procfs() (
-	# First, check if the required file in procfs exists...
-	test -h /proc/1/exe || return 1
-
-	# Find init executable
-	init_exe=$(ls -l /proc/1/exe 2>/dev/null) || return 1
-	init_exe=${init_exe#* -> }
-
-	if ! test -x "$init_exe"
-	then
-		# On some rare occasions it can happen that the
-		# running init's binary has been replaced. In this
-		# case Linux adjusts the symlink to "X (deleted)"
-
-		# [root@fedora-12 ~]# readlink /proc/1/exe
-		# /sbin/init (deleted)
-		# [root@fedora-12 ~]# ls -l /proc/1/exe
-		# lrwxrwxrwx. 1 root root 0 2020-01-30 23:00 /proc/1/exe -> /sbin/init (deleted)
-
-		init_exe=${init_exe% (deleted)}
-		test -x "$init_exe" || return 1
-	fi
-
-	echo "${init_exe}"
-)
-
-guess_by_path() {
-	case $1
-	in
-		/bin/busybox)
-			check_busybox_init "$1" && return
-			;;
-		/lib/systemd/systemd)
-			check_systemd "$1" && return
-			;;
-		/hurd/init)
-			check_hurd_init "$1" && return
-			;;
-		/sbin/launchd)
-			check_launchd "$1" && return
-			;;
-		/usr/bin/runit|/sbin/runit)
-			check_runit "$1" && return
-			;;
-		/sbin/openrc-init)
-			if check_openrc "$1" >/dev/null
-			then
-				echo openrc-init
-				return
-			fi
-			;;
-		/sbin/procd)
-			check_procd "$1" && return
-			;;
-		/sbin/init|*/init)
-			# init: it could be anything -> (explicit) no match
-			return 1
-			;;
-	esac
-
-	# No match
-	return 1
-}
-
-guess_by_comm_name() {
-	case $1
-	in
-		busybox)
-			check_busybox_init && return
-			;;
-		openrc-init)
-			if check_openrc >/dev/null
-			then
-				echo openrc-init
-				return 0
-			fi
-			;;
-		init)
-			# init could be anything -> no match
-			return 1
-			;;
-		*)
-			# Run check function by comm name if available.
-			# Fall back to comm name if either it does not exist or
-			# returns non-zero.
-			if type "check_$1" >/dev/null
-			then
-				"check_$1" && return
-			else
-				echo "$1" ; return 0
-			fi
-	esac
-
-	return 1
-}
-
-check_list() (
-	# List must be a multi-line input on stdin (one name per line)
-	while read -r init
-	do
-		"check_${init}" || continue
-		return 0
-	done
-	return 1
-)
-
-
-# BusyBox's versions of ps and pgrep do not support some options
-# depending on which compile-time options have been used.
-
-find_init_pgrep() {
-	pgrep -P0 -fl 2>/dev/null | awk -F '[[:blank:]]' '$1 == 1 { print $2 }'
-}
-
-find_init_ps() {
-	case $KERNEL_NAME
-	in
-		Darwin)
-			ps -o command -p 1 2>/dev/null | tail -n +2
-			;;
-		FreeBSD)
-			ps -o args= -p 1 2>/dev/null | cut -d ' ' -f 1
-			;;
-		Linux)
-			ps -o comm= -p 1 2>/dev/null
-			;;
-		NetBSD)
-			ps -o comm= -p 1 2>/dev/null
-			;;
-		OpenBSD)
-			ps -o args -p 1 2>/dev/null | tail -n +2 | cut -d ' ' -f 1
-			;;
-		*)
-			ps -o args= -p 1 2>/dev/null
-			;;
-	esac | trim  # trim trailing whitespace (some ps like Darwin add it)
-}
-
-find_init() {
-	case $KERNEL_NAME
-	in
-		Linux|GNU|NetBSD)
-			find_init_procfs || find_init_pgrep || find_init_ps
-			;;
-		FreeBSD)
-			find_init_procfs || find_init_ps
-			;;
-		OpenBSD)
-			find_init_pgrep || find_init_ps
-			;;
-		Darwin|SunOS)
-			find_init_ps
-			;;
-		*)
-			echo "Don't know how to determine init." >&2
-			echo 'Please send a patch.' >&2
-			exit 1
-	esac
-}
-
-# -----
-
-init=$(find_init)
-
-# If we got a path, guess by the path first (fall back to file name if no match)
-# else guess by file name directly.
-# shellcheck disable=SC2015
-{
-	test -x "${init}" \
-		&& guess_by_path "${init}" \
-		|| guess_by_comm_name "$(basename "${init}")"
-} && exit 0 || true
-
-
-# Guessing based on the file path and name didn’t lead to a definitive result.
-#
-# We go through all of the checks until we find a match. To speed up the
-# process, common cases will be checked first based on the underlying kernel.
-
-{ common_candidates_by_kernel; echo "${KNOWN_INIT_SYSTEMS}"; } \
-	| unique | check_list

cdist/conf/explorer/interfaces

@@ -21,8 +21,10 @@
 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'
+    ifconfig -a \
-fi \
+        | sed -n -E 's/^(.*)(:[[:space:]]*flags=|Link encap).*/\1/p' \
         | sort -u
+fi

cdist/conf/explorer/os

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

cdist/conf/explorer/os_release

@@ -1,7 +1,6 @@
 #!/bin/sh
 #
 # 2018 Adam Dej (dejko.a at gmail.com)
-# 2020 Dennis Camera (dennis.camera at ssrq-sds-fds.ch)
 #
 # This file is part of cdist.
 #
@@ -22,17 +21,6 @@
 
 # See os-release(5) and http://0pointer.de/blog/projects/os-release
 
-if test -f /etc/os-release
+set +e
-then
-	# Linux and FreeBSD (usually a symlink)
-	cat /etc/os-release
-elif test -f /usr/lib/os-release
-then
-	# systemd
-	cat /usr/lib/os-release
-elif test -f /var/run/os-release
-then
-	# FreeBSD (created by os-release service)
-	cat /var/run/os-release
-fi
 
+cat /etc/os-release || cat /usr/lib/os-release || true

cdist/conf/explorer/os_version

@@ -70,7 +70,4 @@ case "$("$__explorer/os")" in
    ubuntu)
       lsb_release -sr
    ;;
-   alpine)
-       cat /etc/alpine-release
-   ;;
 esac

cdist/conf/type/__acl/gencode-remote

@@ -20,13 +20,7 @@
 
 file_is="$( cat "$__object/explorer/file_is" )"
 
-if [ "$file_is" = 'missing' ] \
+[ "$file_is" = 'missing' ] && [ -z "$__cdist_dry_run" ] && exit 0
-    && [ -z "$__cdist_dry_run" ] \
-    && \( [ ! -f "$__object/parameter/file" ] \
-        || [ ! -f "$__object/parameter/directory" ] \)
-then
-    exit 0
-fi
 
 os="$( cat "$__global/explorer/os" )"
 
@@ -34,20 +28,7 @@ acl_path="/$__object_id"
 
 acl_is="$( cat "$__object/explorer/acl_is" )"
 
-if [ -f "$__object/parameter/source" ]
+if [ -f "$__object/parameter/acl" ]
-then
-    acl_source="$( cat "$__object/parameter/source" )"
-
-    if [ "$acl_source" = '-' ]
-    then
-        acl_should="$( cat "$__object/stdin" )"
-    else
-        acl_should="$( grep -Ev '^#|^$' "$acl_source" )"
-    fi
-elif [ -f "$__object/parameter/entry" ]
-then
-    acl_should="$( cat "$__object/parameter/entry" )"
-elif [ -f "$__object/parameter/acl" ]
 then
     acl_should="$( cat "$__object/parameter/acl" )"
 elif

cdist/conf/type/__acl/man.rst

@@ -15,24 +15,10 @@ See ``setfacl`` and ``acl`` manpages for more details.
 
 REQUIRED MULTIPLE PARAMETERS
 ----------------------------
-entry
+acl
    Set ACL entry following ``getfacl`` output syntax.
 
 
-OPTIONAL PARAMETERS
--------------------
-source
-   Read ACL entries from stdin or file.
-   Ordering of entries is not important.
-   When reading from file, comments and empty lines are ignored.
-
-file
-   Create/change file with ``__file`` using ``user:group:mode`` pattern.
-
-directory
-   Create/change directory with ``__directory`` using ``user:group:mode`` pattern.
-
-
 BOOLEAN PARAMETERS
 ------------------
 default
@@ -50,8 +36,8 @@ remove
 
 DEPRECATED PARAMETERS
 ---------------------
-Parameters ``acl``, ``user``, ``group``, ``mask`` and ``other`` are deprecated and they
+Parameters ``user``, ``group``, ``mask`` and ``other`` are deprecated and they
-will be removed in future versions. Please use ``entry`` parameter instead.
+will be removed in future versions. Please use ``acl`` parameter instead.
 
 
 EXAMPLES
@@ -63,38 +49,27 @@ EXAMPLES
         --default \
         --recursive \
         --remove \
-        --entry user:alice:rwx \
+        --acl user:alice:rwx \
-        --entry user:bob:r-x \
+        --acl user:bob:r-x \
-        --entry group:project-group:rwx \
+        --acl group:project-group:rwx \
-        --entry group:some-other-group:r-x \
+        --acl group:some-other-group:r-x \
-        --entry mask::r-x \
+        --acl mask::r-x \
-        --entry other::r-x
+        --acl other::r-x
 
     # give Alice read-only access to subdir,
     # but don't allow her to see parent content.
 
     __acl /srv/project2 \
         --remove \
-        --entry default:group:secret-project:rwx \
+        --acl default:group:secret-project:rwx \
-        --entry group:secret-project:rwx \
+        --acl group:secret-project:rwx \
-        --entry user:alice:--x
+        --acl user:alice:--x
 
     __acl /srv/project2/subdir \
         --default \
         --remove \
-        --entry group:secret-project:rwx \
+        --acl group:secret-project:rwx \
-        --entry user:alice:r-x
+        --acl user:alice:r-x
-
-    # read acl from stdin
-    echo 'user:alice:rwx' \
-        | __acl /path/to/directory --source -
-
-    # create/change directory too
-    __acl /path/to/directory \
-        --default \
-        --remove \
-        --directory root:root:770 \
-        --entry user:nobody:rwx
 
 
 AUTHORS

cdist/conf/type/__acl/manifest

@@ -1,11 +0,0 @@
-#!/bin/sh -e
-
-for p in file directory
-do
-    [ ! -f "$__object/parameter/$p" ] && continue
-
-    "__$p" "/$__object_id" \
-        --owner "$( awk -F: '{print $1}' "$__object/parameter/$p" )" \
-        --group "$( awk -F: '{print $2}' "$__object/parameter/$p" )" \
-        --mode  "$( awk -F: '{print $3}' "$__object/parameter/$p" )"
-done

cdist/conf/type/__acl/parameter/deprecated/acl

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

cdist/conf/type/__acl/parameter/optional

@@ -1,5 +1,2 @@
 mask
 other
-source
-file
-directory

cdist/conf/type/__acl/parameter/optional_multiple

@@ -1,4 +1,3 @@
-entry
 acl
 user
 group

cdist/conf/type/__apt_key/gencode-remote

@@ -48,11 +48,11 @@ curl -s -L \\
     -o "$keyfile" \\
     "$uri"
 
-key="\$( cat "$keyfile" )"
+if grep -Fq 'BEGIN PGP PUBLIC KEY BLOCK' \\
-
+    "$keyfile"
-if echo "\$key" | grep -Fq 'BEGIN PGP PUBLIC KEY BLOCK'
 then
-    echo "\$key" | gpg --dearmor > "$keyfile"
+    cat "$keyfile" \\
+        | gpg --export > "$keyfile"
 fi
 
 EOF
@@ -61,29 +61,31 @@ EOF
             echo "curl -s -L '$uri' | apt-key add -"
          fi
       elif [ -d "$keydir" ]; then
+         tmp='/tmp/cdist_apt_key_tmp'
+
          # we need to kill gpg after 30 seconds, because gpg
          # can get stuck if keyserver is not responding.
          # exporting env var and not exit 1,
          # because we need to clean up and kill dirmngr.
          cat << EOF
 
-gpgtmphome="\$( mktemp -d )"
+mkdir -m 700 -p "$tmp"
 
 if timeout 30s \\
-    gpg --homedir "\$gpgtmphome" \\
+    gpg --homedir "$tmp" \\
         --keyserver "$keyserver" \\
         --recv-keys "$keyid"
 then
-    gpg --homedir "\$gpgtmphome" \\
+    gpg --homedir "$tmp" \\
         --export "$keyid" \\
         > "$keyfile"
 else
     export GPG_GOT_STUCK=1
 fi
 
-GNUPGHOME="\$gpgtmphome" gpgconf --kill dirmngr
+GNUPGHOME="$tmp" gpgconf --kill dirmngr
 
-rm -rf "\$gpgtmphome"
+rm -rf "$tmp"
 
 if [ -n "\$GPG_GOT_STUCK" ]
 then

cdist/conf/type/__apt_unattended_upgrades/man.rst

@@ -1,68 +0,0 @@
-cdist-type__apt_unattended_upgrades(7)
-======================================
-
-NAME
-----
-cdist-type__apt_unattended_upgrades - automatic installation of updates
-
-
-DESCRIPTION
------------
-
-Install and configure unattended-upgrades package.
-
-For more information see https://wiki.debian.org/UnattendedUpgrades.
-
-
-OPTIONAL MULTIPLE PARAMETERS
-----------------------------
-option
-   Set options for unattended-upgrades. See examples.
-
-   Supported options with default values (as of 2020-01-17) are:
-
-   - AutoFixInterruptedDpkg, default is "true"
-   - MinimalSteps, default is "true"
-   - InstallOnShutdown, default is "false"
-   - Mail, default is "" (empty)
-   - MailOnlyOnError, default is "false"
-   - Remove-Unused-Kernel-Packages, default is "true"
-   - Remove-New-Unused-Dependencies, default is "true"
-   - Remove-Unused-Dependencies, default is "false"
-   - Automatic-Reboot, default is "false"
-   - Automatic-Reboot-WithUsers, default is "true"
-   - Automatic-Reboot-Time, default is "02:00"
-   - SyslogEnable, default is "false"
-   - SyslogFacility, default is "daemon"
-   - OnlyOnACPower, default is "true"
-   - Skip-Updates-On-Metered-Connections, default is "true"
-   - Verbose, default is "false"
-   - Debug, default is "false"
-
-blacklist
-   Python regular expressions, matching packages to exclude from upgrading.
-
-
-EXAMPLES
---------
-
-.. code-block:: sh
-
-    __apt_unattended_upgrades \
-        --option Mail=root \
-        --option MailOnlyOnError=true \
-        --blacklist multipath-tools \
-        --blacklist open-iscsi
-
-
-AUTHORS
--------
-Ander Punnar <ander-at-kvlt-dot-ee>
-
-
-COPYING
--------
-Copyright \(C) 2020 Ander Punnar. You can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the Free
-Software Foundation, either version 3 of the License, or (at your option) any
-later version.

cdist/conf/type/__apt_unattended_upgrades/manifest

@@ -1,80 +0,0 @@
-#!/bin/sh -e
-#
-# 2020 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/>.
-#
-
-__package unattended-upgrades
-
-export require='__package/unattended-upgrades'
-
-# in normal circumstances 20auto-upgrades is managed
-# by debconf and it can only contain these lines
-
-__file /etc/apt/apt.conf.d/20auto-upgrades \
-    --owner root \
-    --group root \
-    --mode 644 \
-    --source - << EOF
-APT::Periodic::Update-Package-Lists "1";
-APT::Periodic::Unattended-Upgrade "1";
-EOF
-
-# lets not write into upstream 50unattended-upgrades file,
-# but use our own config file to avoid clashes
-
-conf_file='/etc/apt/apt.conf.d/51unattended-upgrades-cdist'
-
-conf='# this file is managed by cdist'
-
-if [ -f "$__object/parameter/option" ]
-then
-    o=''
-
-    while read -r l
-    do
-        o="$( printf '%s\nUnattended-Upgrade::%s "%s";\n' "$o" "${l%%=*}" "${l#*=}" )"
-    done \
-        < "$__object/parameter/option"
-
-    conf="$( printf '%s\n%s\n' "$conf" "$o" )"
-fi
-
-if [ -f "$__object/parameter/blacklist" ]
-then
-    b='Unattended-Upgrade::Package-Blacklist {'
-
-    while read -r l
-    do
-        b="$( printf '%s\n"%s";\n' "$b" "$l" )"
-    done \
-        < "$__object/parameter/blacklist"
-
-    conf="$( printf '%s\n%s\n}\n' "$conf" "$b" )"
-fi
-
-if [ "$( echo "$conf" | wc -l )" -gt 1 ]
-then
-    echo "$conf" \
-        | __file "$conf_file" \
-            --owner root \
-            --group root \
-            --mode 644 \
-            --source -
-else
-    __file "$conf_file" --state absent
-fi

cdist/conf/type/__apt_unattended_upgrades/parameter/optional_multiple

@@ -1,2 +0,0 @@
-option
-blacklist

cdist/conf/type/__cdist/manifest

@@ -37,7 +37,6 @@ source="$(cat "$__object/parameter/source")"
 # out of it
 home=/home/$username
 
-# shellcheck disable=SC2086
 __user "$username" --home "$home" $shell
 
 require="__user/$username" __directory "$home" \

cdist/conf/type/__consul_agent/man.rst

@@ -116,9 +116,6 @@ verify-incoming
 verify-outgoing
    enforce the use of TLS and verify the peers authenticity on outgoing connections
 
-use-distribution-package
-   uses distribution package instead of upstream binary
-
 
 EXAMPLES
 --------

cdist/conf/type/__consul_agent/manifest

@@ -1,8 +1,7 @@
 #!/bin/sh -e
 #
 # 2015 Steven Armstrong (steven-cdist at armstrong.cc)
-# 2015-2020 Nico Schottelius (nico-cdist at schottelius.org)
+# 2015-2019 Nico Schottelius (nico-cdist at schottelius.org)
-# 2019 Timothée Floure (timothee.floure at ungleich.ch)
 #
 # This file is part of cdist.
 #
@@ -20,229 +19,66 @@
 # along with cdist. If not, see <http://www.gnu.org/licenses/>.
 #
 
+
 os=$(cat "$__global/explorer/os")
 
-###
-# Type parameters.
-
-state="$(cat "$__object/parameter/state")"
-user="$(cat "$__object/parameter/user")"
-group="$(cat "$__object/parameter/group")"
-release=$(cat "$__global/explorer/lsb_release")
-if [ -f "$__object/parameter/use-distribution-package" ]; then
-  use_distribution_package=1
-fi
-
-###
-# Those are default that might be overriden by os-specific logic.
-
-data_dir="/var/lib/consul"
-
-
-
-tls_dir="$conf_dir/tls"
-
-case "$os" in
-    alpine)
-        conf_dir="/etc/consul"
-        conf_file="server.json"
-        ;;
-    *)
-        conf_dir="/etc/consul/conf.d"
-        conf_file="config.json"
-        ;;
-esac
-
-###
-# Sane deployment, based on distribution package when available.
-
-distribution_setup () {
-  case "$os" in
-     debian)
-       # consul is only available starting Debian 10 (buster).
-       # See https://packages.debian.org/buster/consul
-       if [ "$release" -lt 10 ]; then
-         echo "Consul is not available for your debian release." >&2
-         echo "Please use the 'manual' (i.e. non-package) installation or \
-           upgrade the target system." >&2
-         exit 1
-       fi
-
-       # Override previously defined environment to match debian packaging.
-       conf_dir='/etc/consul.d'
-       user='consul'
-       group='consul'
-     ;;
-     alpine)
-       # consul is only available starting Alpine 3.12 (= edge during the 3.11 cycle).
-       # See https://pkgs.alpinelinux.org/packages?name=consul&branch=edge
-
-       # Override previously defined environment to match alpine packaging.
-       conf_dir='/etc/consul'
-       conf_file='server.json'
-       data_dir='/var/consul'
-       user='consul'
-       group='consul'
-     ;;
-     *)
-        echo "Your operating system ($os) is currently not supported with the \
-          --use-distribution-package flag (${__type##*/})." >&2
-        echo "Please use non-package installation or contribute an \
-          implementation for if you can." >&2
-        exit 1
-     ;;
-  esac
-
-  # Install consul package.
-  __package consul --state "$state"
-
-  export config_deployment_requires="__package/consul"
-}
-
-###
-# LEGACY manual deployment, kept for compatibility reasons.
-
-init_sysvinit()
-{
-    __file /etc/init.d/consul \
-        --owner root --group root --mode 0755 \
-        --state "$state" \
-        --source "$__type/files/consul.sysv-$1"
-    require="__file/etc/init.d/consul" __start_on_boot consul
-}
-
-init_systemd()
-{
-    __file /lib/systemd/system/consul.service \
-        --owner root --group root --mode 0644 \
-        --state "$state" \
-        --source "$__type/files/consul.systemd"
-        require="__file/lib/systemd/system/consul.service" __start_on_boot consul
-}
-
-init_upstart()
-{
-    __file /etc/init/consul-prepare.conf \
-        --owner root --group root --mode 0644 \
-        --state "$state" \
-        --source "$__type/files/consul-prepare.upstart"
-    require="__file/etc/init/consul-prepare.conf" \
-        __file /etc/init/consul.conf \
-            --owner root --group root --mode 0644 \
-            --state "$state" \
-            --source "$__type/files/consul.upstart"
-    require="__file/etc/init/consul.conf" __start_on_boot consul
-}
-
-manual_setup () {
 case "$os" in
    alpine|scientific|centos|debian|devuan|redhat|ubuntu)
       # whitelist safeguard
       :
    ;;
    *)
-        echo "Your operating system ($os) is currently not supported by this \
+      echo "Your operating system ($os) is currently not supported by this type (${__type##*/})." >&2
-          type (${__type##*/})." >&2
       echo "Please contribute an implementation for it if you can." >&2
       exit 1
    ;;
 esac
 
+state="$(cat "$__object/parameter/state")"
+user="$(cat "$__object/parameter/user")"
+group="$(cat "$__object/parameter/group")"
+data_dir="/var/lib/consul"
+conf_dir="/etc/consul/conf.d"
+conf_file="config.json"
+
 # FIXME: there has got to be a better way to handle the dependencies in this case
 case "$state" in
    present)
       __group "$group" --system --state "$state"
-        require="__group/$group" __user "$user" \
+      require="__group/$group" \
-          --system --gid "$group" --home "$data_dir" --state "$state"
+         __user "$user" --system --gid "$group" \
+            --home "$data_dir" --state "$state"
+      export require="__user/consul"
    ;;
-     *)
+   absent)
-        echo "The $state state is not (yet?) supported by this type." >&2
+      echo "Sorry, state=absent currently not supported :-(" >&2
       exit 1
+      require="$__object_name" \
+         __user "$user" --system --gid "$group" --state "$state"
+      require="__user/$user" \
+         __group "$group" --system --state "$state"
    ;;
 esac
 
-  # Create data directory.
+__directory /etc/consul \
-  require="__user/consul" __directory "$data_dir" \
+   --owner root --group "$group" --mode 750 --state "$state"
-    --owner "$user" --group "$group" --mode 770 --state "$state"
+require="__directory/etc/consul" \
-
+   __directory "$conf_dir" \
-  # Create config directory.
-  require="__user/consul" __directory "$conf_dir" \
-    --parents --owner root --group "$group" --mode 750 --state "$state"
-
-  # 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
-          ;;
-
-      debian)
-          os_version=$(cat "$__global/explorer/os_version")
-          major_version="${os_version%%.*}"
-
-          case "$major_version" in
-              [567])
-                  init_sysvinit debian
-              ;;
-              [89]|10)
-                  init_systemd
-              ;;
-              *)
-                  echo "Unsupported Debian version $os_version" >&2
-                  exit 1
-              ;;
-          esac
-          ;;
-
-      ubuntu)
-          init_upstart
-          ;;
-  esac
-
-  config_deployment_requires="__user/consul __directory/$conf_dir"
-}
-
-###
-# Trigger requested installation method.
-if [ $use_distribution_package ]; then
-  distribution_setup
-else
-  manual_setup
-fi
-
-###
-# Install TLS certificates.
-
-if [ -f "$__object/parameter/ca-file-source" ] || \
-   [ -f "$__object/parameter/cert-file-source" ] || \
-   [ -f "$__object/parameter/key-file-source" ]; then
-
-   requires="$config_deployment_requires" __directory "$tls_dir" \
       --owner root --group "$group" --mode 750 --state "$state"
 
-   # Append to service restart requirements.
+if [ -f "$__object/parameter/ca-file-source" ] || [ -f "$__object/parameter/cert-file-source" ] || [ -f "$__object/parameter/key-file-source" ]; then
-   restart_requires="$restart_requires __directory/$conf_dir/tls"
+   # create directory for ssl certs
+   require="__directory/etc/consul" \
+      __directory /etc/consul/ssl \
+         --owner root --group "$group" --mode 750 --state "$state"
 fi
 
-###
+__directory "$data_dir" \
-# Generate and deploy configuration.
+   --owner "$user" --group "$group" --mode 770 --state "$state"
 
-json_configuration=$(
+
+# Generate json config file
+(
 echo "{"
 
 # parameters we define ourself
@@ -251,11 +87,11 @@ json_configuration=$(
 cd "$__object/parameter/"
 for param in *; do
    case "$param" in
-        state|user|group|json-config|use-distribution-package) continue ;;
+      state|user|group|json-config) continue ;;
       ca-file-source|cert-file-source|key-file-source)
          source="$(cat "$__object/parameter/$param")"
-           destination="$tls_dir/${source##*/}"
+         destination="/etc/consul/ssl/${source##*/}"
-           require="__directory/$tls_dir" \
+         require="__directory/etc/consul/ssl" \
             __file "$destination" \
                --owner root --group consul --mode 640 \
                --source "$source" \
@@ -263,8 +99,7 @@ json_configuration=$(
          key="$(echo "${param%-*}" | tr '-' '_')"
          printf '   ,"%s": "%s"\n' "$key" "$destination"
       ;;
-        disable-remote-exec|disable-update-check|leave-on-terminate\
+      disable-remote-exec|disable-update-check|leave-on-terminate|rejoin-after-leave|server|enable-syslog|verify-incoming|verify-outgoing)
-          |rejoin-after-leave|server|enable-syslog|verify-incoming|verify-outgoing)
          # handle boolean parameters
          key="$(echo "$param" | tr '-' '_')"
          printf '   ,"%s": true\n' "$key"
@@ -304,16 +139,87 @@ json_configuration=$(
    printf '   ,%s\n' "$json"
 fi
 echo "}"
-)
+) | \
-echo "$json_configuration" | require="$config_deployment_requires" \
+require="__directory${conf_dir}" \
-  __file "$conf_dir/$conf_file" \
+   __config_file "${conf_dir}/${conf_file}" \
       --owner root --group "$group" --mode 640 \
       --state "$state" \
+      --onchange 'service consul status >/dev/null && service consul reload || true' \
       --source -
 
-# Set configuration deployment as requirement for service restart.
+init_sysvinit()
-restart_requires="__file/$conf_dir/$conf_file"
+{
+    __file /etc/init.d/consul \
+        --owner root --group root --mode 0755 \
+        --state "$state" \
+        --source "$__type/files/consul.sysv-$1"
+    require="__file/etc/init.d/consul" __start_on_boot consul
+}
 
-###
+init_systemd()
-# Restart consul agent after everything else.
+{
-require="$restart_requires" __service consul --action restart
+    __file /lib/systemd/system/consul.service \
+        --owner root --group root --mode 0644 \
+        --state "$state" \
+        --source "$__type/files/consul.systemd"
+        require="__file/lib/systemd/system/consul.service" __start_on_boot consul
+}
+
+init_upstart()
+{
+    __file /etc/init/consul-prepare.conf \
+        --owner root --group root --mode 0644 \
+        --state "$state" \
+        --source "$__type/files/consul-prepare.upstart"
+    require="__file/etc/init/consul-prepare.conf" \
+        __file /etc/init/consul.conf \
+            --owner root --group root --mode 0644 \
+            --state "$state" \
+            --source "$__type/files/consul.upstart"
+    require="__file/etc/init/consul.conf" __start_on_boot consul
+}
+
+# Install init script to start on boot
+case "$os" in
+    alpine|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
+        ;;
+
+    debian)
+        os_version=$(cat "$__global/explorer/os_version")
+        major_version="${os_version%%.*}"
+
+        case "$major_version" in
+            [567])
+                init_sysvinit debian
+            ;;
+            [89])
+                init_systemd
+            ;;
+            *)
+                echo "Unsupported Debian version $os_version" >&2
+                exit 1
+            ;;
+        esac
+        ;;
+
+    ubuntu)
+        init_upstart
+        ;;
+esac

cdist/conf/type/__consul_agent/parameter/boolean

@@ -6,4 +6,3 @@ server
 enable-syslog
 verify-incoming
 verify-outgoing
-use-distribution-package

cdist/conf/type/__consul_check/explorer/conf-dir

@@ -1 +0,0 @@
-../../__consul_service/explorer/conf-dir

cdist/conf/type/__consul_check/manifest

@@ -19,7 +19,7 @@
 #
 
 name="$(cat "$__object/parameter/name" 2>/dev/null || echo "$__object_id")"
-conf_dir=$(cat "$__object/explorer/conf-dir")
+conf_dir="/etc/consul/conf.d"
 conf_file="check_${name}.json"
 state="$(cat "$__object/parameter/state")"
 

cdist/conf/type/__consul_service/explorer/conf-dir

@@ -1,15 +0,0 @@
-# Determine the configuration directory used by consul.
-
-check_dir () {
-  if [ -d "$1" ]; then
-    printf '%s' "$1"
-    exit
-  fi
-}
-
-check_dir '/etc/consul/conf.d'
-check_dir '/etc/consul.d'
-check_dir '/etc/consul'
-
-echo 'Could not determine consul configuration dir. Exiting.' >&2
-exit 1

cdist/conf/type/__consul_service/manifest

@@ -19,7 +19,7 @@
 #
 
 name="$(cat "$__object/parameter/name" 2>/dev/null || echo "$__object_id")"
-conf_dir=$(cat "$__object/explorer/conf-dir")
+conf_dir="/etc/consul/conf.d"
 conf_file="service_${name}.json"
 state="$(cat "$__object/parameter/state")"
 
@@ -45,7 +45,7 @@ printf '      "name": "%s"\n' "$name"
 cd "$__object/parameter/"
 for param in *; do
    case "$param" in
-      state|name|check-interval|conf-dir) continue ;;
+      state|name|check-interval) continue ;;
       check-script)
          printf '     ,"check": {\n'
          printf '         "script": "%s"\n' "$(cat "$__object/parameter/check-script")"
@@ -86,6 +86,7 @@ echo "   }"
 # end json file
 echo "}"
 ) | \
+require="__directory${conf_dir}" \
    __config_file "${conf_dir}/${conf_file}" \
       --owner root --group consul --mode 640 \
       --state "$state" \

cdist/conf/type/__consul_watch_checks/explorer/conf-dir

@@ -1 +0,0 @@
-../../__consul_service/explorer/conf-dir

cdist/conf/type/__consul_watch_checks/manifest

@@ -20,7 +20,7 @@
 
 cdist_type="${__type##*/}"
 watch_type="${cdist_type##*_}"
-conf_dir=$(cat "$__object/explorer/conf-dir")
+conf_dir="/etc/consul/conf.d"
 conf_file="watch_${watch_type}_${__object_id}.json"
 state="$(cat "$__object/parameter/state")"
 

cdist/conf/type/__consul_watch_event/explorer/conf-dir

@@ -1 +0,0 @@
-../../__consul_service/explorer/conf-dir

cdist/conf/type/__consul_watch_event/manifest

@@ -20,7 +20,7 @@
 
 cdist_type="${__type##*/}"
 watch_type="${cdist_type##*_}"
-conf_dir=$(cat "$__object/explorer/conf-dir")
+conf_dir="/etc/consul/conf.d"
 conf_file="watch_${watch_type}_${__object_id}.json"
 state="$(cat "$__object/parameter/state")"
 

cdist/conf/type/__consul_watch_key/explorer/conf-dir

@@ -1 +0,0 @@
-../../__consul_service/explorer/conf-dir

cdist/conf/type/__consul_watch_key/manifest

@@ -20,7 +20,7 @@
 
 cdist_type="${__type##*/}"
 watch_type="${cdist_type##*_}"
-conf_dir=$(cat "$__object/explorer/conf-dir")
+conf_dir="/etc/consul/conf.d"
 conf_file="watch_${watch_type}_${__object_id}.json"
 state="$(cat "$__object/parameter/state")"
 

cdist/conf/type/__consul_watch_keyprefix/explorer/conf-dir

@@ -1 +0,0 @@
-../../__consul_service/explorer/conf-dir

cdist/conf/type/__consul_watch_keyprefix/manifest

@@ -20,7 +20,7 @@
 
 cdist_type="${__type##*/}"
 watch_type="${cdist_type##*_}"
-conf_dir=$(cat "$__object/explorer/conf-dir")
+conf_dir="/etc/consul/conf.d"
 conf_file="watch_${watch_type}_${__object_id}.json"
 state="$(cat "$__object/parameter/state")"
 

cdist/conf/type/__consul_watch_nodes/explorer/conf-dir

@@ -1 +0,0 @@
-../../__consul_service/explorer/conf-dir

cdist/conf/type/__consul_watch_nodes/manifest

@@ -20,7 +20,7 @@
 
 cdist_type="${__type##*/}"
 watch_type="${cdist_type##*_}"
-conf_dir=$(cat "$__object/explorer/conf-dir")
+conf_dir="/etc/consul/conf.d"
 conf_file="watch_${watch_type}_${__object_id}.json"
 state="$(cat "$__object/parameter/state")"
 

cdist/conf/type/__consul_watch_service/explorer/conf-dir

@@ -1 +0,0 @@
-../../__consul_service/explorer/conf-dir

cdist/conf/type/__consul_watch_service/manifest

@@ -20,7 +20,7 @@
 
 cdist_type="${__type##*/}"
 watch_type="${cdist_type##*_}"
-conf_dir=$(cat "$__object/explorer/conf-dir")
+conf_dir="/etc/consul/conf.d"
 conf_file="watch_${watch_type}_${__object_id}.json"
 state="$(cat "$__object/parameter/state")"
 

cdist/conf/type/__consul_watch_services/explorer/conf-dir

@@ -1 +0,0 @@
-../../__consul_service/explorer/conf-dir

cdist/conf/type/__consul_watch_services/manifest

@@ -20,7 +20,7 @@
 
 cdist_type="${__type##*/}"
 watch_type="${cdist_type##*_}"
-conf_dir=$(cat "$__object/explorer/conf-dir")
+conf_dir="/etc/consul/conf.d"
 conf_file="watch_${watch_type}_${__object_id}.json"
 state="$(cat "$__object/parameter/state")"
 

cdist/conf/type/__cron/gencode-remote

@@ -31,28 +31,24 @@ if [ -f "$__object/parameter/raw" ]; then
 elif [ -f "$__object/parameter/raw_command" ]; then
    entry="$command"
 else
-   minute="$(cat "$__object/parameter/minute")"
+   minute="$(cat "$__object/parameter/minute" 2>/dev/null || echo "*")"
-   hour="$(cat "$__object/parameter/hour")"
+   hour="$(cat "$__object/parameter/hour" 2>/dev/null || echo "*")"
-   day_of_month="$(cat "$__object/parameter/day_of_month")"
+   day_of_month="$(cat "$__object/parameter/day_of_month" 2>/dev/null || echo "*")"
-   month="$(cat "$__object/parameter/month")"
+   month="$(cat "$__object/parameter/month" 2>/dev/null || echo "*")"
-   day_of_week="$(cat "$__object/parameter/day_of_week")"
+   day_of_week="$(cat "$__object/parameter/day_of_week" 2>/dev/null || echo "*")"
    entry="$minute $hour $day_of_month $month $day_of_week $command # $name"
 fi
 
 mkdir "$__object/files"
 echo "$entry" > "$__object/files/entry"
 
-if [ -s "$__object/explorer/entry" ]; then
 if diff -q "$__object/files/entry" "$__object/explorer/entry" >/dev/null; then
     state_is=present
-    else
-        state_is=modified
-    fi
 else
     state_is=absent
 fi
 
-state_should="$(cat "$__object/parameter/state")"
+state_should="$(cat "$__object/parameter/state" 2>/dev/null || echo "present")"
 
 [ "$state_is" = "$state_should" ] && exit 0
 

cdist/conf/type/__cron/manifest

@@ -22,12 +22,3 @@ if [ -f "$__object/parameter/raw" ] && [ -f "$__object/parameter/raw_command" ];
     echo "ERROR: both raw and raw_command specified" >&2
     exit 1
 fi
-
-case "$(cat "$__object/parameter/state")" in
-    present) ;;
-    absent) ;;
-
-    *)
-        echo "ERROR: unkown cron state" >&2
-        exit 2
-esac

cdist/conf/type/__cron/parameter/default/day_of_month

@@ -1 +0,0 @@
-*

cdist/conf/type/__cron/parameter/default/day_of_week

@@ -1 +0,0 @@
-*

cdist/conf/type/__cron/parameter/default/hour

@@ -1 +0,0 @@
-*

cdist/conf/type/__cron/parameter/default/minute

@@ -1 +0,0 @@
-*

cdist/conf/type/__cron/parameter/default/month

@@ -1 +0,0 @@
-*

cdist/conf/type/__cron/parameter/default/state

@@ -1 +0,0 @@
-present

cdist/conf/type/__daemontools_service/man.rst

@@ -40,12 +40,6 @@ run-file
 log-run
    Command to run for log consumption. Default: `multilog t ./main`
 
-owner
-   User to chown to.
-
-group
-   User to chgrp to.
-
 servicedir
    Directory to install into. Default: `/service`
 

cdist/conf/type/__daemontools_service/manifest

@@ -9,8 +9,6 @@ servicedir=$(cat "$__object/parameter/servicedir")
 run=$(cat "$__object/parameter/run")
 runfile=$(cat "$__object/parameter/run-file")
 logrun=$(cat "$__object/parameter/log-run")
-owner=$(cat "$__object/parameter/owner")
-group=$(cat "$__object/parameter/group")
 
 svc=$(cat "$__type/explorer/svc")
 
@@ -27,22 +25,14 @@ badusage() {
 [ -z "$run$runfile" ] && badusage
 [ -n "$run" ] && [ -n "$runfile" ] && badusage
 
-flags=""
+__directory "$servicedir/$name/log/main" --parents
-if [ -n "$owner" ]; then
-  flags="$flags --owner $owner"
-fi
-if [ -n "$group" ]; then
-  flags="$flags --group $group"
-fi
-
-__directory "$servicedir/$name/log/main" --parents $flags
 
 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 $flags \
+	--mode 755 \
 	--source "${runfile:--}"
 
 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 $flags \
+	--mode 755 \
 	--source "-"

cdist/conf/type/__daemontools_service/parameter/optional

@@ -1,6 +1,4 @@
-group
 log-run
-owner
 run
 run-file
 servicedir

cdist/conf/type/__directory/explorer/stat

@@ -1,7 +1,6 @@
 #!/bin/sh
 #
 # 2013 Steven Armstrong (steven-cdist armstrong.cc)
-# 2020 Dennis Camera (dennis.camera at ssrq-sds-fds.ch)
 #
 # This file is part of cdist.
 #
@@ -21,43 +20,24 @@
 
 destination="/$__object_id"
 
-fallback() {
-   # Patch the output together, manually
-
-   ls_line=$(ls -ldn "$destination")
-
-   uid=$(echo "$ls_line" | awk '{ print $3 }')
-   gid=$(echo "$ls_line" | awk '{ print $4 }')
-
-   owner=$(awk -F: -v uid="$uid" '$3 == uid { print $1; f=1 } END { if (!f) print "UNKNOWN" }' /etc/passwd)
-   group=$(awk -F: -v uid="$uid" '$3 == uid { print $1; f=1 } END { if (!f) print "UNKNOWN" }' /etc/group)
-
-   mode_text=$(echo "$ls_line" | awk '{ print $1 }')
-   mode=$(echo "$mode_text" | awk '{ k=0; for (i=0; i<=8; i++) k += ((substr($1, i+2, 1) ~ /[rwx]/) * 2^(8-i)); printf("%0o", k) }')
-
-   printf 'type: %s\nowner: %d %s\ngroup: %d %s\nmode: %s %s\n' \
-      "$("$__type_explorer/type")" \
-      "$uid" "$owner" \
-      "$gid" "$group" \
-      "$mode" "$mode_text"
-}
-
 # nothing to work with, nothing we could do
 [ -e "$destination" ] || exit 0
 
-if ! command -v stat >/dev/null
+os=$("$__explorer/os")
-then
+case "$os" in
-   fallback
-   exit
-fi
-
-case $("$__explorer/os") in
    "freebsd"|"netbsd"|"openbsd"|"macosx")
       stat -f "type: %HT
 owner: %Du %Su
 group: %Dg %Sg
 mode: %Lp %Sp
-" "$destination" | awk '/^type/ { print tolower($0); next } { print }'
+" "$destination" | awk '/^type/ { print tolower($0); next; } { print; }'
+      ;;
+   alpine)
+      stat -c "type: %F
+owner: %u %U
+group: %g %G
+mode: %a %A
+" "$destination"
       ;;
     solaris)
         ls1="$( ls -ld "$destination" )"
@@ -89,12 +69,10 @@ mode: %Lp %Sp
         echo "mode: $octets $( echo "$ls1" | awk '{print $1}' )"
     ;;
    *)
-      # NOTE: Do not use --printf here as it is not supported by BusyBox stat.
+       stat --printf="type: %F
-      # NOTE: BusyBox's stat might not support the "-c" option, in which case
-      #       we fall through to the shell fallback.
-       stat -c "type: %F
 owner: %u %U
 group: %g %G
-mode: %a %A" "$destination" 2>/dev/null || fallback
+mode: %a %A
+" "$destination"
    ;;
 esac

cdist/conf/type/__directory/gencode-remote

@@ -3,7 +3,6 @@
 # 2011-2013 Nico Schottelius (nico-cdist at schottelius.org)
 # 2013 Steven Armstrong (steven-cdist armstrong.cc)
 # 2014 Daniel Heule (hda at sfs.biz)
-# 2020 Dennis Camera (dennis.camera at ssrq-sds-fds.ch)
 #
 # This file is part of cdist.
 #
@@ -22,8 +21,8 @@
 #
 
 destination="/$__object_id"
-state_should=$(cat "$__object/parameter/state")
+state_should="$(cat "$__object/parameter/state")"
-type=$(cat "$__object/explorer/type")
+type="$(cat "$__object/explorer/type")"
 stat_file="$__object/explorer/stat"
 
 # variable to keep track if we have to set directory attributes
@@ -73,7 +72,7 @@ set_mode() {
 }
 
 case "$state_should" in
-   present|exists)
+   present)
       if [ "$type" != "directory" ]; then
          set_attributes=1
          if [ "$type" != "none" ]; then
@@ -84,10 +83,6 @@ case "$state_should" in
          fi
          echo "mkdir $mkdiropt '$destination'"
          echo "create" >> "$__messages_out"
-      elif [ "$state_should" = 'exists' ]; then
-         # The type is directory and --state exists. We are done and do not
-         # check or set the attributes.
-         exit 0
       fi
 
       # Note: Mode - needs to happen last as a chown/chgrp can alter mode by
@@ -108,26 +103,6 @@ case "$state_should" in
          fi
       done
    ;;
-   pre-exists)
-      case $type in
-         directory)
-            # all good
-            exit 0
-         ;;
-         none)
-            printf 'Directory "%s" does not exist\n' "$destination" >&2
-            exit 1
-         ;;
-         file|symlink)
-            printf 'File "%s" exists and is a %s, but should be a directory\n' "$destination" "$type" >&2
-            exit 1
-         ;;
-         *)
-            printf 'File or directory "%s" is in an unknown state\n' "$destination" >&2
-            exit 1
-         ;;
-      esac
-   ;;
    absent)
         if [ "$type" = "directory" ]; then
             echo "rm -rf '$destination'"

cdist/conf/type/__directory/man.rst

@@ -19,18 +19,7 @@ None.
 OPTIONAL PARAMETERS
 -------------------
 state
-   'present', 'absent', 'exists' or 'pre-exists', defaults to 'present' where:
+   'present' or 'absent', defaults to 'present'
-
-   present
-      the directory exists and the given attributes are set.
-   absent
-      the directory does not exist.
-   exists
-      the directory exists, but its attributes are not altered if it already
-      existed.
-   pre-exists
-      check that the directory exists and is indeed a directory, but do not
-      create or modify it.
 
 group
    Group to chgrp to.

cdist/conf/type/__docker/manifest

@@ -64,43 +64,6 @@ case "$os" in
         require="__apt_source/docker" __package docker-ce --state "${state}"
       fi
    ;;
-   devuan)
-      os_version="$(cat "$__global/explorer/os_version")"
-
-      case "$os_version" in
-        ascii)
-          distribution="stretch"
-        ;;
-        jessie)
-          distribution="jessie"
-        ;;
-        *)
-          echo "Your devuan release ($os_version) is currently not supported by this type (${__type##*/}).">&2
-          echo "Please contribute an implementation for it if you can." >&2
-          exit 1
-        ;;
-      esac
-
-      if [ "${state}" = "present" ]; then
-        __package apt-transport-https
-        __package ca-certificates
-        __package gnupg2
-      fi
-      __apt_key_uri docker --name "Docker Release (CE deb) <docker@docker.com>" \
-        --uri "https://download.docker.com/linux/${os}/gpg" --state "${state}"
-
-      require="__apt_key_uri/docker" __apt_source docker \
-         --uri "https://download.docker.com/linux/${os}" \
-         --distribution "${distribution}" \
-         --state "${state}" \
-         --component "stable"
-      if [ "$version" != "latest" ]; then
-        require="__apt_source/docker" __package docker-ce --version "${version}" --state "${state}"
-      else
-        require="__apt_source/docker" __package docker-ce --state "${state}"
-      fi
-
-   ;;
    *)
       echo "Your operating system ($os) is currently not supported by this type (${__type##*/})." >&2
       echo "Please contribute an implementation for it if you can." >&2

cdist/conf/type/__docker_swarm/explorer/swarm-state

@@ -18,4 +18,4 @@
 # along with cdist. If not, see <http://www.gnu.org/licenses/>.
 #
 
-docker info 2>/dev/null | grep '^ *Swarm: ' | awk '{print $2}'
+docker info 2>/dev/null | grep "^Swarm: " | cut -d " " -f 2-

cdist/conf/type/__file/explorer/stat

@@ -2,7 +2,6 @@
 #
 # 2013 Steven Armstrong (steven-cdist armstrong.cc)
 # 2019 Nico Schottelius (nico-cdist at schottelius.org)
-# 2020 Dennis Camera (dennis.camera at ssrq-sds-fds.ch)
 #
 # This file is part of cdist.
 #
@@ -22,54 +21,29 @@
 
 destination="/$__object_id"
 
-fallback() {
-   # Fallback: Patch the output together, manually.
-
-   ls_line=$(ls -ldn "$destination")
-
-   uid=$(echo "$ls_line" | awk '{ print $3 }')
-   gid=$(echo "$ls_line" | awk '{ print $4 }')
-
-   owner=$(awk -F: -v uid="$uid" '$3 == uid { print $1; f=1 } END { if (!f) print "UNKNOWN" }' /etc/passwd)
-   group=$(awk -F: -v uid="$uid" '$3 == uid { print $1; f=1 } END { if (!f) print "UNKNOWN" }' /etc/group)
-
-   mode_text=$(echo "$ls_line" | awk '{ print $1 }')
-   mode=$(echo "$mode_text" | awk '{ k=0; for (i=0; i<=8; i++) k += ((substr($1, i+2, 1) ~ /[rwx]/) * 2^(8-i)); printf("%0o", k) }')
-
-   size=$(echo "$ls_line" | awk '{ print $5 }')
-   links=$(echo "$ls_line" | awk '{ print $2 }')
-
-   printf 'type: %s\nowner: %d %s\ngroup: %d %s\nmode: %s %s\nsize: %d\nlinks: %d\n' \
-      "$("$__type_explorer/type")" \
-      "$uid" "$owner" \
-      "$gid" "$group" \
-      "$mode" "$mode_text" \
-      "$size" \
-      "$links"
-}
-
-
 # nothing to work with, nothing we could do
 [ -e "$destination" ] || exit 0
 
-
+os=$("$__explorer/os")
-if ! command -v stat >/dev/null
+case "$os" in
-then
+   "freebsd"|"netbsd"|"openbsd"|"macosx")
-   fallback
-   exit
-fi
-
-
-case $("$__explorer/os")
-in
-   freebsd|netbsd|openbsd|macosx)
       stat -f "type: %HT
 owner: %Du %Su
 group: %Dg %Sg
 mode: %Lp %Sp
 size: %Dz
 links: %Dl
-" "$destination" | awk '/^type/ { print tolower($0); next } { print }'
+" "$destination" | awk '/^type/ { print tolower($0); next; } { print; }'
+      ;;
+   alpine)
+       # busybox stat
+      stat -c "type: %F
+owner: %u %U
+group: %g %G
+mode: %a %A
+size: %s
+links: %h
+" "$destination"
       ;;
     solaris)
         ls1="$( ls -ld "$destination" )"
@@ -103,14 +77,12 @@ links: %Dl
         echo "links: $( echo "$ls1" | awk '{print $2}' )"
     ;;
    *)
-      # NOTE: Do not use --printf here as it is not supported by BusyBox stat.
+      stat --printf="type: %F
-      # NOTE: BusyBox's stat might not support the "-c" option, in which case
-      #       we fall through to the shell fallback.
-      stat -c "type: %F
 owner: %u %U
 group: %g %G
 mode: %a %A
 size: %s
-links: %h" "$destination" 2>/dev/null || fallback
+links: %h
+" "$destination"
       ;;
 esac

cdist/conf/type/__file/gencode-local

@@ -31,24 +31,12 @@ if [ "$state_should" = "pre-exists" ]; then
       exit 1
    fi
 
-   case $type in
+   if [ "$type" = "file" ]; then
-      file)
+      exit 0 # nothing to do
-         # nothing to do
+   else
-         exit 0
+      echo "File \"$destination\" does not exist"
-      ;;
-      none)
-         printf 'File "%s" does not exist\n' "$destination" >&2
       exit 1
-      ;;
+   fi
-      directory|symlink)
-         printf 'File "%s" exists and is a %s, but should be a regular file\n' "$destination" "$type" >&2
-         exit 1
-      ;;
-      *)
-         printf 'File or directory "%s" is in an unknown state\n' "$destination" >&2
-         exit 1
-      ;;
-   esac
 fi
 
 upload_file=

cdist/conf/type/__file/gencode-remote

@@ -61,7 +61,7 @@ set_mode() {
 }
 
 case "$state_should" in
-    present|exists)
+    present|exists|pre-exists)
     # Note: Mode - needs to happen last as a chown/chgrp can alter mode by
     #  clearing S_ISUID and S_ISGID bits (see chown(2))
     for attribute in group owner mode; do
@@ -83,11 +83,7 @@ case "$state_should" in
         # set-attributes is created if file is created or uploaded in gencode-local
         fire_onchange=1
     fi
-    ;;
 
-    pre-exists)
-        # pre-exists should never reach gencode-remote…
-        exit 1
     ;;
 
     absent)

cdist/conf/type/__git/gencode-remote

@@ -19,34 +19,32 @@
 #
 #
 
-state_is=$(cat "$__object/explorer/state")
+state_is="$(cat "$__object/explorer/state")"
-owner_is=$(cat "$__object/explorer/owner")
+owner_is="$(cat "$__object/explorer/owner")"
-group_is=$(cat "$__object/explorer/group")
+group_is="$(cat "$__object/explorer/group")"
 
-state_should=$(cat "$__object/parameter/state")
+state_should="$(cat "$__object/parameter/state")"
 
-branch=$(cat "$__object/parameter/branch")
+branch="$(cat "$__object/parameter/branch")"
 
-source=$(cat "$__object/parameter/source")
+source="$(cat "$__object/parameter/source")"
 
 destination="/$__object_id"
 
-owner=$(cat "$__object/parameter/owner")
+owner="$(cat "$__object/parameter/owner")"
-group=$(cat "$__object/parameter/group")
+group="$(cat "$__object/parameter/group")"
-mode=$(cat "$__object/parameter/mode")
+mode="$(cat "$__object/parameter/mode")"
 
-[ -f "$__object/parameter/recursive" ] && recursive='--recurse-submodules' || recursive=''
+[  "$state_should" = "$state_is" ] && \
-[ -f "$__object/parameter/shallow" ] && shallow='--depth 1 --shallow-submodules' || shallow=''
+[  "$owner" = "$owner_is" ] && \
-
+[  "$group" = "$group_is" ] && \
-[ "$state_should" = "$state_is" ] \
+[  -n "$mode" ] && exit 0
- && [ "$owner" = "$owner_is" ] \
- && [ "$group" = "$group_is" ] \
- && [ -n "$mode" ] && exit 0
 
 case $state_should in
     present)
+
         if [ "$state_should" != "$state_is" ]; then
-            echo git clone --quiet "$recursive" "$shallow" --branch "$branch" "$source" "$destination"
+            echo git clone --quiet --branch "$branch" "$source" "$destination"
         fi
         if { [ -n "$owner" ] && [ "$owner_is" != "$owner" ]; } || \
            { [ -n "$group" ] && [ "$group_is" != "$group" ]; }; then
@@ -56,9 +54,8 @@ case $state_should in
             echo chmod -R "$mode" "$destination"
         fi
     ;;
-
-    absent)
     # Handled in manifest
+    absent)
     ;;
 
     *)

cdist/conf/type/__git/man.rst

@@ -35,12 +35,6 @@ mode
 owner
    User to chown to.
 
-recursive
-   Passes the --recurse-submodules flag to git when cloning the repository.
-
-shallow
-   Sets --depth=1 and --shallow-submodules for cloning repositories with big history.
-
 
 EXAMPLES
 --------

cdist/conf/type/__git/parameter/boolean

@@ -1,2 +0,0 @@
-recursive
-shallow

cdist/conf/type/__grafana_dashboard/manifest

@@ -8,16 +8,10 @@ case $os in
     debian|devuan)
         case $os_version in
             8*|jessie)
-                # Differntation not needed anymore
+                apt_source_distribution=jessie
-                apt_source_distribution=stable
                 ;;
             9*|ascii/ceres|ascii)
-                # Differntation not needed anymore
+                apt_source_distribution=stretch
-                apt_source_distribution=stable
-                ;;
-            10*)
-                # Differntation not needed anymore
-                apt_source_distribution=stable
                 ;;
             *)
                 echo "Don't know how to install Grafana on $os $os_version. Send us a pull request!" >&2
@@ -27,15 +21,16 @@ case $os in
 
         __apt_key_uri grafana \
             --name 'Grafana Release Signing Key' \
-            --uri https://packages.grafana.com/gpg.key
+            --uri https://packagecloud.io/gpg.key
 
         require="$require __apt_key_uri/grafana" __apt_source grafana \
-                    --uri https://packages.grafana.com/oss/deb \
+                    --uri https://packagecloud.io/grafana/stable/debian/ \
                     --distribution $apt_source_distribution \
                     --component main
+
         __package apt-transport-https
-        require="$require __apt_source/grafana" __apt_update_index
+
-        require="$require  __package/apt-transport-https __apt_update_index" __package grafana
+        require="$require __apt_source/grafana __package/apt-transport-https" __package grafana
         require="$require __package/grafana" __start_on_boot grafana-server
         require="$require __start_on_boot/grafana-server" __process grafana-server --start "service grafana-server start"
         ;;

cdist/conf/type/__group/explorer/group

@@ -1,7 +1,6 @@
 #!/bin/sh
 #
 # 2011-2015 Steven Armstrong (steven-cdist at armstrong.cc)
-# 2019 Dennis Camera (dennis.camera at ssrq-sds-fds.ch)
 #
 # This file is part of cdist.
 #
@@ -22,21 +21,7 @@
 # Get an existing groups group entry.
 #
 
-not_supported() {
-	echo "Your operating system ($("$__explorer/os")) is currently not supported." >&2
-	echo "Cannot extract group information." >&2
-	echo "Please contribute an implementation for it if you can." >&2
-	exit 1
-}
-
 name=$__object_id
 
-if command -v getent >/dev/null
-then
 getent group "$name" || true
-elif [ -f /etc/group ]
+
-then
-	grep "^${name}:" /etc/group || true
-else
-	not_supported
-fi

cdist/conf/type/__group/explorer/gshadow

@@ -1,7 +1,6 @@
 #!/bin/sh
 #
 # 2011-2015 Steven Armstrong (steven-cdist at armstrong.cc)
-# 2019 Dennis Camera (dennis.camera at ssrq-sds-fds.ch)
 #
 # This file is part of cdist.
 #
@@ -23,28 +22,13 @@
 #
 
 name=$__object_id
-os=$("$__explorer/os")
+os="$("$__explorer/os")"
 
-not_supported() {
+case "$os" in
-	echo "Your operating system ($os) is currently not supported." >&2
-	echo "Cannot extract group information." >&2
-	echo "Please contribute an implementation for it if you can." >&2
-	exit 1
-}
-
-case $os in
     "freebsd"|"netbsd")
-		echo "$os does not have getent gshadow" >&2
+	echo "$os does not have getent gshadow"
 	exit 0
     ;;
 esac
 
-if command -v getent >/dev/null
-then
 getent gshadow "$name" || true
-elif [ -f /etc/gshadow ]
-then
-	grep "^${name}:" /etc/gshadow || true
-else
-	not_supported
-fi

cdist/conf/type/__hostname/explorer/has_hostnamectl

@@ -21,4 +21,4 @@
 # Check whether system has hostnamectl
 #
 
-command -v hostnamectl 2>/dev/null || true
+command -v hostnamectl || true

cdist/conf/type/__hostname/explorer/hostname_file

@@ -1,6 +1,6 @@
-#!/bin/sh -e
+#!/bin/sh
 #
-# 2018-2019 Thomas Eckert (tom at it-eckert.de)
+# 2014 Nico Schottelius (nico-cdist at schottelius.org)
 #
 # This file is part of cdist.
 #
@@ -16,8 +16,15 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with cdist. If not, see <http://www.gnu.org/licenses/>.
+#
+#
+# Retrieve the contents of /etc/hostname
+#
 
-## to speed up config-reload we send a HUP to the server process:
+# Almost any distribution
-cat <<-EOT
+if [ -f /etc/hostname ]; then
-	pkill -HUP xymond || { echo "HUPing xymond failed" >&2; exit 1; }
+    cat /etc/hostname
-EOT
+# SuSE
+elif [ -f /etc/HOSTNAME ]; then
+    cat /etc/HOSTNAME
+fi

cdist/conf/type/__hostname/explorer/hostname_sysconfig

@@ -1,6 +1,6 @@
-#!/bin/sh -e
+#!/bin/sh
 #
-# 2018-2019 Thomas Eckert (tom at it-eckert.de)
+# 2014 Nico Schottelius (nico-cdist at schottelius.org)
 #
 # This file is part of cdist.
 #
@@ -16,7 +16,11 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with cdist. If not, see <http://www.gnu.org/licenses/>.
+#
+#
+# Retrieve the contents of /etc/hostname
+#
 
-if [ -d /etc/apache2/mods-enabled ]; then
+if [ -f /etc/sysconfig/network ]; then
-	ls -1 /etc/apache2/conf-enabled/
+    awk -F= '/^HOSTNAME=/ { print $2 }' /etc/sysconfig/network
 fi

cdist/conf/type/__hostname/explorer/max_len

@@ -1,10 +0,0 @@
-#!/bin/sh -e
-
-command -v getconf >/dev/null || exit 0
-
-val=$(getconf HOST_NAME_MAX 2>/dev/null) || exit 0
-
-if test -n "${val}" -a "${val}" != 'undefined'
-then
-	echo "${val}"
-fi

cdist/conf/type/__hostname/gencode-remote

@@ -2,7 +2,6 @@
 #
 # 2014-2017 Steven Armstrong (steven-cdist at armstrong.cc)
 # 2014 Nico Schottelius (nico-cdist at schottelius.org)
-# 2019 Dennis Camera (dennis.camera at ssrq-sds-fds.ch)
 #
 # This file is part of cdist.
 #
@@ -20,81 +19,60 @@
 # along with cdist. If not, see <http://www.gnu.org/licenses/>.
 #
 
-os=$(cat "$__global/explorer/os")
+if [ -f "$__object/parameter/name" ]; then
-name_running=$(cat "$__global/explorer/hostname")
+    name_should="$(cat "$__object/parameter/name")"
-has_hostnamectl=$(cat "$__object/explorer/has_hostnamectl")
-
-
-if test -s "$__object/parameter/name"
-then
-    name_should=$(cat "$__object/parameter/name")
 else
-    case $os
-    in
-        # RedHat-derivatives and BSDs
-        centos|fedora|redhat|scientific|freebsd|macosx|netbsd|openbsd)
-            # Hostname is FQDN
-            name_should="${__target_host}"
-        ;;
-        *)
-            # Hostname is only first component of FQDN
     name_should="${__target_host%%.*}"
-        ;;
-    esac
 fi
 
+os=$(cat "$__global/explorer/os")
+name_running=$(cat "$__global/explorer/hostname")
+name_config=$(cat "$__object/explorer/hostname_file")
+name_sysconfig=$(cat "$__object/explorer/hostname_sysconfig")
+has_hostnamectl=$(cat "$__object/explorer/has_hostnamectl")
 
 ################################################################################
-# Check if the (running) hostname is already correct
+# If everything is ok -> exit
 #
-test "$name_running" != "$name_should" || exit 0
+case "$os" in
-
+    archlinux|debian|suse|ubuntu|devuan|coreos|alpine)
+        if [ "$name_config" = "$name_should" ] && [ "$name_running" = "$name_should" ]; then
+            exit 0
+        fi
+    ;;
+    scientific|centos|freebsd|openbsd)
+        if [ "$name_sysconfig" = "$name_should" ] && [ "$name_running" = "$name_should" ]; then
+            exit 0
+        fi
+    ;;
+    *)
+        echo "Unsupported os: $os" >&2
+        exit 1
+    ;;
+esac
 
 ################################################################################
 # Setup hostname
 #
-echo 'changed' >>"$__messages_out"
+echo changed >> "$__messages_out"
 
-# Use the good old way to set the hostname.
+# Use the good old way to set the hostname even on machines running systemd.
-case $os
+case "$os" in
-in
+    archlinux|debian|ubuntu|devuan|centos|coreos|alpine)
-    alpine|debian|devuan|ubuntu)
+        printf "printf '%%s\\\\n' '$name_should' > /etc/hostname\\n"
-        echo 'hostname -F /etc/hostname'
+        echo "hostname -F /etc/hostname"
     ;;
-    archlinux)
+    freebsd|openbsd)
-        echo 'command -v hostnamectl >/dev/null 2>&1' \
-            "&& hostnamectl set-hostname '$name_should'" \
-            "|| hostname '$name_should'"
-    ;;
-    centos|fedora|redhat|scientific|freebsd|netbsd|openbsd|gentoo|void)
         echo "hostname '$name_should'"
     ;;
-    macosx)
+    suse)
-        echo "scutil --set HostName '$name_should'"
-    ;;
-    solaris)
-        echo "uname -S '$name_should'"
-    ;;
-    slackware|suse|opensuse-leap)
-        # We do not read from /etc/HOSTNAME, because the running
-        # hostname is the first component only while the file contains
-        # the FQDN.
         echo "hostname '$name_should'"
-    ;;
+        printf "printf '%%s\\\\n' '$name_should' > /etc/HOSTNAME\\n"
-    *)
-        # Fall back to set the hostname using hostnamectl, if available.
-        if test -n "$has_hostnamectl"
-        then
-            # Don't use hostnamectl as the primary means to set the hostname for
-            # systemd systems, because it cannot be trusted to work reliably and
-            # exit with non-zero when it fails (e.g. hostname too long,
-            # D-Bus failure, etc.).
-
-            echo "hostnamectl set-hostname \"\$(cat /etc/hostname)\""
-            echo "test \"\$(hostname)\" = \"\$(cat /etc/hostname)\"" \
-                 " || hostname -F /etc/hostname"
-        else
-            printf "echo 'Unsupported OS: %s' >&2\nexit 1\n" "$os"
-        fi
     ;;
 esac
+
+if [ "$has_hostnamectl" ]; then
+    # Allow hostnamectl set-hostname to fail silently.
+    # Who the fuck invented a tool that needs dbus to set the hostname anyway ...
+    echo "hostnamectl set-hostname '$name_should' || true"
+fi

cdist/conf/type/__hostname/man.rst

@@ -8,10 +8,7 @@ cdist-type__hostname - Set the hostname
 
 DESCRIPTION
 -----------
-Sets the hostname on various operating systems.
+Set's the hostname on various operating systems.
-
-**Tip:** For advice on choosing a hostname, see
-`RFC 1178 <https://tools.ietf.org/html/rfc1178>`_.
 
 
 REQUIRED PARAMETERS

cdist/conf/type/__hostname/manifest

@@ -2,7 +2,6 @@
 #
 # 2012 Steven Armstrong (steven-cdist at armstrong.cc)
 # 2014 Nico Schottelius (nico-cdist at schottelius.org)
-# 2019 Dennis Camera (dennis.camera at ssrq-sds-fds.ch)
 #
 # This file is part of cdist.
 #
@@ -20,170 +19,50 @@
 # along with cdist. If not, see <http://www.gnu.org/licenses/>.
 #
 
+os=$(cat "$__global/explorer/os")
+if [ -f "$__object/parameter/name" ]; then
+    name_should="$(cat "$__object/parameter/name")"
+else
+    case "$os" in
+    openbsd)
+        name_should="${__target_host}"
+    ;;
+    *)
+        name_should="${__target_host%%.*}"
+    ;;
+    esac
+fi
+
+
 not_supported() {
    echo "Your operating system ($os) is currently not supported by this type (${__type##*/})." >&2
    echo "Please contribute an implementation for it if you can." >&2
    exit 1
 }
 
-set_hostname_systemd() {
+case "$os" in
-    echo "$1" | __file /etc/hostname --source -
+    archlinux|debian|suse|ubuntu|devuan|coreos|alpine)
-}
-
-os=$(cat "$__global/explorer/os")
-os_version=$(cat "$__global/explorer/os_version")
-os_major=$(echo "$os_version" | grep -o '^[0-9][0-9]*' || true)
-
-max_len=$(cat "$__object/explorer/max_len")
-has_hostnamectl=$(cat "$__object/explorer/has_hostnamectl")
-
-if test -s "$__object/parameter/name"
-then
-    name_should=$(cat "$__object/parameter/name")
-else
-    case $os
-    in
-        # RedHat-derivatives and BSDs
-        centos|fedora|redhat|scientific|freebsd|netbsd|openbsd|slackware)
-            # Hostname is FQDN
-            name_should="${__target_host}"
-        ;;
-        suse|opensuse-leap)
-            # Classic SuSE stores the FQDN in /etc/HOSTNAME, while
-            # systemd does not. The running hostname is the first
-            # component in both cases.
-            # In versions before 15.x, the FQDN is stored in /etc/hostname.
-            if test -n "$has_hostnamectl" && test "$os_major" -ge 15 \
-                    && test "$os_major" -ne 42
-            then
-                name_should="${__target_host%%.*}"
-            else
-                name_should="${__target_host}"
-            fi
-        ;;
-        *)
-            # Hostname is only first component of FQDN on all other systems.
-            name_should="${__target_host%%.*}"
-        ;;
-    esac
-fi
-
-if test -n "$max_len" && test "$(printf '%s' "$name_should" | wc -c)" -gt "$max_len"
-then
-    printf "Host name too long. Up to %u characters allowed.\n" "${max_len}" >&2
-    exit 1
-fi
-
-case $os
-in
-    alpine|debian|devuan|ubuntu|void)
-        echo "$name_should" | __file /etc/hostname --source -
-    ;;
-    archlinux)
-        if test -n "$has_hostnamectl"
-        then
-            set_hostname_systemd "$name_should"
-        else
-            echo 'Ancient ArchLinux variants without hostnamectl are not supported.' >&2
-            exit 1
-            # Only for ancient ArchLinux, write to /etc/rc.conf on pre-systemd
-            # versions.  There are some versions which use /etc/hostname but not
-            # systemd. It is unclear which ones these are.
-
-            # __key_value '/etc/rc.conf:HOSTNAME' \
-            #     --file /etc/rc.conf \
-            #     --delimiter '=' --exact_delimiter \
-            #     --key 'HOSTNAME' \
-            #     --value "\"$name_should\""
-        fi
-        ;;
-    centos|fedora|redhat|scientific)
-        if test -z "$has_hostnamectl"
-        then
-            # Only write to /etc/sysconfig/network on non-systemd versions.
-            # On systemd-based versions this entry is ignored.
-            __key_value '/etc/sysconfig/network:HOSTNAME' \
-                --file /etc/sysconfig/network \
-                --delimiter '=' --exact_delimiter \
-                --key HOSTNAME \
-                --value "\"$name_should\""
-        else
-            set_hostname_systemd "$name_should"
-        fi
-    ;;
-    gentoo)
-        # Only write to /etc/conf.d/hostname on OpenRC-based installations.
-        # On systemd use hostnamectl(1) in gencode-remote.
-        if test -z "$has_hostnamectl"
-        then
-            __key_value '/etc/conf.d/hostname:hostname' \
-                --file /etc/conf.d/hostname \
-                --delimiter '=' --exact_delimiter \
-                --key 'hostname' \
-                --value "\"$name_should\""
-        else
-            set_hostname_systemd "$name_should"
-        fi
-    ;;
-    freebsd)
-        __key_value '/etc/rc.conf:hostname' \
-            --file /etc/rc.conf \
-            --delimiter '=' --exact_delimiter \
-            --key 'hostname' \
-            --value "\"$name_should\""
-    ;;
-    macosx)
         # handled in gencode-remote
         :
     ;;
-    netbsd)
+    scientific|centos)
-        __key_value '/etc/rc.conf:hostname' \
+        __key_value sysconfig-hostname \
+            --file /etc/sysconfig/network \
+            --delimiter '=' \
+            --key HOSTNAME \
+            --value "$name_should" --exact_delimiter
+    ;;
+    freebsd)
+        __key_value rcconf-hostname \
             --file /etc/rc.conf \
-            --delimiter '=' --exact_delimiter \
+            --delimiter '=' \
             --key 'hostname' \
-            --value "\"$name_should\""
+            --value "$name_should"
-
-        # To avoid confusion, ensure that the hostname is only stored once.
-        __file /etc/myname --state absent
     ;;
     openbsd)
         echo "$name_should" | __file /etc/myname --source -
     ;;
-    slackware)
-        # We write the FQDN into /etc/HOSTNAME.  But /etc/rc.d/rc.M will only
-        # read the first component from this file and set it as the running
-        # hostname on boot.
-        echo "$name_should" | __file /etc/HOSTNAME --source -
-    ;;
-    solaris)
-        echo "$name_should" | __file /etc/nodename --source -
-    ;;
-    suse|opensuse-leap)
-        # Modern SuSE provides /etc/HOSTNAME as a symlink for
-        # backwards-compatibility. Unfortunately it cannot be used
-        # here as __file does not follow the symlink.
-        # Therefore, we use the presence of the hostnamectl binary as
-        # an indication of which file to use.  This unfortunately does
-        # not work correctly on openSUSE 12.x which provides
-        # hostnamectl but not /etc/hostname.
-
-        if test -n "$has_hostnamectl" -a "$os_major" -gt 12
-        then
-            hostname_file='/etc/hostname'
-        else
-            hostname_file='/etc/HOSTNAME'
-        fi
-
-        echo "$name_should" | __file "$hostname_file" --source -
-    ;;
     *)
-        # On other operating systems we fall back to systemd's
-        # hostnamectl if available…
-        if test -n "$has_hostnamectl"
-        then
-            set_hostname_systemd "$name_should"
-        else
         not_supported
-        fi
     ;;
 esac

cdist/conf/type/__install_chroot_umount/manifest

@@ -1 +0,0 @@
-../__chroot_umount/manifest

cdist/conf/type/__install_directory/man.rst

@@ -1,101 +0,0 @@
-cdist-type__install_directory(7)
-================================
-
-NAME
-----
-cdist-type__install_directory - Manage a directory with install command
-
-
-DESCRIPTION
------------
-This cdist type allows you to create or remove directories on the target.
-
-
-REQUIRED PARAMETERS
--------------------
-None.
-
-
-OPTIONAL PARAMETERS
--------------------
-state
-   'present' or 'absent', defaults to 'present'
-
-group
-   Group to chgrp to.
-
-mode
-   Unix permissions, suitable for chmod.
-
-owner
-   User to chown to.
-
-
-BOOLEAN PARAMETERS
-------------------
-parents
-   Whether to create parents as well (mkdir -p behaviour).
-   Warning: all intermediate directory permissions default
-   to whatever mkdir -p does. 
-
-   Usually this means root:root, 0700.
-
-recursive
-   If supplied the chgrp and chown call will run recursively.
-   This does *not* influence the behaviour of chmod.
-
-MESSAGES
---------
-chgrp <group>
-    Changed group membership
-chown <owner>
-    Changed owner
-chmod <mode>
-    Changed mode
-create
-    Empty directory was created
-remove
-    Directory exists, but state is absent, directory will be removed by generated code.
-remove non directory
-    Something other than a directory with the same name exists and was removed prior to create.
-
-
-EXAMPLES
---------
-
-.. code-block:: sh
-
-    # A silly example
-    __install_directory /tmp/foobar
-
-    # Remove a directory
-    __install_directory /tmp/foobar --state absent
-
-    # Ensure /etc exists correctly
-    __install_directory /etc --owner root --group root --mode 0755
-
-    # Create nfs service directory, including parents
-    __install_directory /home/services/nfs --parents
-
-    # Change permissions recursively
-    __install_directory /home/services --recursive --owner root --group root
-
-    # Setup a temp directory
-    __install_directory /local --mode 1777
-
-    # Take it all
-    __install_directory /home/services/kvm --recursive --parents \
-        --owner root --group root --mode 0755 --state present
-
-
-AUTHORS
--------
-Nico Schottelius <nico-cdist--@--schottelius.org>
-
-
-COPYING
--------
-Copyright \(C) 2011 Nico Schottelius. You can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.

cdist/conf/type/__install_directory/man.rst

@@ -0,0 +1 @@
+../__directory/man.rst

cdist/conf/type/__install_file/man.rst

@@ -23,10 +23,6 @@ symlink
 directory
   replace it with the source file
 
-One exception is that when state is pre-exists, an error is raised if
-the file would have been created otherwise (e.g. it is not present or
-not a regular file).
-
 In any case, make sure that the file attributes are as specified.
 
 
@@ -37,7 +33,7 @@ None.
 OPTIONAL PARAMETERS
 -------------------
 state
-   'present', 'absent', 'exists' or 'pre-exists', defaults to 'present' where:
+   'present', 'absent' or 'exists', defaults to 'present' where:
 
    present
       the file is exactly the one from source
@@ -45,9 +41,6 @@ state
       the file does not exist
    exists
       the file from source but only if it doesn't already exist
-   pre-exists
-      check that the file exists and is a regular file, but do not
-      create or modify it
 
 group
    Group to chgrp to.
@@ -63,9 +56,6 @@ source
    If not supplied, an empty file or directory will be created.
    If source is '-' (dash), take what was written to stdin as the file content.
 
-onchange
-   The code to run if file is modified.
-
 MESSAGES
 --------
 chgrp <group>
@@ -103,8 +93,6 @@ EXAMPLES
     __install_file /home/frodo/.bashrc --source "/etc/skel/.bashrc" \
        --state exists \
        --owner frodo --mode 0600
-    # Check that the file is present, show an error when it is not
-    __install_file /etc/somefile --state pre-exists
     # Take file content from stdin
     __install_file /tmp/whatever --owner root --group root --mode 644 --source - << DONE
         Here goes the content for /tmp/whatever

cdist/conf/type/__iocage_clone/gencode-remote

@@ -1,152 +0,0 @@
-#!/bin/sh
-
-state="$(cat $__object/parameter/state)"
-template="$(cat $__object/parameter/template)"
-ip4_addr="$(cat $__object/parameter/bridge)|$(cat $__object/parameter/ip)"
-interfaces="none:none"
-defaultrouter="none"
-vnet="off"
-jail_zfs_dataset="$(cat $__object/parameter/jail_zfs_dataset)"
-devfs_ruleset="$(cat $__object/parameter/devfs_ruleset)"
-allow_socket_af="$(cat $__object/parameter/allow_socket_af)"
-mount_procfs="$(cat $__object/parameter/mount_procfs)"
-mount_linprocfs="$(cat $__object/parameter/mount_linprocfs)"
-
-if [ "X$state" = "Xabsent" ]; then
-  cat <<EOF
-    iocage stop $__object_id || true
-    iocage destroy -f $__object_id || true
-    rm -f /iocage/jails/$__object_id
-EOF
-else 
-  cat <<EOF
-get_property_zfs () {
-  zfs get -H -o value \$1 "\$2"
-}
-
-get_property_iocage () {
-  get_property_zfs "org.freebsd.iocage:\$1" "/iocage/jails/\$2"
-}
-
-create_new=0
-if [ ! -d /iocage/jails/"$__object_id" ]; then
-  echo "Jail $__object_id does not exist, going to create."
-  create_new=1
-else
-  base=\$(get_property_zfs origin "/iocage/jails/$__object_id")
-  current_template=\$(get_property_zfs org.freebsd.iocage:tag "\$base")
-  if [ "X\$current_template" != "X$template" ]; then
-    echo "Jail $__object_id has base \$current_template, which is not $template. " >&2
-    create_new=1
-  fi
-fi
-
-if [ \$create_new -eq 0 ]; then
-  if [ "off" == "\$(get_property_iocage jail_zfs "$__object_id")" ]; then
-    current_jail_zfs_dataset=""
-  else
-    current_jail_zfs_dataset="\$(get_property_iocage jail_zfs_dataset "$__object_id")"
-  fi
-fi
-
-configure=0
-if [ \$create_new -eq 1 ]; then
-  configure=1
-elif [ "X$vnet" != "X\$(get_property_iocage vnet "$__object_id")" ]; then
-  configure=1
-elif [ "X$ip4_addr" != "X\$(get_property_iocage ip4_addr "$__object_id")" ]; then
-  configure=1
-elif [ "X$interfaces" != "X\$(get_property_iocage interfaces "$__object_id")" ]; then
-  configure=1
-elif [ "X$defaultrouter" != "X\$(get_property_iocage defaultrouter "$__object_id")" ]; then
-  configure=1
-elif [ "X$mount_procfs" != "X\$(get_property_iocage mount_procfs "$__object_id")" ]; then
-  configure=1
-elif [ "X$devfs_ruleset" != "X\$(get_property_iocage devfs_ruleset "$__object_id")" ]; then
-  configure=1
-elif [ "X$allow_socket_af" != "X\$(get_property_iocage allow_socket_af "$__object_id")" ]; then
-  configure=1
-elif [ "X$jail_zfs_dataset" != "X\$current_jail_zfs_dataset" ]; then
-  configure=1
-fi
-
-if [ \$create_new -eq 1 ]; then
-  echo "Creating jail $__object_id" >&2
-
-  iocage stop $__object_id || true
-  iocage destroy -f $__object_id || true
-  # Without VNETs, we should not need this.
-  # TODO(riso): Use nicer path
-  # /root/cdist/ioc deconfigure $__object_id
-
-  rm -f /iocage/jails/$__object_id
-
-  iocage clone $template tag=$__object_id
-  iocage set boot=on $__object_id
-  UUID=\$(iocage list | grep " $__object_id " | awk "{ print \\\$2; }")
-  rm -f /iocage/jails/$__object_id
-  ln -s /iocage/jails/\$UUID /iocage/jails/$__object_id
-else
-  UUID=\$(iocage list | grep " $__object_id " | awk "{ print \\\$2; }")
-  echo "Jail $__object_id already exists, UUID=\$UUID" >&2
-fi
-
-ROOT="/iocage/jails/\$UUID/root"
-FSTAB="/iocage/jails/\$UUID/fstab"
-rm -f \$FSTAB.new
-touch \$FSTAB.new
-cat $__object/parameter/mount 2>/dev/null | \\
-while read mount; do
-  src=\$(echo \$mount | awk -F: "{ print \\\$1; }")
-  dst_rel=\$(echo \$mount | awk -F: "{ print \\\$2; }")
-  dst="/iocage/jails/\$UUID/root/\$dst_rel"
-  mkdir -p "\$dst"
-  echo "\$src	\$dst	nullfs	rw	0	0" >>\$FSTAB.new
-done
-if [ $mount_linprocfs -eq 1 ]; then
-  echo "linproc /iocage/jails/\$UUID/root/compat/linux/proc linprocfs rw 0 0" >>\$FSTAB.new
-fi
-
-fstab_changed=0
-if diff -q \$FSTAB \$FSTAB.new >/dev/null; then
-  # pass
-else
-  configure=1
-  fstab_changed=1
-fi
-
-if [ \$configure -eq 1 ]; then
-  echo "Configuring jail $__object_id." >&2
-  iocage stop $__object_id || true
-
-  iocage set vnet="$vnet" $__object_id
-  iocage set interfaces="$interfaces" $__object_id
-  iocage set hostname="$__object_id" $__object_id
-  iocage set ip4_addr="$ip4_addr" $__object_id
-  iocage set defaultrouter="$defaultrouter" $__object_id
-  iocage set mount_procfs="$mount_procfs" $__object_id
-  iocage set devfs_ruleset="$devfs_ruleset" $__object_id
-  iocage set allow_socket_af="$allow_socket_af" $__object_id
-  if [ -n "$jail_zfs_dataset" ]; then
-    iocage set jail_zfs=on $__object_id
-    iocage set jail_zfs_dataset="$jail_zfs_dataset" $__object_id
-  else
-    iocage set jail_zfs=off $__object_id
-  fi
-
-  if [ \$fstab_changed -eq 1 ]; then
-    umount -afF \$FSTAB || true
-    mv \$FSTAB.new \$FSTAB
-  fi
-
-  iocage start $__object_id || true
-
-  # Iocage creates new mac address, but arp can have an old mac cached.
-  # TODO(riso): Is this true without VNETs?
-  arp -d -a
-else
-  echo "Jail $__object_id is already configured." >&2
-fi
-rm -f \$FSTAB.new
-EOF
-fi

cdist/conf/type/__iocage_clone/manifest

@@ -1 +0,0 @@
-__package iocage

cdist/conf/type/__iocage_clone/parameter/default/allow_socket_af

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

cdist/conf/type/__iocage_clone/parameter/default/bridge

@@ -1 +0,0 @@
-bridge0

cdist/conf/type/__iocage_clone/parameter/default/devfs_ruleset

@@ -1 +0,0 @@
-4

cdist/conf/type/__iocage_clone/parameter/default/mount_linprocfs

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

cdist/conf/type/__iocage_clone/parameter/default/mount_procfs

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

cdist/conf/type/__iocage_clone/parameter/default/net

@@ -1 +0,0 @@
-24

cdist/conf/type/__iocage_clone/parameter/default/state

@@ -1 +0,0 @@
-present

cdist/conf/type/__iocage_clone/parameter/optional

@@ -1,7 +0,0 @@
-state
-bridge
-jail_zfs_dataset
-mount_procfs
-mount_linprocfs
-devfs_ruleset
-allow_socket_af

cdist/conf/type/__iocage_clone/parameter/optional_multiple

@@ -1 +0,0 @@
-mount

cdist/conf/type/__iocage_clone/parameter/required

@@ -1,2 +0,0 @@
-ip
-template

cdist/conf/type/__letsencrypt_acmetiny/gencode-remote

@@ -1,112 +0,0 @@
-#!/bin/sh -e
-
-ACME_TINY_CERT_REQUEST_DIR="/var/acme-tiny/cert-requests"
-ACME_TINY_ACCOUNT_KEY="/var/acme-tiny/account.key"
-ACME_CHALLENGE_DIR="/srv/www/sites/acme/public/.well-known/acme-challenge"
-
-REALM="${__object_id}"
-EXTRA_DOMAINS=""
-if [ -f "${__object}/parameter/extra-domain" ]; then
-  EXTRA_DOMAINS="$(cat "${__object}/parameter/extra-domain")"
-fi
-
-#TODO: support linux too
-REALMS_DIR="/usr/local/etc/pki/realms"
-REALM_DIR="${REALMS_DIR}/${REALM}"
-REALM_CERT="${REALM_DIR}/default.crt"
-REALM_KEY="${REALM_DIR}/default.key"
-REALM_CERT_REQUEST="${ACME_TINY_CERT_REQUEST_DIR}/${REALM}.csr"
-REALM_CERT_REQUEST_CNF="${ACME_TINY_CERT_REQUEST_DIR}/${REALM}.cnf"
-
-CSR_ALT_NAMES=""
-REALM_CERT_REQUEST_CNF_LINE=""
-if [ -n "${EXTRA_DOMAINS}" ]; then
-  CSR_ALT_NAMES="DNS:${REALM}"
-  for domain in ${EXTRA_DOMAINS}; do
-    CSR_ALT_NAMES="${CSR_ALT_NAMES},DNS:${domain}"
-  done
-  # CSR requests are executed always against .new, only after succeeding .new replaces the .cnf
-  REALM_CERT_REQUEST_CNF_LINE="-reqexts SAN -config '${REALM_CERT_REQUEST_CNF}.new'"
-fi
-
-cat << EOF
-if [ ! -d '${REALM_DIR}' ]; then
-  mkdir -p '${REALM_DIR}'
-fi
-if [ ! -f '${REALM_KEY}' ]; then
-  openssl genrsa 4096 > '${REALM_KEY}'
-fi
-
-if [ ! -d '${ACME_TINY_CERT_REQUEST_DIR}' ]; then
-  mkdir '${ACME_TINY_CERT_REQUEST_DIR}'
-fi
-
-FORCE_CSR_REGEN=""
-if [ -n '${CSR_ALT_NAMES}' ]; then
-  # Generate new config
-  cat /etc/ssl/openssl.cnf > '${REALM_CERT_REQUEST_CNF}.new'
-  printf '[SAN]\nsubjectAltName=${CSR_ALT_NAMES}' >> '${REALM_CERT_REQUEST_CNF}.new'
-  # Compare to previous config if necessary
-  if [ -f '${REALM_CERT_REQUEST_CNF}' ]; then
-    CNF_DIFF=\$(diff -q '${REALM_CERT_REQUEST_CNF}' '${REALM_CERT_REQUEST_CNF}.new' || true)
-    if [ -n "\${CNF_DIFF}" ]; then
-      # Options have changed
-      FORCE_CSR_REGEN="YES"
-    else
-      # Since they match, we won't be using this, clean it
-      rm '${REALM_CERT_REQUEST_CNF}.new'
-    fi
-  else
-    # We never used SAN here, CSR regen needed.
-    FORCE_CSR_REGEN="YES"
-  fi
-else
-  # We used SAN at some point, not any more
-  if [ -f '${REALM_CERT_REQUEST_CNF}' ]; then
-    rm '${REALM_CERT_REQUEST_CNF}'
-    FORCE_CSR_REGEN="YES"
-  fi
-fi
-
-# Create or re-create when params have changed
-if [ ! -f '${REALM_CERT_REQUEST}' -o -n "\${FORCE_CSR_REGEN}" ]; then
-  openssl req -new -sha256 -key '${REALM_KEY}' -subj '/CN=${REALM}' -out '${REALM_CERT_REQUEST}' ${REALM_CERT_REQUEST_CNF_LINE}
-fi
-
-# Check if cert exists, and if so whether or not it's older than a month
-if [ -f '${REALM_CERT}' ]; then
-  MODIFIED_IN_30d="\$(find '${REALM_CERT}' -mtime -30d)"
-  if [ -z "\${MODIFIED_IN_30d}" ]; then
-    # Cert is over a month old, it's fine to regenerate
-    FORCE_CRT_REGEN="YES"
-  fi
-else
-  # This cert doesn't exist
-  FORCE_CRT_REGEN="YES"
-fi
-
-
-# Only request certificate when needed
-# TODO: support linux too
-if [ -n "\${FORCE_CSR_REGEN}" -o -n "\${FORCE_CRT_REGEN}" ]; then
-  doas -u acme-tiny -- acme_tiny \
-    --account '${ACME_TINY_ACCOUNT_KEY}' \
-    --csr '${REALM_CERT_REQUEST}' \
-    --acme-dir '${ACME_CHALLENGE_DIR}' > '${REALM_CERT}.new'
-
-  if [ -s '${REALM_CERT}.new' ]; then
-    mv '${REALM_CERT}.new' '${REALM_CERT}'
-  else
-    echo "Failed to generate cert for realm '${REALM}'."
-    exit 1
-  fi
-fi
-
-cat "${REALM_CERT}" "${REALMS_DIR}/chain.pem" > ${REALM_DIR}/fullchain.pem
-
-if [ -n '${REALM_CERT_REQUEST_CNF_LINE}' -a -f '${REALM_CERT_REQUEST_CNF}.new' ]; then
-  # CSR and cert generation succeded with a new config, put new config in-place.
-  # This is the last thing we do, so we try again next time if sth fails.
-  mv '${REALM_CERT_REQUEST_CNF}.new' '${REALM_CERT_REQUEST_CNF}'
-fi
-EOF

cdist/conf/type/__letsencrypt_acmetiny/manifest

@@ -1 +0,0 @@
-#__letsencrypt_acmetiny_base