diff --git a/.gitattributes b/.gitattributes
deleted file mode 100644
index 01d20f30..00000000
--- a/.gitattributes
+++ /dev/null
@@ -1,8 +0,0 @@
-.gitignore export-ignore
-.gitattributes export-ignore
-.gitkeep export-ignore
-docs/speeches export-ignore
-docs/video export-ignore
-docs/src/man7 export-ignore
-bin/cdist-build-helper export-ignore
-README-maintainers export-ignore
diff --git a/.gitignore b/.gitignore
index 85a8ccc7..baf9b6f2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,54 +1,24 @@
# -vim
-# Swap
-[._]*.s[a-v][a-z]
-[._]*.sw[a-p]
-[._]s[a-rt-v][a-z]
-[._]ss[a-gi-z]
-[._]sw[a-p]
-
-# Session
-Session.vim
-
-# Temporary
-.netrwhist
-*~
-*.tmp
-# Auto-generated tag files
-tags
-# Persistent undo
-[._]*.un~
+.*.swp
# Ignore generated manpages
-docs/src/.marker
-docs/src/man1/*.1
-docs/src/man7/*.7
-docs/src/man7/cdist-type__*.rst
-docs/src/cdist-reference.rst
-docs/src/cdist-types.rst
-docs/src/cdist.cfg.skeleton
+docs/man/.marker
+docs/man/man1/*.1
+docs/man/man7/*.7
+docs/man/man*/*.html
+docs/man/man*/*.xml
+docs/man/man*/docbook-xsl.css
+docs/man/man7/cdist-type__*.text
+docs/man/man7/cdist-reference.text
# Ignore cdist cache for version control
/cache/
-# Ignore inventory basedir
-cdist/inventory/
-
# Python: cache, distutils, distribution in general
__pycache__/
-*.pyc
-/MANIFEST
+MANIFEST
dist/
cdist/version.py
-cdist.egg-info/
-
-# sphinx build dirs, cache
-_build/
-docs/dist
-
-# Ignore temp files used for signing
-cdist-*.tar
-cdist-*.tar.gz
-cdist-*.tar.gz.asc
# Packaging: Archlinux
/PKGBUILD
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
deleted file mode 100644
index a4bc67aa..00000000
--- a/.gitlab-ci.yml
+++ /dev/null
@@ -1,23 +0,0 @@
----
-image: code.ungleich.ch:5050/ungleich-public/cdist/cdist-ci:latest
-
-stages:
- - test
-
-before_script:
- - ./bin/cdist-build-helper version
-
-shellcheck:
- stage: test
- script:
- - ./bin/cdist-build-helper shellcheck
-
-pycodestyle:
- stage: test
- script:
- - ./bin/cdist-build-helper pycodestyle
-
-unit_tests:
- stage: test
- script:
- - ./bin/cdist-build-helper test
diff --git a/LICENSE b/LICENSE
deleted file mode 100644
index 14682ad6..00000000
--- a/LICENSE
+++ /dev/null
@@ -1,674 +0,0 @@
- GNU GENERAL PUBLIC LICENSE
- Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc.
- 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 .
-
-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
-.
-
- 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
-.
diff --git a/Makefile b/Makefile
index 89286310..fb5fc09f 100644
--- a/Makefile
+++ b/Makefile
@@ -18,100 +18,106 @@
#
#
-.PHONY: help
-help:
- @echo "Please use \`make ' where is one of"
- @echo "man build only man user documentation"
- @echo "html build only html user documentation"
- @echo "docs build both man and html user documentation"
- @echo "dotman build man pages for types in your ~/.cdist directory"
- @echo "speeches build speeches pdf files"
- @echo "install install in the system site-packages directory"
- @echo "install-user install in the user site-packages directory"
- @echo "docs-clean clean documentation"
- @echo "clean clean"
+A2XM=a2x -f manpage --no-xmllint -a encoding=UTF-8
+A2XH=a2x -f xhtml --no-xmllint -a encoding=UTF-8
+# Create cross-links in html man pages
+# We look for something like "cdist-type(7)" and make a href out of it
+# The first matching group is the man page name and the second group
+# is the man page section (1 or 7). The first three lines of the input
+# (xml, DOCTYPE, head tags) are ignored, since the head tags contains
+# the title of the page and should not contain a href.
+CROSSLINK=sed --in-place '1,3!s/\([[:alnum:]_-]*\)(\([17]\))/&<\/a>/g'
+helper=./bin/build-helper
-DOCS_SRC_DIR=./docs/src
-SPEECHDIR=./docs/speeches
-TYPEDIR=./cdist/conf/type
+MANDIR=docs/man
+SPEECHDIR=docs/speeches
+TYPEDIR=cdist/conf/type
-SPHINXM=$(MAKE) -C $(DOCS_SRC_DIR) man
-SPHINXH=$(MAKE) -C $(DOCS_SRC_DIR) html
-SPHINXC=$(MAKE) -C $(DOCS_SRC_DIR) clean
+WEBSRCDIR=docs/web
+
+WEBDIR=$$HOME/vcs/www.nico.schottelius.org
+WEBBLOG=$(WEBDIR)/blog
+WEBBASE=$(WEBDIR)/software/cdist
+WEBPAGE=$(WEBBASE).mdwn
+
+CHANGELOG_VERSION=$(shell $(helper) changelog-version)
+CHANGELOG_FILE=docs/changelog
+
+PYTHON_VERSION=cdist/version.py
################################################################################
# Manpages
#
-MAN7DSTDIR=$(DOCS_SRC_DIR)/man7
+MAN1DSTDIR=$(MANDIR)/man1
+MAN7DSTDIR=$(MANDIR)/man7
# Manpages #1: Types
-# Use shell / ls to get complete list - $(TYPEDIR)/*/man.rst does not work
-# Using ls does not work if no file with given pattern exist, so use wildcard
-MANTYPESRC=$(wildcard $(TYPEDIR)/*/man.rst)
-MANTYPEPREFIX=$(subst $(TYPEDIR)/,$(MAN7DSTDIR)/cdist-type,$(MANTYPESRC))
-MANTYPES=$(subst /man.rst,.rst,$(MANTYPEPREFIX))
+# Use shell / ls to get complete list - $(TYPEDIR)/*/man.text does not work
+MANTYPESRC=$(shell ls $(TYPEDIR)/*/man.text)
-# Link manpage: do not create man.html but correct named file
-$(MAN7DSTDIR)/cdist-type%.rst: $(TYPEDIR)/%/man.rst
- mkdir -p $(MAN7DSTDIR)
+# replace first path component
+MANTYPEPREFIX=$(subst $(TYPEDIR)/,$(MAN7DSTDIR)/cdist-type,$(MANTYPESRC))
+
+# replace man.text with .7 or .html
+MANTYPEMAN=$(subst /man.text,.7,$(MANTYPEPREFIX))
+MANTYPEHTML=$(subst /man.text,.html,$(MANTYPEPREFIX))
+MANTYPEALL=$(MANTYPEMAN) $(MANTYPEHTML)
+
+# Link manpage so A2XH does not create man.html but correct named file
+$(MAN7DSTDIR)/cdist-type%.text: $(TYPEDIR)/%/man.text
ln -sf "../../../$^" $@
# Manpages #2: reference
-DOCSREF=$(MAN7DSTDIR)/cdist-reference.rst
-DOCSREFSH=$(DOCS_SRC_DIR)/cdist-reference.rst.sh
+MANREF=$(MAN7DSTDIR)/cdist-reference.text
+MANREFSH=$(MANDIR)/cdist-reference.text.sh
+MANREFMAN=$(MANREF:.text=.7)
+MANREFHTML=$(MANREF:.text=.html)
+MANREFALL=$(MANREFMAN) $(MANREFHTML)
-$(DOCSREF): $(DOCSREFSH)
- $(DOCSREFSH)
+$(MANREF): $(MANREFSH)
+ $(MANREFSH)
-# Html types list with references
-DOCSTYPESREF=$(MAN7DSTDIR)/cdist-types.rst
-DOCSTYPESREFSH=$(DOCS_SRC_DIR)/cdist-types.rst.sh
+# Manpages #3: static pages
+MAN1STATIC=$(shell ls $(MAN1DSTDIR)/*.text)
+MAN7STATIC=$(shell ls $(MAN7DSTDIR)/*.text)
+MANSTATICMAN=$(MAN1STATIC:.text=.1) $(MAN7STATIC:.text=.7)
+MANSTATICHTML=$(MAN1STATIC:.text=.html) $(MAN7STATIC:.text=.html)
+MANSTATICALL=$(MANSTATICMAN) $(MANSTATICHTML)
-$(DOCSTYPESREF): $(DOCSTYPESREFSH)
- $(DOCSTYPESREFSH)
+# Manpages #4: generic part
-DOCSCFGSKEL=./configuration/cdist.cfg.skeleton
+# Creating the type manpage
+%.1 %.7: %.text
+ $(A2XM) $^
-configskel: $(DOCSCFGSKEL)
- cp -f "$(DOCSCFGSKEL)" "$(DOCS_SRC_DIR)/"
+# Creating the type html page
+%.html: %.text
+ $(A2XH) $^
+ $(CROSSLINK) $@
-version:
- @[ -f "cdist/version.py" ] || { \
- printf "Missing 'cdist/version.py', please generate it first.\n" && exit 1; \
- }
+man: $(MANTYPEALL) $(MANREFALL) $(MANSTATICALL)
-# Manpages #3: generic part
-man: version configskel $(MANTYPES) $(DOCSREF) $(DOCSTYPESREF)
- $(SPHINXM)
+# Manpages #5: release part
+MANWEBDIR=$(WEBBASE)/man/$(CHANGELOG_VERSION)
-html: version configskel $(MANTYPES) $(DOCSREF) $(DOCSTYPESREF)
- $(SPHINXH)
+man-dist: man check-date
+ rm -rf "${MANWEBDIR}"
+ mkdir -p "${MANWEBDIR}/man1" "${MANWEBDIR}/man7"
+ cp ${MAN1DSTDIR}/*.html ${MAN1DSTDIR}/*.css ${MANWEBDIR}/man1
+ cp ${MAN7DSTDIR}/*.html ${MAN7DSTDIR}/*.css ${MANWEBDIR}/man7
+ cd ${MANWEBDIR} && git add . && git commit -m "cdist manpages update: $(CHANGELOG_VERSION)" || true
-docs: man html
-
-docs-clean:
- $(SPHINXC)
-
-# Manpages: .cdist Types
-DOT_CDIST_PATH=${HOME}/.cdist
-DOTMAN7DSTDIR=$(MAN7DSTDIR)
-DOTTYPEDIR=$(DOT_CDIST_PATH)/type
-DOTMANTYPESRC=$(wildcard $(DOTTYPEDIR)/*/man.rst)
-DOTMANTYPEPREFIX=$(subst $(DOTTYPEDIR)/,$(DOTMAN7DSTDIR)/cdist-type,$(DOTMANTYPESRC))
-DOTMANTYPES=$(subst /man.rst,.rst,$(DOTMANTYPEPREFIX))
-
-# Link manpage: do not create man.html but correct named file
-$(DOTMAN7DSTDIR)/cdist-type%.rst: $(DOTTYPEDIR)/%/man.rst
- ln -sf "$^" $@
-
-dotman: version configskel $(DOTMANTYPES) $(DOCSREF) $(DOCSTYPESREF)
- $(SPHINXM)
+man-latest-link: web-pub
+ # Fix ikiwiki, which does not like symlinks for pseudo security
+ ssh staticweb.ungleich.ch \
+ "cd /home/services/www/nico/nico.schottelius.org/www/software/cdist/man/ && rm -f latest && ln -sf "$(CHANGELOG_VERSION)" latest"
################################################################################
# Speeches
#
SPEECHESOURCES=$(SPEECHDIR)/*.tex
SPEECHES=$(SPEECHESOURCES:.tex=.pdf)
+SPEECHESWEBDIR=$(WEBBASE)/speeches
# Create speeches and ensure Toc is up-to-date
$(SPEECHDIR)/%.pdf: $(SPEECHDIR)/%.tex
@@ -121,28 +127,123 @@ $(SPEECHDIR)/%.pdf: $(SPEECHDIR)/%.tex
speeches: $(SPEECHES)
-################################################################################
-# Misc
-#
-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
+speeches-dist: speeches
+ rm -rf "${SPEECHESWEBDIR}"
+ mkdir -p "${SPEECHESWEBDIR}"
+ cp ${SPEECHES} "${SPEECHESWEBDIR}"
+ cd ${SPEECHESWEBDIR} && git add . && git commit -m "cdist speeches updated" || true
- find "$(DOCS_SRC_DIR)" -mindepth 2 -type l \
+################################################################################
+# Website
+#
+
+BLOGFILE=$(WEBBLOG)/cdist-$(CHANGELOG_VERSION)-released.mdwn
+
+$(BLOGFILE): $(CHANGELOG_FILE)
+ $(helper) blog $(CHANGELOG_VERSION) $(BLOGFILE)
+
+web-blog: $(BLOGFILE)
+
+web-doc:
+ # Go to top level, because of cdist.mdwn
+ rsync -av "$(WEBSRCDIR)/" "${WEBBASE}/.."
+ cd "${WEBBASE}/.." && git add cdist* && git commit -m "cdist doc update" cdist* || true
+
+web-dist: web-blog web-doc
+
+web-pub: web-dist man-dist speeches-dist
+ cd "${WEBDIR}" && make pub
+
+web-release-all: man-latest-link
+web-release-all-no-latest: web-pub
+
+################################################################################
+# Release: Mailinglist
+#
+ML_FILE=.lock-ml
+
+# Only send mail once - lock until new changelog things happened
+$(ML_FILE): $(CHANGELOG_FILE)
+ $(helper) ml-release $(CHANGELOG_VERSION)
+ touch $@
+
+ml-release: $(ML_FILE)
+
+
+################################################################################
+# pypi
+#
+PYPI_FILE=.pypi-release
+$(PYPI_FILE): man $(PYTHON_VERSION)
+ python3 setup.py sdist upload
+ touch $@
+
+pypi-release: $(PYPI_FILE)
+################################################################################
+# archlinux
+#
+ARCHLINUX_FILE=.lock-archlinux
+ARCHLINUXTAR=cdist-$(CHANGELOG_VERSION)-1.src.tar.gz
+
+$(ARCHLINUXTAR): PKGBUILD
+ umask 022; mkaurball
+
+PKGBUILD: PKGBUILD.in $(PYTHON_VERSION)
+ ./PKGBUILD.in $(CHANGELOG_VERSION)
+
+$(ARCHLINUX_FILE): $(ARCHLINUXTAR) $(PYTHON_VERSION)
+ burp -c system $(ARCHLINUXTAR)
+ touch $@
+
+archlinux-release: $(ARCHLINUX_FILE)
+
+################################################################################
+# Release
+#
+
+$(PYTHON_VERSION): .git/refs/heads/master
+ $(helper) version
+
+# Code that is better handled in a shell script
+check-%:
+ $(helper) $@
+
+release:
+ $(helper) $@
+
+################################################################################
+# Cleanup
+#
+
+clean:
+ rm -f $(MAN7DSTDIR)/cdist-reference.text
+
+ find "$(MANDIR)" -mindepth 2 -type l \
+ -o -name "*.1" \
+ -o -name "*.7" \
+ -o -name "*.html" \
+ -o -name "*.xml" \
| xargs rm -f
find * -name __pycache__ | xargs rm -rf
- # distutils
- rm -rf ./build
+ # Archlinux
+ rm -f cdist-*.pkg.tar.xz cdist-*.tar.gz
+ rm -rf pkg/ src/
+
+ rm -f MANIFEST PKGBUILD
+ rm -rf dist/
+
+distclean: clean
+ rm -f cdist/version.py
################################################################################
-# install
+# Misc
#
-install:
- python3 setup.py install
+# The pub is Nico's "push to all git remotes" way ("make pub")
+pub:
+ git push --mirror
-install-user:
- python3 setup.py install --user
+test:
+ $(helper) $@
diff --git a/PKGBUILD.in b/PKGBUILD.in
index c0188e68..c967249d 100755
--- a/PKGBUILD.in
+++ b/PKGBUILD.in
@@ -9,7 +9,7 @@ pkgver=$version
pkgrel=1
pkgdesc='A Usable Configuration Management System"'
arch=('any')
-url='https://www.cdi.st/'
+url='http://www.nico.schottelius.org/software/cdist/'
license=('GPL3')
depends=('python>=3.2.0')
source=("http://pypi.python.org/packages/source/c/cdist/cdist-\${pkgver}.tar.gz")
diff --git a/README b/README
new file mode 100644
index 00000000..a67e25e3
--- /dev/null
+++ b/README
@@ -0,0 +1,6 @@
+cdist
+-----
+
+cdist is a usable configuration management system.
+
+For the web documentation have a look at docs/web/.
diff --git a/README-maintainers b/README-maintainers
deleted file mode 100644
index 5766dd7d..00000000
--- a/README-maintainers
+++ /dev/null
@@ -1,4 +0,0 @@
-Maintainers should use ./bin/cdist-build-helper script.
-
-Makefile is intended for end users. It can be used for non-maintaining
-targets that can be run from pure source (without git repository).
diff --git a/README.4 b/README.4
new file mode 100644
index 00000000..04258873
--- /dev/null
+++ b/README.4
@@ -0,0 +1,24 @@
+This branch contains experimental features for cdist 4.x:
+
+ - install support
+ - preos support
+
+They are not yet stable:
+
+ - use them at your own risk
+ - all __install types may change at any time (syntax, parameter, etc.)
+ - explorers for install may be broken
+
+ - core code is based on the master branch, but
+ contains changes for install and preos feature
+
+
+In short:
+
+ _ _ _
+ _ _ ___ ___ __ _| |_ _ _ ___ _ _ _ __ _____ ___ __ _ __(_)___| | __
+| | | / __|/ _ \ / _` | __| | | | |/ _ \| | | | '__| / _ \ \ /\ / / '_ \ | '__| / __| |/ /
+| |_| \__ \ __/ | (_| | |_ | |_| | (_) | |_| | | | (_) \ V V /| | | | | | | \__ \ <
+ \__,_|___/\___| \__,_|\__| \__, |\___/ \__,_|_| \___/ \_/\_/ |_| |_| |_| |_|___/_|\_\
+ |___/
+
diff --git a/README.md b/README.md
deleted file mode 100644
index a468dd86..00000000
--- a/README.md
+++ /dev/null
@@ -1,31 +0,0 @@
-# cdist
-
-**cdist** is a usable configuration management system.
-
-It adheres to the [**KISS principle**](https://en.wikipedia.org/wiki/KISS_principle)
-and is being used in small up to enterprise grade environments.
-
-For more information have a look at [**homepage**](https://cdi.st)
-or at **``docs/src``** for manual in **reStructuredText** format.
-
-## Contributing
-
-Merge/Pull requests can be made in both
-[upstream **GitLab**](https://code.ungleich.ch/ungleich-public/cdist/merge_requests)
-(managed by [**ungleich**](https://ungleich.ch))
-and [**GitHub** project](https://github.com/ungleich/cdist/pulls).
-
-Issues can be made and other project management activites happen
-[**only in GitLab**](https://code.ungleich.ch/ungleich-public/cdist)
-(needs [**ungleich** account](https://account.ungleich.ch)).
-
-For community-maintained types there is
-[**cdist-contrib** project](https://code.ungleich.ch/ungleich-public/cdist-contrib).
-
-## Participating
-
-IRC: ``#cdist`` @ [libera](https://libera.chat)
-
-Matrix: ``#cdist:ungleich.ch``
-
-Matrix and IRC are bridged.
diff --git a/bin/build-helper b/bin/build-helper
new file mode 100755
index 00000000..31789a2e
--- /dev/null
+++ b/bin/build-helper
@@ -0,0 +1,284 @@
+#!/bin/sh
+#
+# 2011-2013 Nico Schottelius (nico-cdist at schottelius.org)
+#
+# This file is part of cdist.
+#
+# cdist is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# cdist is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with cdist. If not, see .
+#
+#
+# This file contains the heavy lifting found usually in the Makefile
+#
+
+basedir=${0%/*}/../
+# Change to checkout directory
+cd "$basedir"
+
+version=$(git describe)
+
+option=$1; shift
+
+case "$option" in
+ changelog-changes)
+ if [ "$#" -eq 1 ]; then
+ start=$1
+ else
+ start="[[:digit:]]"
+ fi
+
+ end="[[:digit:]]"
+
+ awk -F: "BEGIN { start=0 }
+ {
+ if(start == 0) {
+ if (\$0 ~ /^$start/) {
+ start = 1
+ }
+ } else {
+ if (\$0 ~ /^$end/) {
+ exit
+ } else {
+ print \$0
+ }
+ }
+ }" "$basedir/docs/changelog"
+ ;;
+
+ changelog-version)
+ # get version from changelog
+ grep '^[[:digit:]]' "$basedir/docs/changelog" | head -n1 | sed 's/:.*//'
+ ;;
+
+ check-date)
+ # verify date in changelog is today
+ date_today="$(date +%Y-%m-%d)"
+ date_changelog=$(grep '^[[:digit:]]' "$basedir/docs/changelog" | head -n1 | sed 's/.*: //')
+
+ if [ "$date_today" != "$date_changelog" ]; then
+ echo "Date in changelog is not today"
+ echo "Changelog: $date_changelog"
+ exit 1
+ fi
+ ;;
+
+ check-unittest)
+ "$0" test
+ ;;
+
+ blog)
+ version=$1; shift
+ blogfile=$1; shift
+ dir=${blogfile%/*}
+ file=${blogfile##*/}
+
+
+ cat << eof > "$blogfile"
+[[!meta title="Cdist $version released"]]
+
+Here's a short overview about the changes found in version ${version}:
+
+eof
+
+ $0 changelog-changes "$version" >> "$blogfile"
+
+ cat << eof >> "$blogfile"
+For more information visit the [[cdist homepage|software/cdist]].
+
+[[!tag cdist config unix]]
+eof
+ cd "$dir"
+ git add "$file"
+ # Allow git commit to fail if there are no changes
+ git commit -m "cdist blog update: $version" "$blogfile" || true
+ ;;
+
+ ml-release)
+ if [ $# -ne 1 ]; then
+ echo "$0 ml-release version" >&2
+ exit 1
+ fi
+
+ version=$1; shift
+
+ to_a=cdist
+ to_d=l.schottelius.org
+ to=${to_a}@${to_d}
+
+ from_a=nico-cdist
+ from_d=schottelius.org
+ from=${from_a}@${from_d}
+
+ (
+ cat << eof
+From: Nico -telmich- Schottelius <$from>
+To: cdist mailing list <$to>
+Subject: cdist $version released
+
+Hello .*,
+
+cdist $version has been released with the following changes:
+
+eof
+
+ "$0" changelog-changes "$version"
+ cat << eof
+
+Cheers,
+
+Nico
+
+--
+Automatisation at its best level. With cdist.
+eof
+ ) | /usr/sbin/sendmail -f "$from" "$to"
+ ;;
+
+
+ release-git-tag)
+ target_version=$($0 changelog-version)
+ if git rev-parse --verify refs/tags/$target_version 2>/dev/null; then
+ echo "Tag for $target_version exists, aborting"
+ exit 1
+ fi
+ printf "Enter tag description for ${target_version}: "
+ read tagmessage
+ git tag "$target_version" -m "$$tagmessage"
+ ;;
+
+ release)
+ set -e
+ target_version=$($0 changelog-version)
+ target_branch=$($0 version-branch)
+
+ echo "Beginning release process for $target_version"
+
+ # First check everything is sane
+ "$0" check-date
+ "$0" check-unittest
+
+ # Generate version file to be included in packaging
+ "$0" version
+
+ # Ensure the git status is clean, else abort
+ if ! git diff-index --name-only --exit-code HEAD ; then
+ echo "Unclean tree, see files above, aborting"
+ exit 1
+ fi
+
+ # Ensure we are on the master branch
+ masterbranch=yes
+ if [ "$(git rev-parse --abbrev-ref HEAD)" != "master" ]; then
+ echo "Releases are happening from the master branch, aborting"
+
+ echo "Enter the magic word to release anyway"
+ read magicword
+
+ if [ "$magicword" = "iknowwhatido" ]; then
+ masterbranch=no
+ else
+ exit 1
+ fi
+ fi
+
+ if [ "$masterbranch" = yes ]; then
+ # Ensure version branch exists
+ if ! git rev-parse --verify refs/heads/$target_branch 2>/dev/null; then
+ git branch "$target_branch"
+ fi
+
+ # Merge master branch into version branch
+ git checkout "$target_branch"
+ git merge master
+ fi
+
+ # Verify that after the merge everything works
+ "$0" check-date
+ "$0" check-unittest
+
+ # Generate man pages (indirect check if they build)
+ make man
+
+ # Generate speeches (indirect check if they build)
+ make speeches
+
+ #############################################################
+ # Everything green, let's do the release
+
+ # Tag the current commit
+ "$0" release-git-tag
+
+ # Also merge back the version branch
+ if [ "$masterbranch" = yes ]; then
+ git checkout master
+ git merge "$target_branch"
+ fi
+
+ # Publish git changes
+ make pub
+
+ # publish man, speeches, website
+ if [ "$masterbranch" = yes ]; then
+ make web-release-all
+ else
+ make web-release-all-no-latest
+ fi
+
+ # Ensure that pypi release has the right version
+ "$0" version
+
+ # Create and publish package for pypi
+ make pypi-release
+
+ # Archlinux release is based on pypi
+ make archlinux-release
+
+ # Announce change on ML
+ make ml-release
+
+ cat << eof
+Manual steps post release:
+
+ - linkedin
+ - hackernews
+ - reddit
+ - twitter
+
+eof
+
+ ;;
+
+ test)
+ export PYTHONPATH="$(pwd -P)"
+
+ if [ $# -lt 1 ]; then
+ python3 -m cdist.test
+ else
+ python3 -m unittest "$@"
+ fi
+ ;;
+
+ version-branch)
+ "$0" changelog-version | cut -d. -f '1,2'
+ ;;
+
+ version)
+ echo "VERSION = \"$(git describe)\"" > cdist/version.py
+ ;;
+
+ *)
+ echo "Unknown helper target $@ - aborting"
+ exit 1
+ ;;
+
+esac
diff --git a/bin/cdist b/bin/cdist
index adb06a8d..645020a1 100755
--- a/bin/cdist
+++ b/bin/cdist
@@ -1,8 +1,7 @@
-#!/usr/bin/env python3
+#!/bin/sh
# -*- coding: utf-8 -*-
#
-# 2010-2016 Nico Schottelius (nico-cdist at schottelius.org)
-# 2016 Darko Poljak (darko.poljak at gmail.com)
+# 2012 Nico Schottelius (nico-cdist at schottelius.org)
#
# This file is part of cdist.
#
@@ -21,83 +20,14 @@
#
#
-import logging
-import os
-import sys
+# Wrapper for real script to allow execution from checkout
+dir=${0%/*}
-# See if this file's parent is cdist module
-# and if so add it to module search path.
-cdist_dir = os.path.realpath(
- os.path.join(
- os.path.dirname(os.path.realpath(__file__)),
- os.pardir))
-cdist_init_dir = os.path.join(cdist_dir, 'cdist', '__init__.py')
-if os.path.exists(cdist_init_dir):
- sys.path.insert(0, cdist_dir)
+# Ensure version is present - the bundled/shipped version contains a static version,
+# the git version contains a dynamic version
+"$dir/build-helper" version
-import cdist # noqa 402
-import cdist.argparse # noqa 402
-import cdist.banner # noqa 402
-import cdist.config # noqa 402
-import cdist.install # noqa 402
-import cdist.shell # noqa 402
-import cdist.inventory # noqa 402
+libdir=$(cd "${dir}/../" && pwd -P)
+export PYTHONPATH="${libdir}"
-
-def commandline():
- """Parse command line"""
-
- # preos subcommand hack
- if len(sys.argv) > 1 and sys.argv[1] == 'preos':
- return cdist.preos.PreOS.commandline(sys.argv[1:])
- parser, cfg = cdist.argparse.parse_and_configure(sys.argv[1:])
- args = cfg.get_args()
-
- # Work around python 3.3 bug:
- # http://bugs.python.org/issue16308
- # http://bugs.python.org/issue9253
-
- # FIXME: catching AttributeError also hides
- # real problems.. try a different way
-
- # FIXME: we always print main help, not
- # the help of the actual parser being used!
- try:
- getattr(args, "func")
- except AttributeError:
- parser['main'].print_help()
- sys.exit(0)
-
- args.func(args)
-
-
-if __name__ == "__main__":
- if sys.version_info[:3] < cdist.MIN_SUPPORTED_PYTHON_VERSION:
- print(
- 'Python >= {} is required on the source host.'.format(
- ".".join(map(str, cdist.MIN_SUPPORTED_PYTHON_VERSION))),
- file=sys.stderr)
- sys.exit(1)
-
- exit_code = 0
-
- try:
- import re
- import os
-
- if re.match("__", os.path.basename(sys.argv[0])):
- import cdist.emulator
- emulator = cdist.emulator.Emulator(sys.argv)
- emulator.run()
- else:
- commandline()
-
- except KeyboardInterrupt:
- exit_code = 2
-
- except cdist.Error as e:
- log = logging.getLogger("cdist")
- log.error(e)
- exit_code = 1
-
- sys.exit(exit_code)
+"$dir/../scripts/cdist" "$@"
diff --git a/bin/cdist-build-helper b/bin/cdist-build-helper
deleted file mode 100755
index 0380b3f8..00000000
--- a/bin/cdist-build-helper
+++ /dev/null
@@ -1,574 +0,0 @@
-#!/bin/sh
-#
-# 2011-2013 Nico Schottelius (nico-cdist at schottelius.org)
-# 2016-2019 Darko Poljak (darko.poljak at gmail.com)
-#
-# This file is part of cdist.
-#
-# cdist is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# cdist is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with cdist. If not, see .
-#
-#
-# This file contains the heavy lifting found usually in the Makefile.
-#
-
-usage() {
- printf "usage: %s TARGET [TARGET-ARGS...]
- Available targets:
- changelog-changes
- changelog-version
- check-date
- check-unittest
- ml-release
- archlinux-release
- pypi-release
- release-git-tag
- sign-git-release
- release
- test
- test-remote
- pycodestyle
- pep8
- check-pycodestyle
- shellcheck-global-explorers
- shellcheck-type-explorers
- shellcheck-manifests
- shellcheck-local-gencodes
- shellcheck-remote-gencodes
- shellcheck-bin
- shellcheck-gencodes
- shellcheck-types
- shellcheck
- shellcheck-type-files
- shellcheck-with-files
- shellcheck-build-helper
- check-shellcheck
- version-branch
- version
- target-version
- clean
- distclean\n" "$1"
-}
-
-basename="${0##*/}"
-
-if [ $# -lt 1 ]
-then
- usage "${basename}"
- exit 1
-fi
-
-option=$1; shift
-
-SHELLCHECKCMD="shellcheck -s sh -f gcc -x"
-# Skip SC2154 for variables starting with __ since such variables are cdist
-# environment variables.
-SHELLCHECK_SKIP=': __.*is referenced but not assigned.*\[SC2154\]'
-SHELLCHECKTMP=".shellcheck.tmp"
-
-# Change to checkout directory
-basedir="${0%/*}/../"
-cd "$basedir"
-
-case "$option" in
- changelog-changes)
- if [ "$#" -eq 1 ]; then
- start=$1
- else
- start="[[:digit:]]"
- fi
-
- end="[[:digit:]]"
-
- awk -F: "BEGIN { start=0 }
- {
- if(start == 0) {
- if (\$0 ~ /^$start/) {
- start = 1
- }
- } else {
- if (\$0 ~ /^$end/) {
- exit
- } else {
- print \$0
- }
- }
- }" "$basedir/docs/changelog"
- ;;
-
- changelog-version)
- # get version from changelog
- grep '^[[:digit:]]' "$basedir/docs/changelog" | head -n1 | sed 's/:.*//'
- ;;
-
- check-date)
- # verify date in changelog is today
- date_today="$(date +%Y-%m-%d)"
- date_changelog=$(grep '^[[:digit:]]' "$basedir/docs/changelog" | head -n1 | sed 's/.*: //')
-
- if [ "$date_today" != "$date_changelog" ]; then
- printf "Date in changelog is not today\n"
- printf "Changelog date: %s\n" "${date_changelog}"
- exit 1
- fi
- ;;
-
- check-unittest)
- "$0" test
- ;;
-
- ml-release)
- if [ $# -ne 1 ]; then
- printf "%s ml-release version\n" "$0" >&2
- exit 1
- fi
-
- version=$1; shift
-
- (
- cat << eof
-Subject: cdist $version has been released
-
-Hello .*,
-
-cdist $version has been released with the following changes:
-
-eof
-
- "$0" changelog-changes "$version"
- cat << eof
-
-eof
- ) > mailinglist.tmp
- ;;
-
- archlinux-release)
- if [ $# -ne 1 ]; then
- printf "%s archlinux-release version\n" "$0" >&2
- exit 1
- fi
- version=$1; shift
-
- ARCHLINUXTAR="cdist-${version}-1.src.tar.gz"
- ./PKGBUILD.in "${version}"
- umask 022
- mkaurball
- burp -c system "${ARCHLINUXTAR}"
- ;;
-
- pypi-release)
- # Ensure that pypi release has the right version
- "$0" version
-
- make docs-clean
- make docs
- python3 setup.py sdist upload
- ;;
-
- release-git-tag)
- target_version=$($0 changelog-version)
- if git rev-parse --verify "refs/tags/${target_version}" 2>/dev/null; then
- printf "Tag for %s exists, aborting\n" "${target_version}"
- exit 1
- fi
- printf "Enter tag description for %s: " "${target_version}"
- read -r tagmessage
-
- # setup for signed tags:
- # gpg --fulL-gen-key
- # gpg --list-secret-keys --keyid-format LONG
- # git config --local user.signingkey
- # for exporting pub key:
- # gpg --armor --export > pubkey.asc
- # gpg --output pubkey.gpg --export
- # show tag with signature
- # git show
- # verify tag signature
- # git tag -v
- #
- # gpg verify signature
- # gpg --verify
- # gpg --no-default-keyring --keyring --verify
- # Ensure gpg-agent is running.
- GPG_TTY=$(tty)
- export GPG_TTY
- gpg-agent
-
- git tag -s "$target_version" -m "$tagmessage"
- git push --tags
- ;;
-
- sign-git-release)
- if [ $# -lt 2 ]
- then
- printf "usage: %s sign-git-release TAG TOKEN [ARCHIVE]\n" "$0"
- printf " if ARCHIVE is not specified then it is created\n"
- exit 1
- fi
- tag="$1"
- if ! git rev-parse -q --verify "${tag}" >/dev/null 2>&1
- then
- printf "Tag \"%s\" not found.\n" "${tag}"
- exit 1
- fi
- token="$2"
- if [ $# -gt 2 ]
- then
- archivename="$3"
- else
- archivename="cdist-${tag}.tar"
- git archive --prefix="cdist-${tag}/" -o "${archivename}" "${tag}" \
- || exit 1
- # make sure target version is generated
- "$0" target-version
- tar -x -f "${archivename}" || exit 1
- cp cdist/version.py "cdist-${tag}/cdist/version.py" || exit 1
- tar -c -f "${archivename}" "cdist-${tag}/" || exit 1
- rm -r -f "cdist-${tag}/"
- gzip "${archivename}" || exit 1
- archivename="${archivename}.gz"
- fi
- gpg --armor --detach-sign "${archivename}" || exit 1
-
- project="ungleich-public%2Fcdist"
- sed_cmd='s/^.*"markdown":"\([^"]*\)".*$/\1/'
-
- # upload archive
- response_archive=$(curl -f -X POST \
- --http1.1 \
- -H "PRIVATE-TOKEN: ${token}" \
- -F "file=@${archivename}" \
- "https://code.ungleich.ch/api/v4/projects/${project}/uploads" \
- | sed "${sed_cmd}") || exit 1
-
- # upload archive signature
- response_archive_sig=$(curl -f -X POST \
- --http1.1 \
- -H "PRIVATE-TOKEN: ${token}" \
- -F "file=@${archivename}.asc" \
- "https://code.ungleich.ch/api/v4/projects/${project}/uploads" \
- | sed "${sed_cmd}") || exit 1
-
- # make release
- changelog=$("$0" changelog-changes "$1" | sed 's/^[[:space:]]*//')
- release_notes=$(
- printf "%s\n\n%s\n\n**Changelog**\n\n%s\n" \
- "${response_archive}" "${response_archive_sig}" "${changelog}"
- )
- curl -f -X POST \
- -H "PRIVATE-TOKEN: ${token}" \
- -F "description=${release_notes}" \
- "https://code.ungleich.ch/api/v4/projects/${project}/repository/tags/${tag}/release" \
- || exit 1
-
- # remove generated files (archive and asc)
- if [ $# -eq 2 ]
- then
- rm -f "${archivename}"
- fi
- rm -f "${archivename}.asc"
- ;;
-
- release)
- set -e
- target_version=$($0 changelog-version)
- target_branch=$($0 version-branch)
-
- printf "Beginning release process for %s\n" "${target_version}"
-
- # First check everything is sane
- "$0" check-date
- "$0" check-unittest
- "$0" check-pycodestyle
- "$0" check-shellcheck
-
- # Generate version file to be included in packaging
- "$0" target-version
-
- # Ensure the git status is clean, else abort
- if ! git diff-index --name-only --exit-code HEAD ; then
- printf "Unclean tree, see files above, aborting.\n"
- exit 1
- fi
-
- # Ensure we are on the master branch
- masterbranch=yes
- if [ "$(git rev-parse --abbrev-ref HEAD)" != "master" ]; then
- printf "Releases are happening from the master branch, aborting.\n"
-
- printf "Enter the magic word to release anyway:"
- read -r magicword
-
- if [ "$magicword" = "iknowwhatido" ]; then
- masterbranch=no
- else
- exit 1
- fi
- fi
-
- if [ "$masterbranch" = yes ]; then
- # Ensure version branch exists
- if ! git rev-parse --verify "refs/heads/${target_branch}" 2>/dev/null; then
- git branch "$target_branch"
- fi
-
- # Merge master branch into version branch
- git checkout "$target_branch"
- git merge master
- fi
-
- # Verify that after the merge everything works
- "$0" check-date
- "$0" check-unittest
-
- # Generate documentation (man and html)
- # First, clean old generated docs
- make docs-clean
- make docs
-
- #############################################################
- # Everything green, let's do the release
-
- # Tag the current commit
- "$0" release-git-tag
-
- # Also merge back the version branch
- if [ "$masterbranch" = yes ]; then
- git checkout master
- git merge "$target_branch"
- fi
-
- # Publish git changes
- # if you want to have mirror locally then uncomment this and comment below
- # git push --mirror
- git push
- # push also new branch and set up tracking
- git push -u origin "${target_branch}"
- # fi
-
- # Create and publish package for pypi
- "$0" pypi-release
-
- # sign git tag
- printf "Enter upstream repository authentication token: "
- read -r token
- "$0" sign-git-release "${target_version}" "${token}"
-
- # Announce change on ML
- "$0" ml-release "${target_version}"
-
- cat << eof
-Manual steps post release:
- - cdist-web
- - send generated mailinglist.tmp mail
-eof
- ;;
-
- test)
- if [ ! -f "cdist/version.py" ]
- then
- printf "cdist/version.py is missing, generate it first.\n"
- exit 1
- fi
-
- PYTHONPATH="$(pwd -P)"
- export PYTHONPATH
-
- if [ $# -lt 1 ]; then
- python3 -m cdist.test
- else
- python3 -m unittest "$@"
- fi
- ;;
-
- test-remote)
- if [ ! -f "cdist/version.py" ]
- then
- printf "cdist/version.py is missing, generate it first.\n"
- exit 1
- fi
-
- PYTHONPATH="$(pwd -P)"
- export PYTHONPATH
-
- python3 -m cdist.test.exec.remote
- ;;
-
- pycodestyle|pep8)
- pycodestyle "${basedir}" "${basedir}/bin/cdist"
- ;;
-
- check-pycodestyle)
- "$0" pycodestyle
- printf "\\nPlease review pycodestyle report.\\n"
- while true
- do
- printf "Continue (yes/no)?\n"
- any=
- read -r any
- case "$any" in
- yes)
- break
- ;;
- no)
- exit 1
- ;;
- *)
- printf "Please answer with 'yes' or 'no' explicitly.\n"
- ;;
- esac
- done
- ;;
-
- shellcheck-global-explorers)
- # shellcheck disable=SC2086
- find cdist/conf/explorer -type f -exec ${SHELLCHECKCMD} {} + | grep -v "${SHELLCHECK_SKIP}" > "${SHELLCHECKTMP}"
- test ! -s "${SHELLCHECKTMP}" || { cat "${SHELLCHECKTMP}"; exit 1; }
- ;;
-
- shellcheck-type-explorers)
- # shellcheck disable=SC2086
- find cdist/conf/type -type f -path "*/explorer/*" -exec ${SHELLCHECKCMD} {} + | grep -v "${SHELLCHECK_SKIP}" > "${SHELLCHECKTMP}"
- test ! -s "${SHELLCHECKTMP}" || { cat "${SHELLCHECKTMP}"; exit 1; }
- ;;
-
- shellcheck-manifests)
- # shellcheck disable=SC2086
- find cdist/conf/type -type f -name manifest -exec ${SHELLCHECKCMD} {} + | grep -v "${SHELLCHECK_SKIP}" > "${SHELLCHECKTMP}"
- test ! -s "${SHELLCHECKTMP}" || { cat "${SHELLCHECKTMP}"; exit 1; }
- ;;
-
- shellcheck-local-gencodes)
- # shellcheck disable=SC2086
- find cdist/conf/type -type f -name gencode-local -exec ${SHELLCHECKCMD} {} + | grep -v "${SHELLCHECK_SKIP}" > "${SHELLCHECKTMP}"
- test ! -s "${SHELLCHECKTMP}" || { cat "${SHELLCHECKTMP}"; exit 1; }
- ;;
-
- shellcheck-remote-gencodes)
- # shellcheck disable=SC2086
- find cdist/conf/type -type f -name gencode-remote -exec ${SHELLCHECKCMD} {} + | grep -v "${SHELLCHECK_SKIP}" > "${SHELLCHECKTMP}"
- test ! -s "${SHELLCHECKTMP}" || { cat "${SHELLCHECKTMP}"; exit 1; }
- ;;
-
- # NOTE: shellcheck-scripts is kept for compatibility
- shellcheck-bin|shellcheck-scripts)
- # shellcheck disable=SC2086
- ${SHELLCHECKCMD} bin/cdist-dump bin/cdist-new-type > "${SHELLCHECKTMP}"
- test ! -s "${SHELLCHECKTMP}" || { cat "${SHELLCHECKTMP}"; exit 1; }
- ;;
-
- shellcheck-gencodes)
- errors=false
- "$0" shellcheck-local-gencodes || errors=true
- "$0" shellcheck-remote-gencodes || errors=true
- ! $errors || exit 1
- ;;
-
- shellcheck-types)
- errors=false
- "$0" shellcheck-type-explorers || errors=true
- "$0" shellcheck-manifests || errors=true
- "$0" shellcheck-gencodes || errors=true
- ! $errors || exit 1
- ;;
-
- shellcheck)
- errors=false
- "$0" shellcheck-global-explorers || errors=true
- "$0" shellcheck-types || errors=true
- "$0" shellcheck-bin || errors=true
- ! $errors || exit 1
- ;;
-
- shellcheck-type-files)
- # shellcheck disable=SC2086
- find cdist/conf/type -type f -path "*/files/*" -exec ${SHELLCHECKCMD} {} + | grep -v "${SHELLCHECK_SKIP}" > "${SHELLCHECKTMP}"
- test ! -s "${SHELLCHECKTMP}" || { cat "${SHELLCHECKTMP}"; exit 1; }
- ;;
-
- shellcheck-with-files)
- errors=false
- "$0" shellcheck || errors=true
- "$0" shellcheck-type-files || errors=true
- ! $errors || exit 1
- ;;
-
- shellcheck-build-helper)
- ${SHELLCHECKCMD} ./bin/cdist-build-helper
- ;;
-
- check-shellcheck)
- "$0" shellcheck
- printf "\\nPlease review shellcheck report.\\n"
- while true
- do
- printf "Continue (yes/no)?\n"
- any=
- read -r any
- case "$any" in
- yes)
- break
- ;;
- no)
- exit 1
- ;;
- *)
- printf "Please answer with 'yes' or 'no' explicitly.\n"
- ;;
- esac
- done
- ;;
-
- version-branch)
- "$0" changelog-version | cut -d. -f '1,2'
- ;;
-
- version)
- printf "VERSION = \"%s\"\n" "$(git describe)" > cdist/version.py
- ;;
-
- target-version)
- target_version=$($0 changelog-version)
- printf "VERSION = \"%s\"\n" "${target_version}" > cdist/version.py
- ;;
-
- clean)
- make clean
-
- # Archlinux
- rm -f cdist-*.pkg.tar.xz cdist-*.tar.gz
- rm -rf pkg/ src/
-
- rm -f MANIFEST PKGBUILD
- rm -rf dist/
-
- # Signed release
- rm -f cdist-*.tar.gz
- rm -f cdist-*.tar.gz.asc
-
- # Temp files
- rm -f ./*.tmp
- rm -f ./.*.tmp
- ;;
-
- distclean)
- "$0" clean
- rm -f cdist/version.py
- ;;
- *)
- printf "Unknown target: '%s'.\n" "${option}" >&2
- usage "${basename}"
- exit 1
- ;;
-
-esac
diff --git a/bin/cdist-dump b/bin/cdist-dump
deleted file mode 100755
index d29e5985..00000000
--- a/bin/cdist-dump
+++ /dev/null
@@ -1,326 +0,0 @@
-#!/bin/sh
-
-VERSION="0.0.1"
-RELEASE=""
-
-set -u
-# set -x
-
-hosts=
-cache_dir=~/.cdist/cache
-
-do_all=1
-do_global_explorer=
-do_type_explorer=
-do_script_stdout=
-do_script_stderr=
-do_gencode=
-do_code=
-do_messages=
-do_parameter=
-delimiter=':'
-ln=
-filename_prefix=1
-verbose=0
-
-myname=${0##*/}
-
-print_version()
-{
- printf "%s %s %s\n" "${myname}" "${VERSION}" "${RELEASE}"
-}
-
-usage()
-{
- cat << eof
-${myname}: [options] [host...]
-eof
-
- print_version
-
- cat << eof
-
-Dump data from cache directories.
-
-host
- Dump data for specified hosts. If not specified then all data
- from cache directory is dumped.
-
-Options
- -a dump all
- -C CACHE-DIR use specified CACHE-DIR (default: ~/.cdist/cache)
- -c dump code-*
- -d DELIMITER delimiter used for filename and line number prefix (default: ':')
- -E dump global explorers
- -e dump type explorers
- -F disable filename prefix (enabled by default)
- -f enable filename prefix (default)
- -g dump gencode-*
- -h show this help screen and exit
- -L disable line number prefix (default)
- -l enable line number prefix (disabled by default)
- -m dump messages
- -o dump executions' stdout
- -p dump parameters
- -r dump executions' stderr
- -V show version and exit
- -v increase verbosity
-eof
-}
-
-exit_err()
-{
- printf "%s\n" "$1"
- exit 1
-}
-
-# parse options
-while [ "$#" -ge 1 ]
-do
- case "$1" in
- -a)
- do_all=1
- ;;
- -C)
- if [ "$#" -ge 2 ]
- then
- case "$2" in
- -*)
- exit_err "Missing cache directory"
- ;;
- *)
- cache_dir="$2"
- shift
- ;;
- esac
- else
- exit_err "Missing cache directory"
- fi
- ;;
- -c)
- do_code=1
- do_all=
- ;;
- -d)
- if [ "$#" -ge 2 ]
- then
- case "$2" in
- -*)
- exit_err "Missing delimiter"
- ;;
- *)
- delimiter="$2"
- shift
- ;;
- esac
- else
- exit_err "Missing delimiter"
- fi
- ;;
- -E)
- do_global_explorer=1
- do_all=
- ;;
- -e)
- do_type_explorer=1
- do_all=
- ;;
- -F)
- filename_prefix=
- ;;
- -f)
- filename_prefix=1
- ;;
- -g)
- do_gencode=1
- do_all=
- ;;
- -h)
- usage
- exit 0
- ;;
- -L)
- ln=
- ;;
- -l)
- ln=1
- ;;
- -m)
- do_messages=1
- do_all=
- ;;
- -o)
- do_script_stdout=1
- do_all=
- ;;
- -p)
- do_parameter=1
- do_all=
- ;;
- -r)
- do_script_stderr=1
- do_all=
- ;;
- -V)
- print_version
- exit 0
- ;;
- -v)
- verbose=$((verbose + 1))
- ;;
- *)
- hosts="${hosts} $1"
- break
- ;;
- esac
- shift
-done
-
-if [ "${ln}" = "1" ]
-then
- ln="NR \"${delimiter}\""
-fi
-
-if [ "${filename_prefix}" = "1" ]
-then
- filename_prefix="{}${delimiter}"
-fi
-
-if [ "${do_all}" = "1" ]
-then
- do_global_explorer=1
- do_type_explorer=1
- do_script_stdout=1
- do_script_stderr=1
- do_gencode=1
- do_code=1
- do_messages=1
- do_parameter=1
-fi
-
-set -- -size +0
-set -- "$@" \(
-or=
-
-print_verbose()
-{
- if [ "${verbose}" -ge "$1" ]
- then
- printf "%s\n" "$2"
- fi
-}
-
-hor_line()
-{
- if [ $# -gt 0 ]
- then
- c="$1"
- else
- c='='
- fi
- printf "%78s\n" "" | tr ' ' "${c}"
-}
-
-if [ "${do_global_explorer}" ]
-then
- print_verbose 2 "Dumping global explorers"
- # shellcheck disable=SC2086
- set -- "$@" ${or} \( \
- -path "*/explorer/*" -a \
- ! -path "*/conf/*" -a \
- ! -path "*/object/*/explorer/*" \
- \)
- or="-o"
-fi
-
-if [ "${do_type_explorer}" ]
-then
- print_verbose 2 "Dumping type explorers"
- set -- "$@" ${or} -path "*/object/*/explorer/*"
- or="-o"
-fi
-
-if [ "${do_script_stdout}" ]
-then
- print_verbose 2 "Dumping execution's stdout"
- set -- "$@" ${or} -path "*/stdout/*"
- or="-o"
-fi
-
-if [ "${do_script_stderr}" ]
-then
- print_verbose 2 "Dumping execution's stderr"
- set -- "$@" ${or} -path "*/stderr/*"
- or="-o"
-fi
-
-if [ "${do_gencode}" ]
-then
- print_verbose 2 "Dumping gencode-*"
- set -- "$@" ${or} \( -name "gencode-*" -a ! -path "*/stdout/*" -a ! -path "*/stderr/*" \)
- or="-o"
-fi
-
-if [ "${do_code}" ]
-then
- print_verbose 2 "Dumping code-*"
- set -- "$@" ${or} \( -name "code-*" -a ! -path "*/stdout/*" -a ! -path "*/stderr/*" \)
- or="-o"
-fi
-
-if [ "${do_messages}" ]
-then
- print_verbose 2 "Dumping messages"
- set -- "$@" ${or} -name "messages"
- or="-o"
-fi
-
-if [ "${do_parameter}" ]
-then
- print_verbose 2 "Dumping parameters"
- set -- "$@" ${or} -path "*/parameter/*"
- or="-o"
-fi
-
-set -- "$@" \)
-set -- '.' "$@" -exec awk -v prefix="${filename_prefix}" "{print prefix ${ln} \$0}" {} \;
-
-# printf "+ %s\n" "$*"
-
-print_verbose 2 "Using cache dir: ${cache_dir}"
-
-OLD_PWD=$(pwd)
-cd "${cache_dir}" || exit
-
-# If no host is specified then search all.
-[ -z "${hosts}" ] && hosts="-"
-
-for host in ${hosts}
-do
- [ "${host}" = "-" ] && host=
- # find host cache directory
- host_dir=$(find . -name target_host -exec grep -l "${host}" {} +)
- print_verbose 3 "found host directory files:"
- print_verbose 3 "${host_dir}"
-
- OLD_IFS="${IFS}"
- IFS="
- "
-
- for d in ${host_dir}
- do
- dir=$(dirname "${d}")
-
- print_verbose 0 "target host: $(cat "${dir}/target_host"), host directory: ${dir}"
- hor_line '='
-
- PREV_PWD=$(pwd)
- cd "${dir}" || exit
- # set -x
- find "$@"
- # set +x
- cd "${PREV_PWD}" || exit
- done
- IFS="${OLD_IFS}"
-done
-cd "${OLD_PWD}" || exit
diff --git a/bin/cdist-new-type b/bin/cdist-new-type
deleted file mode 100755
index 79dcfd90..00000000
--- a/bin/cdist-new-type
+++ /dev/null
@@ -1,159 +0,0 @@
-#!/bin/sh
-
-basename="${0##*/}"
-
-if [ $# -lt 3 ]
-then
- printf "usage: %s TYPE-NAME AUTHOR-NAME AUTHOR-EMAIL [TYPE-BASE-PATH]
- TYPE-NAME Name of the type.
- AUTHOR-NAME Type author's full name.
- AUTHOR-EMAIL Type author's email.
- TYPE-BASE-PATH Path to the base directory of the type. If not set it defaults
- to '\$PWD/type'.\n" "${basename}"
- exit 1
-fi
-
-type_name="$1"
-shift
-author_name="$1"
-shift
-author_email="$1"
-shift
-
-if [ $# -ge 1 ]
-then
- type_base_path="$1"
- shift
-else
- #type_base_path=~/.cdist/type
- type_base_path="$PWD/type"
-fi
-
-error() {
- printf "%s\n" "$*" >&2
-}
-
-die() {
- error "$@"
- exit 1
-}
-
-cd "$type_base_path" || die "Could not change to type directory: $type_base_path.
-You have to specify type base path or run me from within a cdist conf directory,
-e.g. ~/.cdist."
-
-year=$(date +%Y)
-copyright="# $year $author_name ($author_email)"
-
-license="# 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 .
-#
-"
-
-set -e
-
-mkdir "$type_name"
-cd "$type_name"
-
-### man page
-header="cdist-type${type_name}(7)"
-header_length="${#header}"
-cat >> man.rst << DONE
-$header
-$(while [ "${header_length}" -gt 0 ]; do printf "="; header_length=$((header_length - 1)); done; printf "\n";)
-
-NAME
-----
-cdist-type${type_name} - TODO
-
-
-DESCRIPTION
------------
-This space intentionally left blank.
-
-
-REQUIRED PARAMETERS
--------------------
-None.
-
-
-OPTIONAL PARAMETERS
--------------------
-None.
-
-
-BOOLEAN PARAMETERS
-------------------
-None.
-
-
-EXAMPLES
---------
-
-.. code-block:: sh
-
- # TODO
- ${type_name}
-
-
-SEE ALSO
---------
-:strong:\`TODO\`\\ (7)
-
-
-AUTHORS
--------
-$author_name <$author_email>
-
-
-COPYING
--------
-Copyright \(C) $year $author_name. 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.
-DONE
-
-### manifest
-cat >> manifest << DONE
-#!/bin/sh -e
-#
-${copyright}
-#
-${license}
-
-os=\$(cat "\$__global/explorer/os")
-
-case "\$os" in
- *)
- printf "Your operating system (%s) is currently not supported by this type (%s)\n" "\$os" "\${__type##*/}" >&2
- printf "Please contribute an implementation for it if you can.\n" >&2
- exit 1
- ;;
-esac
-DONE
-chmod +x manifest
-
-# gencode-remote
-cat >> gencode-remote << DONE
-#!/bin/sh -e
-#
-${copyright}
-#
-${license}
-DONE
-chmod +x gencode-remote
-
-printf "%s/%s\n" "$type_base_path" "$type_name"
diff --git a/cdist/__init__.py b/cdist/__init__.py
index 31d49889..20c76b31 100644
--- a/cdist/__init__.py
+++ b/cdist/__init__.py
@@ -1,7 +1,6 @@
# -*- coding: utf-8 -*-
#
-# 2010-2015 Nico Schottelius (nico-cdist at schottelius.org)
-# 2012-2017 Steven Armstrong (steven-cdist at armstrong.cc)
+# 2010-2012 Nico Schottelius (nico-cdist at schottelius.org)
#
# This file is part of cdist.
#
@@ -21,28 +20,11 @@
#
import os
-import hashlib
import subprocess
-import cdist.log
+import cdist.version
-
-VERSION = 'unknown version'
-
-try:
- import cdist.version
- VERSION = cdist.version.VERSION
-except ModuleNotFoundError:
- cdist_dir = os.path.abspath(
- os.path.join(os.path.dirname(__file__), os.pardir))
- if os.path.isdir(os.path.join(cdist_dir, '.git')):
- try:
- VERSION = subprocess.check_output(
- ['git', 'describe', '--always'],
- cwd=cdist_dir,
- universal_newlines=True)
- except Exception:
- pass
+VERSION = cdist.version.VERSION
BANNER = """
.. . .x+=:. s
@@ -59,201 +41,30 @@ BANNER = """
"P' "" ""
"""
+DOT_CDIST = ".cdist"
+
REMOTE_COPY = "scp -o User=root -q"
-REMOTE_EXEC = "ssh -o User=root"
-REMOTE_CMDS_CLEANUP_PATTERN = "ssh -o User=root -O exit -S {}"
-
-
-MIN_SUPPORTED_PYTHON_VERSION = (3, 5)
-
+REMOTE_EXEC = "ssh -o User=root -q"
class Error(Exception):
"""Base exception class for this project"""
pass
-
class UnresolvableRequirementsError(cdist.Error):
"""Resolving requirements failed"""
pass
+class CdistObjectError(Error):
+ """Something went wrong with an object"""
+
+ def __init__(self, cdist_object, message):
+ self.name = cdist_object.name
+ self.source = " ".join(cdist_object.source)
+ self.message = message
-class CdistBetaRequired(cdist.Error):
- """Beta functionality is used but beta is not enabled"""
-
- def __init__(self, command, arg=None):
- self.command = command
- self.arg = arg
def __str__(self):
- if self.arg is None:
- err_msg = ("\'{}\' command is beta, but beta is "
- "not enabled. If you want to use it please enable beta "
- "functionalities by using the -b/--beta command "
- "line flag or setting CDIST_BETA env var.")
- fmt_args = [self.command, ]
- else:
- err_msg = ("\'{}\' argument of \'{}\' command is beta, but beta "
- "is not enabled. If you want to use it please enable "
- "beta functionalities by using the -b/--beta "
- "command line flag or setting CDIST_BETA env var.")
- fmt_args = [self.arg, self.command, ]
- return err_msg.format(*fmt_args)
-
-
-class CdistEntityError(Error):
- """Something went wrong while executing cdist entity"""
- def __init__(self, entity_name, entity_params, stdout_paths,
- stderr_paths, subject=''):
- self.entity_name = entity_name
- self.entity_params = entity_params
- self.stderr_paths = stderr_paths
- self.stdout_paths = stdout_paths
- if isinstance(subject, Error):
- self.original_error = subject
- else:
- self.original_error = None
- self.message = str(subject)
-
- def _stdpath(self, stdpaths, header_name):
- result = {}
- for name, path in stdpaths:
- if name not in result:
- result[name] = []
- try:
- if os.path.exists(path) and os.path.getsize(path) > 0:
- output = []
- label_begin = name + ":" + header_name
- output.append(label_begin)
- output.append('\n')
- output.append('-' * len(label_begin))
- output.append('\n')
- with open(path, 'r') as fd:
- output.append(fd.read())
- output.append('\n')
- result[name].append(''.join(output))
- except UnicodeError as ue:
- result[name].append(('Cannot output {}:{} due to: {}.\n'
- 'You can try to read the error file "{}"'
- ' yourself.').format(
- name, header_name, ue, path))
- return result
-
- def _stderr(self):
- return self._stdpath(self.stderr_paths, 'stderr')
-
- def _stdout(self):
- return self._stdpath(self.stdout_paths, 'stdout')
-
- def _update_dict_list(self, target, source):
- for x in source:
- if x not in target:
- target[x] = []
- target[x].extend(source[x])
-
- @property
- def std_streams(self):
- std_dict = {}
- self._update_dict_list(std_dict, self._stdout())
- self._update_dict_list(std_dict, self._stderr())
- return std_dict
-
- def __str__(self):
- output = []
- output.append(self.message)
- output.append('\n\n')
- header = "Error processing " + self.entity_name
- under_header = '=' * len(header)
- output.append(header)
- output.append('\n')
- output.append(under_header)
- output.append('\n')
- for param_name, param_value in self.entity_params:
- output.append(param_name + ': ' + str(param_value))
- output.append('\n')
- output.append('\n')
- for x in self.std_streams:
- output.append(''.join(self.std_streams[x]))
- return ''.join(output)
-
-
-class CdistObjectError(CdistEntityError):
- """Something went wrong while working on a specific cdist object"""
- def __init__(self, cdist_object, subject=''):
- params = [
- ('name', cdist_object.name, ),
- ('path', cdist_object.absolute_path, ),
- ('source', " ".join(cdist_object.source), ),
- ('type', os.path.realpath(
- cdist_object.cdist_type.absolute_path), ),
- ]
- stderr_paths = []
- for stderr_name in os.listdir(cdist_object.stderr_path):
- stderr_path = os.path.join(cdist_object.stderr_path,
- stderr_name)
- stderr_paths.append((stderr_name, stderr_path, ))
- stdout_paths = []
- for stdout_name in os.listdir(cdist_object.stdout_path):
- stdout_path = os.path.join(cdist_object.stdout_path,
- stdout_name)
- stdout_paths.append((stdout_name, stdout_path, ))
- super().__init__("object '{}'".format(cdist_object.name),
- params, stdout_paths, stderr_paths, subject)
-
-
-class CdistObjectExplorerError(CdistEntityError):
- """
- Something went wrong while working on a specific
- cdist object explorer
- """
- def __init__(self, cdist_object, explorer_name, explorer_path,
- stderr_path, subject=''):
- params = [
- ('object name', cdist_object.name, ),
- ('object path', cdist_object.absolute_path, ),
- ('object source', " ".join(cdist_object.source), ),
- ('object type', os.path.realpath(
- cdist_object.cdist_type.absolute_path), ),
- ('explorer name', explorer_name, ),
- ('explorer path', explorer_path, ),
- ]
- stdout_paths = []
- stderr_paths = [
- ('remote', stderr_path, ),
- ]
- super().__init__("explorer '{}' of object '{}'".format(
- explorer_name, cdist_object.name), params, stdout_paths,
- stderr_paths, subject)
-
-
-class InitialManifestError(CdistEntityError):
- """Something went wrong while executing initial manifest"""
- def __init__(self, initial_manifest, stdout_path, stderr_path, subject=''):
- params = [
- ('path', initial_manifest, ),
- ]
- stdout_paths = [
- ('init', stdout_path, ),
- ]
- stderr_paths = [
- ('init', stderr_path, ),
- ]
- super().__init__('initial manifest', params, stdout_paths,
- stderr_paths, subject)
-
-
-class GlobalExplorerError(CdistEntityError):
- """Something went wrong while executing global explorer"""
- def __init__(self, name, path, stderr_path, subject=''):
- params = [
- ('name', name, ),
- ('path', path, ),
- ]
- stderr_paths = [
- ('remote', stderr_path, ),
- ]
- super().__init__("global explorer '{}'".format(name),
- params, [], stderr_paths, subject)
-
+ return '%s: %s (defined at %s)' % (self.name, self.message, self.source)
def file_to_list(filename):
"""Return list from \n seperated file"""
@@ -268,23 +79,3 @@ def file_to_list(filename):
lines = []
return lines
-
-
-def str_hash(s):
- """Return hash of string s"""
- if isinstance(s, str):
- return hashlib.md5(s.encode('utf-8')).hexdigest()
- else:
- raise Error("Param should be string")
-
-
-def home_dir():
- if 'HOME' in os.environ:
- home = os.environ['HOME']
- if home:
- rv = os.path.join(home, ".cdist")
- else:
- rv = None
- else:
- rv = None
- return rv
diff --git a/cdist/argparse.py b/cdist/argparse.py
deleted file mode 100644
index f17315e7..00000000
--- a/cdist/argparse.py
+++ /dev/null
@@ -1,555 +0,0 @@
-import argparse
-import cdist
-import multiprocessing
-import logging
-import collections
-import functools
-import cdist.configuration
-import cdist.log
-import cdist.preos
-import cdist.info
-import cdist.scan.commandline
-
-
-# set of beta sub-commands
-BETA_COMMANDS = set(('install', 'inventory', 'scan', ))
-# set of beta arguments for sub-commands
-BETA_ARGS = {
- 'config': set(('tag', 'all_tagged_hosts', 'use_archiving', )),
-}
-EPILOG = "Get cdist at https://code.ungleich.ch/ungleich-public/cdist"
-# Parser others can reuse
-parser = None
-
-
-_verbosity_level_off = -2
-_verbosity_level = {
- None: logging.WARNING,
- _verbosity_level_off: logging.OFF,
- -1: logging.ERROR,
- 0: logging.WARNING,
- 1: logging.INFO,
- 2: logging.VERBOSE,
- 3: logging.DEBUG,
- 4: logging.TRACE,
-}
-
-
-# Generate verbosity level constants:
-# VERBOSE_OFF, VERBOSE_ERROR, VERBOSE_WARNING, VERBOSE_INFO, VERBOSE_VERBOSE,
-# VERBOSE_DEBUG, VERBOSE_TRACE.
-this_globals = globals()
-for level in _verbosity_level:
- const = 'VERBOSE_' + logging.getLevelName(_verbosity_level[level])
- this_globals[const] = level
-
-
-# All verbosity levels above 4 are TRACE.
-_verbosity_level = collections.defaultdict(
- lambda: logging.TRACE, _verbosity_level)
-
-
-def add_beta_command(cmd):
- BETA_COMMANDS.add(cmd)
-
-
-def add_beta_arg(cmd, arg):
- if cmd in BETA_ARGS:
- if arg not in BETA_ARGS[cmd]:
- BETA_ARGS[cmd].append(arg)
- else:
- BETA_ARGS[cmd] = set((arg, ))
-
-
-def check_beta(args_dict):
- if 'beta' not in args_dict:
- args_dict['beta'] = False
- # Check only if beta is not enabled: if beta option is specified then
- # raise error.
- if not args_dict['beta']:
- cmd = args_dict['command']
- # first check if command is beta
- if cmd in BETA_COMMANDS:
- raise cdist.CdistBetaRequired(cmd)
- # then check if some command's argument is beta
- if cmd in BETA_ARGS:
- for arg in BETA_ARGS[cmd]:
- if arg in args_dict and args_dict[arg]:
- raise cdist.CdistBetaRequired(cmd, arg)
-
-
-def check_lower_bounded_int(value, lower_bound, name):
- try:
- val = int(value)
- except ValueError:
- raise argparse.ArgumentTypeError(
- "{} is invalid int value".format(value))
- if val < lower_bound:
- raise argparse.ArgumentTypeError(
- "{} is invalid {} value".format(val, name))
- return val
-
-
-def get_parsers():
- global parser
-
- # Construct parser others can reuse
- if parser:
- return parser
- else:
- parser = {}
- # Options _all_ parsers have in common
- parser['loglevel'] = argparse.ArgumentParser(add_help=False)
- parser['loglevel'].add_argument(
- '-l', '--log-level', metavar='LOGLEVEL',
- type=functools.partial(check_lower_bounded_int, lower_bound=-1,
- name="log level"),
- help=('Set the specified verbosity level. '
- 'The levels, in order from the lowest to the highest, are: '
- 'ERROR (-1), WARNING (0), INFO (1), VERBOSE (2), DEBUG (3), '
- 'TRACE (4 or higher). If used along with -v then -v '
- 'increases last set value and -l overwrites last set '
- 'value.'),
- action='store', dest='verbose', required=False)
- parser['loglevel'].add_argument(
- '-q', '--quiet',
- help='Quiet mode: disables logging, including WARNING and ERROR.',
- action='store_true', default=False)
- parser['loglevel'].add_argument(
- '-v', '--verbose',
- help=('Increase the verbosity level. Every instance of -v '
- 'increments the verbosity level by one. Its default value '
- 'is 0 which includes ERROR and WARNING levels. '
- 'The levels, in order from the lowest to the highest, are: '
- 'ERROR (-1), WARNING (0), INFO (1), VERBOSE (2), DEBUG (3) '
- 'TRACE (4 or higher). If used along with -l then -l '
- 'overwrites last set value and -v increases last set '
- 'value.'),
- action='count', default=None)
-
- parser['colored_output'] = argparse.ArgumentParser(add_help=False)
- parser['colored_output'].add_argument(
- '--colors', metavar='WHEN',
- help="Colorize cdist's output based on log level; "
- "WHEN is 'always', 'never', or 'auto'.",
- action='store', dest='colored_output', required=False,
- choices=cdist.configuration.ColoredOutputOption.CHOICES)
-
- parser['beta'] = argparse.ArgumentParser(add_help=False)
- parser['beta'].add_argument(
- '-b', '--beta',
- help=('Enable beta functionality. '),
- action='store_true', dest='beta', default=None)
-
- # Main subcommand parser
- parser['main'] = argparse.ArgumentParser(
- description='cdist ' + cdist.VERSION)
- parser['main'].add_argument(
- '-V', '--version', help='Show version.', action='version',
- version='%(prog)s ' + cdist.VERSION)
- parser['sub'] = parser['main'].add_subparsers(
- title="Commands", dest="command")
-
- # Banner
- parser['banner'] = parser['sub'].add_parser(
- 'banner', parents=[parser['loglevel']])
- parser['banner'].set_defaults(func=cdist.banner.banner)
-
- parser['inventory_common'] = argparse.ArgumentParser(add_help=False)
- parser['inventory_common'].add_argument(
- '-I', '--inventory',
- help=('Use specified custom inventory directory. '
- 'Inventory directory is set up by the following rules: '
- 'if cdist configuration resolves this value then specified '
- 'directory is used, '
- 'if HOME env var is set then ~/.cdist/inventory is '
- 'used, otherwise distribution inventory directory is used.'),
- dest="inventory_dir", required=False)
-
- parser['common'] = argparse.ArgumentParser(add_help=False)
- parser['common'].add_argument(
- '-g', '--config-file',
- help=('Use specified custom configuration file.'),
- dest="config_file", required=False)
-
- # Config
- parser['config_main'] = argparse.ArgumentParser(add_help=False)
- parser['config_main'].add_argument(
- '-4', '--force-ipv4',
- help=('Force to use IPv4 addresses only. No influence for custom'
- ' remote commands.'),
- action='store_const', dest='force_ipv', const=4)
- parser['config_main'].add_argument(
- '-6', '--force-ipv6',
- help=('Force to use IPv6 addresses only. No influence for custom'
- ' remote commands.'),
- action='store_const', dest='force_ipv', const=6)
- parser['config_main'].add_argument(
- '-C', '--cache-path-pattern',
- help=('Specify custom cache path pattern. If '
- 'it is not set then default hostdir is used.'),
- dest='cache_path_pattern',
- default=None)
- parser['config_main'].add_argument(
- '-c', '--conf-dir',
- help=('Add configuration directory (can be repeated, '
- 'last one wins).'), action='append')
- parser['config_main'].add_argument(
- '-i', '--initial-manifest',
- help='Path to a cdist manifest or \'-\' to read from stdin.',
- dest='manifest', required=False)
- parser['config_main'].add_argument(
- '-j', '--jobs', nargs='?',
- type=functools.partial(check_lower_bounded_int, lower_bound=1,
- name="positive int"),
- help=('Operate in parallel in specified maximum number of jobs. '
- 'Global explorers, object prepare and object run are '
- 'supported. Without argument CPU count is used by default. '),
- action='store', dest='jobs',
- const=multiprocessing.cpu_count())
- parser['config_main'].add_argument(
- '--log-server',
- action='store_true',
- help=('Start a log server for sub processes to use. '
- 'This is mainly useful when running cdist nested '
- 'from a code-local script. Log server is alwasy '
- 'implicitly started for \'install\' command.'))
- parser['config_main'].add_argument(
- '-n', '--dry-run',
- help='Do not execute code.', action='store_true')
- parser['config_main'].add_argument(
- '-o', '--out-dir',
- help='Directory to save cdist output in.', dest="out_path")
- parser['config_main'].add_argument(
- '-P', '--timestamp',
- help=('Timestamp log messages with the current local date and time '
- 'in the format: YYYYMMDDHHMMSS.us.'),
- action='store_true', dest='timestamp')
- parser['config_main'].add_argument(
- '-R', '--use-archiving', nargs='?',
- choices=('tar', 'tgz', 'tbz2', 'txz',),
- help=('Operate by using archiving with compression where '
- 'appropriate. Supported values are: tar - tar archive, '
- 'tgz - gzip tar archive (the default), '
- 'tbz2 - bzip2 tar archive and txz - lzma tar archive. '
- 'Currently in beta.'),
- action='store', dest='use_archiving',
- const='tgz')
-
- # remote-copy and remote-exec defaults are environment variables
- # if set; if not then None - these will be futher handled after
- # parsing to determine implementation default
- parser['config_main'].add_argument(
- '-r', '--remote-out-dir',
- help='Directory to save cdist output in on the target host.',
- dest="remote_out_path")
- parser['config_main'].add_argument(
- '--remote-copy',
- help='Command to use for remote copy (should behave like scp).',
- action='store', dest='remote_copy',
- default=None)
- parser['config_main'].add_argument(
- '--remote-exec',
- help=('Command to use for remote execution '
- '(should behave like ssh).'),
- action='store', dest='remote_exec',
- default=None)
- parser['config_main'].add_argument(
- '-S', '--disable-saving-output-streams',
- help='Disable saving output streams.',
- action='store_false', dest='save_output_streams', default=True)
-
- # Config
- parser['config_args'] = argparse.ArgumentParser(add_help=False)
- parser['config_args'].add_argument(
- '-A', '--all-tagged',
- help=('Use all hosts present in tags db. Currently in beta.'),
- action="store_true", dest="all_tagged_hosts", default=False)
- parser['config_args'].add_argument(
- '-a', '--all',
- help=('List hosts that have all specified tags, '
- 'if -t/--tag is specified.'),
- action="store_true", dest="has_all_tags", default=False)
- parser['config_args'].add_argument(
- '-f', '--file',
- help=('Read specified file for a list of additional hosts to '
- 'operate on or if \'-\' is given, read stdin (one host per '
- 'line).'),
- dest='hostfile', required=False)
- parser['config_args'].add_argument(
- '-p', '--parallel', nargs='?', metavar='HOST_MAX',
- type=functools.partial(check_lower_bounded_int, lower_bound=1,
- name="positive int"),
- help=('Operate on multiple hosts in parallel for specified maximum '
- 'hosts at a time. Without argument CPU count is used by '
- 'default.'),
- action='store', dest='parallel',
- const=multiprocessing.cpu_count())
- parser['config_args'].add_argument(
- '-s', '--sequential',
- help='Operate on multiple hosts sequentially (default).',
- action='store_const', dest='parallel', const=0)
- parser['config_args'].add_argument(
- '-t', '--tag',
- help=('Host is specified by tag, not hostname/address; '
- 'list all hosts that contain any of specified tags. '
- 'Currently in beta.'),
- dest='tag', required=False, action="store_true", default=False)
- parser['config_args'].add_argument(
- 'host', nargs='*', help='Host(s) to operate on.')
- parser['config'] = parser['sub'].add_parser(
- 'config', parents=[parser['loglevel'], parser['beta'],
- parser['colored_output'],
- parser['common'],
- parser['config_main'],
- parser['inventory_common'],
- parser['config_args']])
- parser['config'].set_defaults(func=cdist.config.Config.commandline)
-
- # Install
- parser['install'] = parser['sub'].add_parser('install', add_help=False,
- parents=[parser['config']])
- parser['install'].set_defaults(func=cdist.install.Install.commandline)
-
- # Inventory
- parser['inventory'] = parser['sub'].add_parser('inventory')
- parser['invsub'] = parser['inventory'].add_subparsers(
- title="Inventory commands", dest="subcommand")
-
- parser['add-host'] = parser['invsub'].add_parser(
- 'add-host', parents=[parser['loglevel'], parser['beta'],
- parser['colored_output'],
- parser['common'],
- parser['inventory_common']])
- parser['add-host'].add_argument(
- 'host', nargs='*', help='Host(s) to add.')
- parser['add-host'].add_argument(
- '-f', '--file',
- help=('Read additional hosts to add from specified file '
- 'or from stdin if \'-\' (each host on separate line). '),
- dest='hostfile', required=False)
-
- parser['add-tag'] = parser['invsub'].add_parser(
- 'add-tag', parents=[parser['loglevel'], parser['beta'],
- parser['colored_output'],
- parser['common'],
- parser['inventory_common']])
- parser['add-tag'].add_argument(
- 'host', nargs='*',
- help='List of host(s) for which tags are added.')
- parser['add-tag'].add_argument(
- '-f', '--file',
- help=('Read additional hosts to add tags from specified file '
- 'or from stdin if \'-\' (each host on separate line). '),
- dest='hostfile', required=False)
- parser['add-tag'].add_argument(
- '-T', '--tag-file',
- help=('Read additional tags to add from specified file '
- 'or from stdin if \'-\' (each tag on separate line). '),
- dest='tagfile', required=False)
- parser['add-tag'].add_argument(
- '-t', '--taglist',
- help=("Tag list to be added for specified host(s), comma separated"
- " values."),
- dest="taglist", required=False)
-
- parser['del-host'] = parser['invsub'].add_parser(
- 'del-host', parents=[parser['loglevel'], parser['beta'],
- parser['colored_output'],
- parser['common'],
- parser['inventory_common']])
- parser['del-host'].add_argument(
- 'host', nargs='*', help='Host(s) to delete.')
- parser['del-host'].add_argument(
- '-a', '--all', help=('Delete all hosts.'),
- dest='all', required=False, action="store_true", default=False)
- parser['del-host'].add_argument(
- '-f', '--file',
- help=('Read additional hosts to delete from specified file '
- 'or from stdin if \'-\' (each host on separate line). '),
- dest='hostfile', required=False)
-
- parser['del-tag'] = parser['invsub'].add_parser(
- 'del-tag', parents=[parser['loglevel'], parser['beta'],
- parser['colored_output'],
- parser['common'],
- parser['inventory_common']])
- parser['del-tag'].add_argument(
- 'host', nargs='*',
- help='List of host(s) for which tags are deleted.')
- parser['del-tag'].add_argument(
- '-a', '--all',
- help=('Delete all tags for specified host(s).'),
- dest='all', required=False, action="store_true", default=False)
- parser['del-tag'].add_argument(
- '-f', '--file',
- help=('Read additional hosts to delete tags for from specified '
- 'file or from stdin if \'-\' (each host on separate '
- 'line). '),
- dest='hostfile', required=False)
- parser['del-tag'].add_argument(
- '-T', '--tag-file',
- help=('Read additional tags from specified file '
- 'or from stdin if \'-\' (each tag on separate line). '),
- dest='tagfile', required=False)
- parser['del-tag'].add_argument(
- '-t', '--taglist',
- help=("Tag list to be deleted for specified host(s), "
- "comma separated values."),
- dest="taglist", required=False)
-
- parser['list'] = parser['invsub'].add_parser(
- 'list', parents=[parser['loglevel'], parser['beta'],
- parser['colored_output'],
- parser['common'],
- parser['inventory_common']])
- parser['list'].add_argument(
- 'host', nargs='*', help='Host(s) to list.')
- parser['list'].add_argument(
- '-a', '--all',
- help=('List hosts that have all specified tags, '
- 'if -t/--tag is specified.'),
- action="store_true", dest="has_all_tags", default=False)
- parser['list'].add_argument(
- '-f', '--file',
- help=('Read additional hosts to list from specified file '
- 'or from stdin if \'-\' (each host on separate line). '
- 'If no host or host file is specified then, by default, '
- 'list all.'), dest='hostfile', required=False)
- parser['list'].add_argument(
- '-H', '--host-only', help=('Suppress tags listing.'),
- action="store_true", dest="list_only_host", default=False)
- parser['list'].add_argument(
- '-t', '--tag',
- help=('Host is specified by tag, not hostname/address; '
- 'list all hosts that contain any of specified tags.'),
- action="store_true", default=False)
-
- parser['inventory'].set_defaults(
- func=cdist.inventory.Inventory.commandline)
-
- # PreOS
- parser['preos'] = parser['sub'].add_parser('preos', add_help=False)
-
- # Shell
- parser['shell'] = parser['sub'].add_parser(
- 'shell', parents=[parser['loglevel'], parser['colored_output']])
- parser['shell'].add_argument(
- '-s', '--shell',
- help=('Select shell to use, defaults to current shell. Used shell'
- ' should be POSIX compatible shell.'))
- parser['shell'].set_defaults(func=cdist.shell.Shell.commandline)
-
- # 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)
-
- # Scan = config + further
- parser['scan'] = parser['sub'].add_parser('scan', add_help=False,
- parents=[parser['config']])
-
- parser['scan'] = parser['sub'].add_parser(
- 'scan', parents=[parser['loglevel'],
- parser['beta'],
- parser['colored_output'],
- parser['common'],
- parser['config_main']])
-
- parser['scan'].add_argument(
- '-m', '--mode', help='Which modes should run',
- action='append', default=[],
- choices=['scan', 'trigger', 'config'])
- parser['scan'].add_argument(
- '--list',
- action='store_true',
- help='List the known hosts and exit')
- parser['scan'].add_argument(
- '--config',
- action='store_true',
- help='Try to configure detected hosts')
- parser['scan'].add_argument(
- '-I', '--interface',
- action='append', default=[], required=True,
- help='On which interfaces to scan/trigger')
- parser['scan'].add_argument(
- '--name-mapper',
- action='store', default=None,
- help='Map addresses to names, required for config mode')
- parser['scan'].add_argument(
- '-d', '--config-delay',
- action='store', default=3600, type=int,
- help='How long (seconds) to wait before reconfiguring after last try')
- parser['scan'].add_argument(
- '-t', '--trigger-delay',
- action='store', default=5, type=int,
- help='How long (seconds) to wait between ICMPv6 echo requests')
- parser['scan'].set_defaults(func=cdist.scan.commandline.commandline)
-
- for p in parser:
- parser[p].epilog = EPILOG
-
- return parser
-
-
-def handle_loglevel(args):
- if hasattr(args, 'quiet') and args.quiet:
- args.verbose = _verbosity_level_off
-
- logging.getLogger().setLevel(_verbosity_level[args.verbose])
-
-
-def handle_log_colors(args):
- if cdist.configuration.ColoredOutputOption.translate(args.colored_output):
- cdist.log.CdistFormatter.USE_COLORS = True
-
-
-def parse_and_configure(argv, singleton=True):
- parser = get_parsers()
- parser_args = parser['main'].parse_args(argv)
- try:
- cfg = cdist.configuration.Configuration(parser_args,
- singleton=singleton)
- args = cfg.get_args()
- except ValueError as e:
- raise cdist.Error(str(e))
- # Loglevels are handled globally in here
- handle_loglevel(args)
- handle_log_colors(args)
-
- log = logging.getLogger("cdist")
-
- log.verbose("version %s", cdist.VERSION)
- log.trace('command line args: %s', cfg.command_line_args)
- log.trace('configuration: %s', cfg.get_config())
- log.trace('configured args: %s', args)
-
- check_beta(vars(args))
-
- return parser, cfg
diff --git a/cdist/autil.py b/cdist/autil.py
deleted file mode 100644
index d16d147e..00000000
--- a/cdist/autil.py
+++ /dev/null
@@ -1,71 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# 2017 Darko Poljak (darko.poljak at gmail.com)
-#
-# This file is part of cdist.
-#
-# cdist is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# cdist is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with cdist. If not, see .
-#
-#
-
-
-import cdist
-import tarfile
-import os
-import glob
-import tempfile
-
-
-_ARCHIVING_MODES = {
- 'tar': '',
- 'tgz': 'gz',
- 'tbz2': 'bz2',
- 'txz': 'xz',
-}
-
-
-_UNARCHIVE_OPT = {
- 'tar': None,
- 'tgz': '-z',
- 'tbz2': '-j',
- 'txz': '-J',
-}
-
-
-# Archiving will be enabled if directory contains more than FILES_LIMIT files.
-FILES_LIMIT = 1
-
-
-def get_extract_option(mode):
- return _UNARCHIVE_OPT[mode]
-
-
-def tar(source, mode="tgz"):
- if mode not in _ARCHIVING_MODES:
- raise cdist.Error("Unsupported archiving mode {}.".format(mode))
-
- files = glob.glob1(source, '*')
- fcnt = len(files)
- if fcnt <= FILES_LIMIT:
- return None, fcnt
-
- tarmode = 'w:{}'.format(_ARCHIVING_MODES[mode])
- _, tarpath = tempfile.mkstemp(suffix='.' + mode)
- with tarfile.open(tarpath, tarmode, dereference=True) as tar:
- if os.path.isdir(source):
- for f in files:
- tar.add(os.path.join(source, f), arcname=f)
- else:
- tar.add(source)
- return tarpath, fcnt
diff --git a/cdist/banner.py b/cdist/banner.py
index da4dea5d..edfa72e8 100644
--- a/cdist/banner.py
+++ b/cdist/banner.py
@@ -20,6 +20,8 @@
#
import logging
+import sys
+
import cdist
log = logging.getLogger(__name__)
diff --git a/cdist/conf/explorer/cpu_cores b/cdist/conf/explorer/cpu_cores
index 81e5294e..7f7a955e 100755
--- a/cdist/conf/explorer/cpu_cores
+++ b/cdist/conf/explorer/cpu_cores
@@ -25,22 +25,13 @@
os=$("$__explorer/os")
case "$os" in
"macosx")
- sysctl -n hw.physicalcpu
- ;;
-
- "openbsd")
- sysctl -n hw.ncpuonline
- ;;
-
- "freebsd"|"netbsd")
- PATH=$(getconf PATH)
- sysctl -n hw.ncpu
+ echo "$(sysctl -n hw.physicalcpu)"
;;
*)
if [ -r /proc/cpuinfo ]; then
cores="$(grep "core id" /proc/cpuinfo | sort | uniq | wc -l)"
- if [ "${cores}" -eq 0 ]; then
+ if [ ${cores} -eq 0 ]; then
cores="1"
fi
echo "$cores"
diff --git a/cdist/conf/explorer/cpu_sockets b/cdist/conf/explorer/cpu_sockets
index a32e2f00..8a8194df 100755
--- a/cdist/conf/explorer/cpu_sockets
+++ b/cdist/conf/explorer/cpu_sockets
@@ -25,14 +25,14 @@
os=$("$__explorer/os")
case "$os" in
"macosx")
- system_profiler SPHardwareDataType | grep "Number of Processors" | awk -F': ' '{print $2}'
+ echo "$(system_profiler SPHardwareDataType | grep "Number of Processors" | awk -F': ' '{print $2}')"
;;
*)
if [ -r /proc/cpuinfo ]; then
- sockets="$(grep "physical id" /proc/cpuinfo | sort -u | wc -l)"
- if [ "${sockets}" -eq 0 ]; then
- sockets="$(grep -c "processor" /proc/cpuinfo)"
+ sockets="$(grep "physical id" /proc/cpuinfo | sort | uniq | wc -l)"
+ if [ ${sockets} -eq 0 ]; then
+ sockets="$(cat /proc/cpuinfo | grep "processor" | wc -l)"
fi
echo "${sockets}"
fi
diff --git a/cdist/conf/explorer/disks b/cdist/conf/explorer/disks
old mode 100755
new mode 100644
index 56d62d10..52fef81e
--- a/cdist/conf/explorer/disks
+++ b/cdist/conf/explorer/disks
@@ -1,66 +1,2 @@
-#!/bin/sh -e
-#
-# based on previous work by other people, modified by:
-# 2020 Dennis Camera
-#
-# 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 .
-#
-# Finds disks of the system (excl. ram disks, floppy, cdrom)
-
-uname_s="$(uname -s)"
-
-case $uname_s in
- FreeBSD)
- sysctl -n kern.disks
- ;;
- OpenBSD)
- sysctl -n hw.disknames | grep -Eo '[lsw]d[0-9]+'
- ;;
- NetBSD)
- PATH=$(getconf PATH)
- sysctl -n hw.disknames | awk -v RS=' ' '/^[lsw]d[0-9]+/'
- ;;
- Linux)
- # list of major device numbers toexclude:
- # ram disks, floppies, cdroms
- # https://www.kernel.org/doc/Documentation/admin-guide/devices.txt
- ign_majors='1 2 11'
-
- 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
- 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 'If you can please submit a patch\n' >&2
- ;;
-esac \
-| xargs
+cd /dev
+echo sd? hd? vd?
diff --git a/cdist/conf/explorer/hostname b/cdist/conf/explorer/hostname
index dca004d1..7715c6b0 100755
--- a/cdist/conf/explorer/hostname
+++ b/cdist/conf/explorer/hostname
@@ -1,6 +1,7 @@
#!/bin/sh
#
-# 2019 Dennis Camera (dennis.camera at ssrq-sds-fds.ch)
+# 2010-2014 Nico Schottelius (nico-cdist at schottelius.org)
+# 2012 Steven Armstrong (steven-cdist at armstrong.cc)
#
# This file is part of cdist.
#
@@ -18,12 +19,7 @@
# along with cdist. If not, see .
#
#
-# Retrieve the running hostname
-#
-if command -v hostname >/dev/null
-then
- hostname
-else
- uname -n
+if command -v uname >/dev/null; then
+ uname -n
fi
diff --git a/cdist/conf/explorer/init b/cdist/conf/explorer/init
deleted file mode 100755
index f27c77ef..00000000
--- a/cdist/conf/explorer/init
+++ /dev/null
@@ -1,442 +0,0 @@
-#!/bin/sh -e
-#
-# 2016 Daniel Heule (hda at sfs.biz)
-# Copyright 2017, Philippe Gregoire
-# 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 .
-#
-#
-# Returns the name of the init system (PID 1)
-
-# 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
-# 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!
-
-# 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 </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
- ;;
- 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
diff --git a/cdist/conf/explorer/interfaces b/cdist/conf/explorer/interfaces
index aeb55ed0..c1f2a57a 100755
--- a/cdist/conf/explorer/interfaces
+++ b/cdist/conf/explorer/interfaces
@@ -1,6 +1,6 @@
-#!/bin/sh -e
+#!/bin/sh
#
-# 2019 Ander Punnar (ander-at-kvlt-dot-ee)
+# 2012 Sébastien Gross
#
# This file is part of cdist.
#
@@ -17,12 +17,35 @@
# You should have received a copy of the GNU General Public License
# along with cdist. If not, see .
#
+#
+# List all network interfaces in explorer/ifaces. One interface per line.
+#
+# If your OS is not supported please provide a ifconfig output
+#
-if command -v ip >/dev/null
-then
- ip -o link show | sed -n 's/^[0-9]\+: \(.\+\): <.*/\1/p'
-elif command -v ifconfig >/dev/null
-then
- ifconfig -a | sed -n -E 's/^(.*)(:[[:space:]]*flags=|Link encap).*/\1/p'
-fi \
- | sort -u
+# Use ip, if available
+if command -v ip >/dev/null; then
+ ip -o link show | sed -n 's/^[0-9]\+: \(.\+\): <.*/\1/p'
+ exit 0
+fi
+
+if ! command -v ifconfig >/dev/null; then
+ # no ifconfig, nothing we could do
+ exit 0
+fi
+
+uname_s="$(uname -s)"
+REGEXP='s/^(.*)(:[[:space:]]*flags=|Link encap).*/\1/p'
+
+case "$uname_s" in
+ Darwin)
+ ifconfig -a | sed -n -E "$REGEXP"
+ ;;
+ Linux|*BSD)
+ ifconfig -a | sed -n -r "$REGEXP"
+ ;;
+ *)
+ echo "Unsupported ifconfig output for $uname_s" >&2
+ exit 1
+ ;;
+esac
diff --git a/cdist/conf/explorer/is-freebsd-jail b/cdist/conf/explorer/is-freebsd-jail
deleted file mode 100755
index 010917f5..00000000
--- a/cdist/conf/explorer/is-freebsd-jail
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-sysctl -n security.jail.jailed 2>/dev/null | grep "1" || true
diff --git a/cdist/conf/explorer/kernel_name b/cdist/conf/explorer/kernel_name
deleted file mode 100755
index 1f9cfca4..00000000
--- a/cdist/conf/explorer/kernel_name
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-uname -s
diff --git a/cdist/conf/explorer/lsb_codename b/cdist/conf/explorer/lsb_codename
index c9fb5cdf..eebd3e0f 100755
--- a/cdist/conf/explorer/lsb_codename
+++ b/cdist/conf/explorer/lsb_codename
@@ -20,12 +20,8 @@
#
set +e
-case "$("$__explorer/os")" in
- checkpoint)
- awk '{printf("%s\n", $(NF-1))}' /etc/cp-release
- ;;
+case "$($__explorer/os)" in
openwrt)
- # shellcheck disable=SC1091
(. /etc/openwrt_release && echo "$DISTRIB_CODENAME")
;;
*)
diff --git a/cdist/conf/explorer/lsb_description b/cdist/conf/explorer/lsb_description
index 7279a9c2..23f45421 100755
--- a/cdist/conf/explorer/lsb_description
+++ b/cdist/conf/explorer/lsb_description
@@ -20,12 +20,8 @@
#
set +e
-case "$("$__explorer/os")" in
- checkpoint)
- cat /etc/cp-release
- ;;
+case "$($__explorer/os)" in
openwrt)
- # shellcheck disable=SC1091
(. /etc/openwrt_release && echo "$DISTRIB_DESCRIPTION")
;;
*)
diff --git a/cdist/conf/explorer/lsb_id b/cdist/conf/explorer/lsb_id
index 1f91cc40..9754eb63 100755
--- a/cdist/conf/explorer/lsb_id
+++ b/cdist/conf/explorer/lsb_id
@@ -20,12 +20,8 @@
#
set +e
-case "$("$__explorer/os")" in
- checkpoint)
- echo "CheckPoint"
- ;;
+case "$($__explorer/os)" in
openwrt)
- # shellcheck disable=SC1091
(. /etc/openwrt_release && echo "$DISTRIB_ID")
;;
*)
diff --git a/cdist/conf/explorer/lsb_release b/cdist/conf/explorer/lsb_release
index 0bb9f7fe..35b5547c 100755
--- a/cdist/conf/explorer/lsb_release
+++ b/cdist/conf/explorer/lsb_release
@@ -20,12 +20,8 @@
#
set +e
-case "$("$__explorer/os")" in
- checkpoint)
- sed /etc/cp-release -e 's/.* R\([1-9][0-9]*\)\.[0-9]*$/\1/'
- ;;
+case "$($__explorer/os)" in
openwrt)
- # shellcheck disable=SC1091
(. /etc/openwrt_release && echo "$DISTRIB_RELEASE")
;;
*)
diff --git a/cdist/conf/explorer/machine b/cdist/conf/explorer/machine
index 7ecb67e3..d4a0e106 100755
--- a/cdist/conf/explorer/machine
+++ b/cdist/conf/explorer/machine
@@ -22,6 +22,6 @@
#
#
-if command -v uname >/dev/null 2>&1 ; then
+if command -v uname 2>&1 >/dev/null; then
uname -m
fi
diff --git a/cdist/conf/explorer/machine_type b/cdist/conf/explorer/machine_type
index 00646c75..74789f5a 100755
--- a/cdist/conf/explorer/machine_type
+++ b/cdist/conf/explorer/machine_type
@@ -1,6 +1,7 @@
-#!/bin/sh -e
+#!/bin/sh
#
-# 2021 Dennis Camera (cdist at dtnr.ch)
+# 2014 Daniel Heule (hda at sfs.biz)
+# 2014 Thomas Oettli (otho at sfs.biz)
#
# This file is part of cdist.
#
@@ -17,1019 +18,37 @@
# You should have received a copy of the GNU General Public License
# along with cdist. If not, see .
#
-# This explorer tries to determine what type of machine the target to be
-# configured is (container, virtual machine, bare-metal).
-#
-# It will print one line for each layer it can detect.
-# The format of all lines is: TYPE[ VERB VENDOR]
-#
-# VERB does not have a special meaning, it is just for better readability.
-#
-# e.g.
-# container
-# container on lxc
-# virtual by kvm-spapr
-#
-# The third word of each line (except the first) can be composed of different
-# parts concatenated with a `-' (minus) character, with each component being
-# a specification of the previous, e.g.:
-# - lxc-libvirt (LXC container, managed by libvirt)
-# - lpar-s390 / lpar-power (LPAR running on IBM S/390 or POWER, respectively)
-# - xen-hvm / xen-pv (Xen HVM vs para-virtualization)
-#
-# If this explorer cannot collect enough information about virtualization it
-# will fall back to 'physical'.
#
-# Add /sbin and /usr/sbin to the path so we can find system
-# binaries like dmidecode.
-PATH=$(getconf PATH 2>/dev/null) || PATH='/usr/bin:/bin'
-PATH="/sbin:/usr/sbin:${PATH}"
-export PATH
-
-arch=$(uname -m | sed -e 's/i.86/i386/' -e 's/arm.*/arm/')
-uname_s=$(uname -s)
-
-
-is_command() { command -v "$1" >/dev/null 2>&1; }
-
-files_same() {
- # shellcheck disable=SC2012
- LC_ALL=C df -P "$1" "$2" 2>/dev/null | {
- read -r _ # skip header line
- read -r fs1 _ _ _ _ mp1
- read -r fs2 _ _ _ _ mp2
- test "${fs1}" = "${fs2}" -a "${mp1}" = "${mp2}" || return 1
- } &&
- ls -1Ldi "$1" "$2" 2>/dev/null | {
- read -r ino1 _
- read -r ino2 _
- test "${ino1}" = "${ino2}" || return 1
- }
-}
-
-is_oneof() (
- x=$1; shift
- for y
- do
- test "${x}" = "${y}" || continue
- return 0
- done
- return 1
-)
-
-tolower() { LC_ALL=C tr '[:upper:]' '[:lower:]'; }
-
-# shellcheck disable=SC2086
-glob_exists() { set -- $1; test -e "$1"; }
-
-get_dmi_field() {
- if is_oneof "${uname_s}" NetBSD
- then
- case $1
- in
- (system-manufacturer) _mib=machdep.dmi.system-vendor ;;
- (system-product-name) _mib=machdep.dmi.system-product ;;
- (system-version|system-uuid) _mib=machdep.dmi.$1 ;;
- (bios-vendor|bios-version) _mib=machdep.dmi.$1 ;;
- (biod-release-date) _mib=machdep.dmi.bios-date ;;
- (*) _mib= ;;
- esac
-
- test -n "${_mib}" && get_sysctl "${_mib}" | grep -e . && return
- fi
-
- if is_command dmidecode
- then
- dmidecode -s "$1"
- elif test -d "${dmi_sysfs-}"
- then
- case $1
- in
- (system-manufacturer) _filename=sys_vendor ;;
- (system-product-name) _filename=product_name ;;
- (*) _filename=$(echo "$1" | tr - _) ;;
- esac
- if test -r "${dmi_sysfs-}/${_filename}"
- then
- cat "${dmi_sysfs}/${_filename}"
- fi
- unset _filename
- elif test "${uname_s}" = OpenBSD
- then
- # NOTE: something similar to system-manufacutrer and system-product-name
- # is available on OpenBSD in sysctl
- case $1
- in
- (system-manufacturer) _mib=hw.vendor ;;
- (system-product-name) _mib=hw.product ;;
- (*) _mib= ;;
- esac
-
- test -n "${_mib}" && get_sysctl "${_mib}" | grep -e . && return
- fi
-
- return 1
-}
-
-has_cpuinfo() { test -e /proc/cpuinfo; }
-
-get_sysctl() {
- is_command sysctl && sysctl -n "$1" 2>/dev/null
-}
-
-detected_layer() {
- test -n "${_toplayer:-}" || echo "${_toplayer:=${1:?}}"
-}
-
-
-# Check for chroot
-
-has_chroot_systemd() {
- is_command systemd-detect-virt && systemd-detect-virt --help | grep -q -e '^ -r'
-}
-
-check_chroot_systemd() {
- systemd-detect-virt -r
-}
-
-has_chroot_debian_ischroot() {
- is_command ischroot
-}
-
-check_chroot_debian_ischroot() {
- ischroot --default-false
-}
-
-has_chroot_procfs() {
- test -d /proc/
-}
-
-check_chroot_procfs() (
- is_chroot=false # default
- if test -e /proc/1/root && ! files_same /proc/1/root /
- then
- is_chroot=true
- fi
- if test -e /proc/1/mountinfo -a -e /proc/self/mountinfo
- then
- has_mountinfo=true
- cmp -s /proc/1/mountinfo /proc/self/mountinfo || is_chroot=true
- fi
-
- if ${is_chroot}
- then
- # try to determine where the chroot has been mounted
- rootdev=$(LC_ALL=C df -P / | awk 'NR==2{print $1}')
-
- if test -e "${rootdev}"
- then
- # escape chroot to determine where the device containing the
- # chroot's / is mounted
- rootdevmnt=$(LC_ALL=C chroot /proc/1/root df -P "${rootdev}" | awk 'NR==2{print $6}')
-
- # shellcheck disable=SC2012
- root_ino=$(ls -1di / | awk '{print $1}')
-
- # escape chroot and find mount point by inode
- chroot /proc/1/root find "${rootdevmnt}" -xdev -type d -inum "${root_ino}"
- elif ${has_mountinfo}
- then
- while read -r mntid _ _ _ cmntpnt _
- do
- read -r _ _ _ _ hmntpnt _ <<-EOF
- $(grep -e "^$((mntid)) " /proc/1/mountinfo)
- EOF
- printf '%s\n' "${hmntpnt%${cmntpnt}}"
- done /dev/null) &&
- case ${_ctengine}
- in
- (''|'none')
- return 1 ;;
- ('container-other')
- return 0 ;;
- ('systemd-nspawn')
- echo systemd_nspawn ;;
- (*)
- echo "${_ctengine}" ;;
- esac
-)
-
-has_ct_pid_1() {
- test -r /run/systemd/container -o -r /proc/1/environ
-}
-
-translate_container_name() {
- case $1
- in
- ('lxc')
- echo lxc ;;
- ('lxc-libvirt')
- echo lxc-libvirt ;;
- ('podman')
- echo podman ;;
- ('systemd-nspawn')
- echo systemd_nspawn ;;
- (*)
- return 1 ;;
- esac
- return 0
-}
-
-check_ct_pid_1() {
- if test -r /run/systemd/container
- then
- translate_container_name "$(head -n1 /run/systemd/container)" \
- && return 0
- fi
-
- if test -r /proc/1/environ
- then
- translate_container_name "$(
- LC_ALL=C tr '\000' '\n' /dev/null
- then
- # https://github.com/Microsoft/WSL/issues/423#issuecomment-221627364
- echo wsl
- elif test -d /var/.cagefs
- then
- # https://docs.cloudlinux.com/cloudlinux_os_components/#cagefs
- # CageFS is not "really" a container, but it isn't a chroot either.
- echo cagefs
- elif test -e /proc/self/status && grep -q -e '^VxID: [0-9]\{1,\}' /proc/self/status
- then
- # Linux-VServer
- if grep -q -x -F 'VxID: 0' /proc/self/status
- then
- # host
- return 1
- else
- # guest
- echo linux_vserver
- fi
- else
- return 1
- fi
-}
-
-check_ct_os_specific() (
- if jailed=$(get_sysctl security.jail.jailed) && test "${jailed}" = 1
- then
- # FreeBSD jail
- echo jail
- return 0
- fi
-
- if is_command zonename && test "$(zonename)" != global
- then
- # Solaris zone
- echo zone
- return 0
- fi
-
- return 1
-)
-
-
-# Check for hypervisor
-
-guess_hypervisor_from_cpu_model() {
- case $1
- in
- (*\ KVM\ *)
- echo kvm ;;
- (*\ QEMU\ *|QEMU\ *)
- echo qemu ;;
- (*)
- return 1 ;;
- esac
-}
-
-has_vm_systemd() {
- is_command systemd-detect-virt && systemd-detect-virt --help | grep -q -e '^ -v'
-}
-
-check_vm_systemd() (
- _hypervisor=$(systemd-detect-virt -v 2>/dev/null) &&
- case ${_hypervisor}
- in
- (''|'none')
- return 1 ;;
- ('amazon')
- echo aws ;;
- ('bochs')
- echo kvm ;;
- ('microsoft')
- # assumption
- echo hyperv ;;
- ('oracle')
- echo virtualbox ;;
- ('vm-other')
- return 0 ;;
- (*)
- echo "${_hypervisor}" ;;
- esac
-)
-
-has_vm_cpuinfo() { has_cpuinfo; }
-
-check_vm_cpuinfo() {
- if grep -q -F 'User Mode Linux' /proc/cpuinfo \
- || grep -q -F 'UML' /proc/cpuinfo
- then
- # User Mode Linux
- echo uml
- elif grep -q -e '^vendor_id.*: PowerVM Lx86' /proc/cpuinfo
- then
- # IBM PowerVM Lx86 (Linux/x86 emulator)
- echo powervm_lx86
- elif grep -q -e '^vendor_id.*: IBM/S390' /proc/cpuinfo
- then
- # IBM SystemZ (S/390)
- if test -f /proc/sysinfo
- then
- if grep -q -e '^VM[0-9]* Control Program: KVM/Linux' /proc/sysinfo
- then
- echo kvm-s390
- return 0
- elif grep -q -e '^VM[0-9]* Control Program: z/VM' /proc/sysinfo
- then
- echo zvm
- return 0
- elif grep -q -e '^LPAR ' /proc/sysinfo
- then
- echo zvm-lpar
- return 0
- fi
- fi
- return 1
- else
- if grep -q -e '^model name.*:' /proc/cpuinfo
- then
- sed -n -e 's/^model name[^:]*: *//p' /proc/cpuinfo \
- | while read -r _cpu_model
- do
- guess_hypervisor_from_cpu_model "${_cpu_model}"
- done \
- | sort \
- | uniq -c \
- | awk '
- { if ($1 > most_c) { most_c = $1; most_s = $2 } }
- END {
- if (most_s) print most_s
- exit !most_s
- }' \
- && return 0
- fi
- return 1
- fi
-}
-
-check_vm_arch_specific() {
- case ${arch}
- in
- (ppc64|ppc64le)
- # Check PPC64 LPAR, KVM
-
- # example /proc/cpuinfo line indicating 'not baremetal'
- # platform : pSeries
- #
- # example /proc/ppc64/lparcfg systemtype line
- # system_type=IBM pSeries (emulated by qemu)
-
- if has_cpuinfo && grep -q -e 'platform.**pSeries' /proc/cpuinfo
- then
- if test -e /proc/ppc64/lparcfg
- then
- # Assume LPAR, now detect shared or dedicated
- if grep -q -x -F 'shared_processor_mode=1' /proc/ppc64/lparcfg
- then
- echo powervm-shared
- return 0
- else
- echo powervm-dedicated
- return 0
- fi
- fi
- fi
- ;;
- (sparc*)
- # Check for SPARC LDoms
-
- if test -e /dev/mdesc
- then
- if test -d /sys/class/vlds/ctrl -a -d /sys/class/vlds/sp
- then
- # control LDom
- return 1
- else
- # guest LDom
- echo ldom-sparc
- fi
-
- # MDPROP=/usr/lib/ldoms/mdprop.py
- # if test -x "${MDPROP}"
- # then
- # if test -n "$("${MDPROP}" -v iodevice device-type=pciex)"
- # then
- # echo ldoms-root
- # echo ldoms-io
- # elif test -n "$("${MDPROP}" -v iov-device vf-id=0)"
- # then
- # echo ldoms-io
- # fi
- # fi
- return 0
- fi
- ;;
- (i?86|x86*|amd64|i86pc)
- # VMM CPUID flag denotes that this system is running under a VMM
- if is_oneof "${uname_s}" Darwin
- then
- get_sysctl machdep.cpu.features | tr ' ' '\n' | grep -qixF VMM \
- && return 0
- fi
- if has_cpuinfo \
- && grep -q -i -e '^flags.*:.*\(hypervisor\|vmm\)' /proc/cpuinfo
- then
- return 0
- fi
- ;;
- (ia64)
- if test -d /sys/bus/xen -a ! -d /sys/bus/xen-backend
- then
- # PV-on-HVM drivers installed in a Xen guest
- echo xen-hvm
- return 0
- fi
- ;;
- esac
- return 1
-}
-
-has_vm_dmi() {
- # Check for various products in SMBIOS/DMI.
- # Note that DMI doesn't exist on all architectures (only x86 and some ARM).
- # On other architectures the $dmi variable will be empty.
-
- if test -d /sys/class/dmi/id/
- then
- dmi_sysfs=/sys/class/dmi/id
- elif test -d /sys/devices/virtual/dmi/id/
- then
- dmi_sysfs=/sys/devices/virtual/dmi/id
- fi
-
- # shellcheck disable=SC2015
- {
- is_command dmidecode \
- && (
- # dmidecode needs to exit 0 and not print the No SMBIOS/DMI line
- dmi_out=$(dmidecode 2>&1) \
- && ! printf '%s\n' "${dmi_out}" \
- | grep -qF 'No SMBIOS nor DMI entry point found, sorry.'
- ) \
- || test -d "${dmi_sysfs}"
- }
-}
-
-check_vm_dmi() {
- case $(get_dmi_field system-product-name)
- in
- (*.metal)
- if test "$(get_dmi_field system-manufacturer)" = 'Amazon EC2'
- then
- # AWS EC2 bare metal -> no virtualisation
- return 1
- fi
- ;;
- ('BHYVE')
- echo bhyve
- return 0
- ;;
- ('Google Compute Engine')
- echo gce
- return 0
- ;;
- ('RHEV Hypervisor')
- # Red Hat Enterprise Virtualization
- echo rhev
- return 0
- ;;
- ('KVM'|'Bochs'|'KVM Virtual Machine')
- echo kvm
- return 0
- ;;
- ('Parallels Virtual Platform')
- echo parallels
- return 0
- ;;
- ('VirtualBox')
- echo virtualbox
- return 0
- ;;
- ('VMware Virtual Platform')
- echo vmware
- return 0
- ;;
- esac
-
- case $(get_dmi_field system-manufacturer)
- in
- ('Alibaba'*)
- case $(get_dmi_field system-product-name)
- in
- ('Alibaba Cloud ECS')
- echo alibaba-ecs
- ;;
- (*)
- echo alibaba
- ;;
- esac
- return 0
- ;;
- ('Amazon EC2')
- # AWS on bare-metal or KVM
- echo aws-ec2
- return 0
- ;;
- ('innotek GmbH'|'Oracle Corporation')
- echo virtualbox
- return 0
- ;;
- ('Joyent')
- if test "$(get_dmi_field system-product-name)" = 'SmartDC HVM'
- then
- # SmartOS KVM
- echo kvm-smartdc_hvm
- return 0
- fi
- ;;
- ('Microsoft Corporation'*)
- if test "$(get_dmi_field system-product-name)" = 'Virtual Machine'
- then
- if test -e /proc/irq/7/hyperv \
- || expr "$(get_dmi_field bios-version)" : 'VRTUAL.*' >/dev/null
- then
- echo hyperv
- return 0
- fi
-
- case $(get_dmi_field system-version)
- in
- (VPC[0-9]*|VS2005*|*[Vv]irtual*[Pp][Cc]*)
- echo virtualpc
- return 0
- ;;
- (*)
- echo hyperv
- return 0
- ;;
- esac
- fi
- ;;
- ('Nutanix')
- # Nutanix AHV. Similar to KVM.
- if test "$(get_dmi_field system-product-name)" = 'AHV'
- then
- echo nutanix_ahv
- return 0
- fi
- ;;
- ('oVirt')
- echo ovirt
- return 0
- ;;
- ('Parallels Software International Inc.')
- echo parallels
- return 0
- ;;
- ('QEMU')
- echo qemu
- return 0
- ;;
- ('VMware, Inc.')
- echo vmware
- return 0
- ;;
- esac
-
- case $(get_dmi_field bios-vendor)
- in
- ('Amazon EC2')
- # AWS on bare-metal or KVM
- echo aws-ec2
- return 0
- ;;
- ('BHYVE')
- echo bhyve
- return 0
- ;;
- ('innotek GmbH')
- echo virtualbox
- return 0
- ;;
- ('Parallels Software International Inc.')
- echo parallels
- return 0
- ;;
- ('Xen')
- if get_dmi_field bios-version | grep -q -e '\([0-9]\{1,\}\.\)\{2\}amazon'
- then
- # AWS on Xen
- echo aws-xen
- return 0
- fi
- ;;
- esac
-
- return 1
-}
-
-check_vm_hyp_specific() {
- if is_command vmware-checkvm && vmware-checkvm >/dev/null
- then
- # vmware-checkvm is provided by VMware's open-vm-tools
- echo vmware
- return 0
- elif test -d /proc/xen
- then
- test -r /proc/xen/capabilities &&
- if grep -q -F 'control_d' /proc/xen/capabilities 2>/dev/null
- then
- # Xen dom0
- return 1
- else
- # Xen domU
- echo xen
- return 0
- fi
- fi
- return 1
-}
-
-has_vm_dt() {
- # OpenFirmware/Das U-Boot device-tree
- test -d /proc/device-tree
-}
-
-check_vm_dt() {
- case ${arch}
- in
- (arm|aarch64)
- if test -r /proc/device-tree/hypervisor/compatible
- then
- if grep -q -F 'xen' /proc/device-tree/hypervisor/compatible
- then
- echo xen
- return 0
- elif grep -q -F 'vmware' /proc/device-tree/hypervisor/compatible
- then
- # e.g. VMware ESXi on ARM
- echo vmware
- return 0
- fi
- fi
- if glob_exists /proc/device-tree/fw-cfg@*/compatible
- then
- # qemu,fw-cfg-mmio
- sed -e 's/,.*$//' /proc/device-tree/fw-cfg@*/compatible | head -n1
- return 0
- fi
- if grep -q -F 'dummy-virt' /proc/device-tree/compatible
- then
- echo lkvm
- return 0
- fi
- ;;
- (ppc64*)
- if test -d /proc/device-tree/hypervisor \
- && grep -qF 'linux,kvm' /proc/device-tree/hypervisor/compatible
- then
- # We are running as a spapr KVM guest on ppc64
- echo kvm-spapr
- return 0
- fi
- if test -r /proc/device-tree/ibm,partition-name \
- && test -r /proc/device-tree/hmc-managed\? \
- && test -r /proc/device-tree/chosen/qemu,graphic-width
- then
- echo powervm
- fi
- ;;
- esac
- return 1
-}
-
-has_vm_sys_hypervisor() {
- test -d /sys/hypervisor/
-}
-
-check_vm_sys_hypervisor() {
- test -r /sys/hypervisor/type &&
- case $(head -n1 /sys/hypervisor/type)
- in
- (xen)
- # Ordinary kernel with pv_ops. There does not seem to be
- # enough information at present to tell whether this is dom0
- # or domU.
- echo xen
- return 0
- ;;
- esac
- return 1
-}
-
-check_vm_os_specific() {
- _hyp_generic=false
-
- case ${uname_s}
- in
- (Darwin)
- if hv_vmm_present=$(get_sysctl kern.hv_vmm_present) \
- && test "${hv_vmm_present}" -ne 0
- then
- _hyp_generic=true
- fi
- ;;
- (FreeBSD)
- # FreeBSD does not have /proc/cpuinfo even when procfs is used.
- # Instead there is a sysctl kern.vm_guest.
- # Which is 'none' if physical, else the virtualisation.
- vm_guest=$(get_sysctl kern.vm_guest | tolower) &&
- case ${vm_guest}
- in
- (none) ;;
- (generic) _hyp_generic=true ;;
- (*)
- # kernel could detect hypervisor
- case ${vm_guest}
- in
- (hv) echo hyperv ;;
- (vbox) echo virtualbox ;;
- (*) echo "${vm_guest}" ;;
- esac
- return 0
- ;;
- esac
- ;;
- (NetBSD)
- machdep_hv=$(get_sysctl machdep.hypervisor | tolower) &&
- case ${machdep_hv}
- in
- (none) ;;
- (generic) _hyp_generic=true ;;
- (*)
- # kernel could detect hypervisor
- case ${machdep_hv}
- in
- (hyper-v) echo hyperv ;;
- (xenhvm*) echo xen-hvm ;;
- (xenpv*) echo xen-pv ;;
- (xen*) echo xen ;;
- (*) echo "${machdep_hv}" ;;
- esac
- return 0
- ;;
- esac
- ;;
- (OpenBSD)
- if is_command hostctl && glob_exists /dev/pvbus[0-9]*
- then
- for _pvbus in /dev/pvbus[0-9]*
- do
- _h_out=$(hostctl -f "${_pvbus}" -t 2>/dev/null) || continue
- case $(expr "${_h_out}" : '[^:]*: *\(.*\)$')
- in
- (KVM) echo kvm ;;
- (Hyper-V) echo hyperv ;;
- (VMware) echo vmware ;;
- (Xen) echo xen ;;
- (bhyve) echo bhyve ;;
- (OpenBSD) echo openbsd_vmm ;;
- esac
- return 0
- done
- fi
- ;;
- (SunOS)
- diag_conf=$(prtdiag | sed -n -e 's/.*Configuration: *//p' -e '/^$/q')
- # NOTE: Don't use -e or -F in Solaris grep
- if printf '%s\n' "${diag_conf}" | grep -q -i QEMU
- then
- echo qemu
- return 0
- elif printf '%s\n' "${diag_conf}" | grep -q -i VMware
- then
- echo vmware
- return 0
- fi
- ;;
- (Linux)
- if is_command dmesg
- then
- while read -r line
- do
- case ${line}
- in
- ('Booting paravirtualized kernel on ')
- case $(expr "${line}" : '.* kernel on \(.*\)')
- in
- ('Xen')
- echo xen-pv; return 0 ;;
- ('bare hardware')
- return 1 ;;
- esac
- ;;
- ('Hypervisor detected')
- case $(expr "${line}" : '.*: *\(.*\)')
- in
- ('ACRN')
- echo acrn ;;
- ('Jailhouse')
- echo jailhouse ;;
- ('KVM')
- echo kvm ;;
- ('Microsoft Hyper-V')
- echo hyperv ;;
- ('VMware')
- echo vmware ;;
- ('Xen HVM')
- echo xen-hvm ;;
- ('Xen PV')
- echo xen-pv ;;
- esac
- return 0
- ;;
- (lpar:*' under hypervisor')
- return 0 ;;
- esac
- done <<-EOF
- $(dmesg 2>/dev/null | awk '
- /Booting paravirtualized kernel on /
- /Hypervisor detected: /
- /lpar: .* under hypervisor/
- ')
- EOF
- fi
- esac
-
- # Try to guess hypervisor based on CPU model (sysctl hw.model if available)
- if cpu_model=$(get_sysctl hw.model)
- then
- guess_hypervisor_from_cpu_model "${cpu_model}" && return 0
- fi
-
- if ${_hyp_generic}
- then
- # cannot say which hypervisor, but one was detected
- return 0
- else
- return 1
- fi
-}
-
-run_stage() {
- if type "has_$1_$2" >/dev/null 2>&1
- then
- "has_$1_$2"
- else
- true
- fi \
- && "check_$1_$2"
-}
-
-
-# Execute chroot stages
-
-for stage in \
- procfs debian_ischroot systemd
-do
- chrootpnt=$(run_stage chroot ${stage}) || continue
- is_chrooted=true
- detected_layer 'chroot'
- if test -n "${chrootpnt}"
- then
- echo chroot at "${chrootpnt}"
- break
- fi
-done
-if ${is_chrooted:-false} && test -z "${chrootpnt}"
-then
- # could determine chroot, but not its mount point
- echo chroot
+# FIXME: other system types (not linux ...)
+
+if [ -r /proc/cpuinfo ]; then
+ # this should only exist on virtual guest machines,
+ # tested on vmware, xen, kvm
+ if grep -q "hypervisor" /proc/cpuinfo; then
+ # this file is aviable in xen guest systems
+ if [ -r /sys/hypervisor/type ]; then
+ if grep -q -i "xen" /sys/hypervisor/type; then
+ echo virtual_by_xen
+ exit
+ fi
+ else
+ if [ -r /sys/class/dmi/id/product_name ]; then
+ if grep -q -i 'vmware' /sys/class/dmi/id/product_name; then
+ echo "virtual_by_vmware"
+ exit
+ else
+ if grep -q -i 'bochs' /sys/class/dmi/id/product_name; then
+ echo "virtual_by_kvm"
+ exit
+ fi
+ fi
+ fi
+ fi
+ echo "virtual_by_unknown"
+ else
+ echo "physical"
+ fi
+else
+ echo "unknown"
fi
-
-
-# Execute container stages
-
-for stage in \
- systemd pid_1 cgroup files os_specific
-do
- ctengine=$(run_stage ct ${stage}) || continue
- detected_layer 'container'
- is_contained=true
- if test -n "${ctengine}"
- then
- echo container on "${ctengine}"
- break
- fi
-done
-if ${is_contained:-false} && test -z "${ctengine}"
-then
- # none of the stages could determine the specific container engine, but
- # we are running in some container.
- echo container
-fi
-
-
-# Execute virtual machine / hypervisor stages
-
-for stage in \
- systemd os_specific hyp_specific sys_hypervisor dt dmi cpuinfo arch_specific
-do
- hypervisor=$(run_stage vm ${stage}) || continue
- detected_layer 'virtual machine'
- is_virtual=true
- if test -n "${hypervisor}"
- then
- echo virtual by "${hypervisor}"
- break
- fi
-done
-if ${is_virtual:-false} && test -z "${hypervisor}"
-then
- # none of the stages could determine the specific hypervisor, but
- # we are virtual.
- echo virtual
-fi
-
-
-# Fallback
-
-detected_layer physical
diff --git a/cdist/conf/explorer/memory b/cdist/conf/explorer/memory
index c6d113cf..05db865f 100755
--- a/cdist/conf/explorer/memory
+++ b/cdist/conf/explorer/memory
@@ -1,9 +1,7 @@
-#!/bin/sh -e
+#!/bin/sh
#
# 2014 Daniel Heule (hda at sfs.biz)
# 2014 Thomas Oettli (otho at sfs.biz)
-# Copyright 2017, Philippe Gregoire
-# 2020 Dennis Camera
#
# This file is part of cdist.
#
@@ -20,73 +18,19 @@
# You should have received a copy of the GNU General Public License
# along with cdist. If not, see .
#
-# Returns the amount of memory physically installed in the system, or if that
-# cannot be determined the amount available to the operating system kernel,
-# in kibibytes (kiB).
+#
-str2bytes() {
- awk -F' ' '
- $2 == "B" || !$2 { print $1 }
- $2 == "kB" { printf "%.f\n", ($1 * 1000) }
- $2 == "MB" { printf "%.f\n", ($1 * 1000 * 1000) }
- $2 == "GB" { printf "%.f\n", ($1 * 1000 * 1000 * 1000) }
- $2 == "TB" { printf "%.f\n", ($1 * 1000 * 1000 * 1000 * 1000) }
- $2 == "kiB" { printf "%.f\n", ($1 * 1024) }
- $2 == "MiB" { printf "%.f\n", ($1 * 1024 * 1024) }
- $2 == "GiB" { printf "%.f\n", ($1 * 1024 * 1024 * 1024) }
- $2 == "TiB" { printf "%.f\n", ($1 * 1024 * 1024 * 1024 * 1024) }'
-}
+# FIXME: other system types (not linux ...)
-bytes2kib() {
- awk '$0 > 0 { printf "%.f\n", ($0 / 1024) }'
-}
+os=$("$__explorer/os")
+case "$os" in
+ "macosx")
+ echo "$(sysctl -n hw.memsize)/1024" | bc
+ ;;
-
-case $(uname -s)
-in
- (Darwin)
- sysctl -n hw.memsize | bytes2kib
- ;;
- (FreeBSD)
- sysctl -n hw.realmem | bytes2kib
- ;;
- (NetBSD|OpenBSD)
- # NOTE: This reports "usable" memory, not physically installed memory.
- command -p sysctl -n hw.physmem | bytes2kib
- ;;
- (SunOS)
- # Make sure that awk from xpg4 is used for the scripts to work
- export PATH="/usr/xpg4/bin:${PATH}"
- prtconf \
- | awk -F ': ' '
- $1 == "Memory size" { sub(/Megabytes/, "MiB", $2); print $2 }
- /^$/ { exit }' \
- | str2bytes \
- | bytes2kib
- ;;
- (Linux)
- if test -d /sys/devices/system/memory
- then
- # Use memory blocks if the architecture (e.g. x86, PPC64, s390)
- # supports them (they denote physical memory)
- num_mem_blocks=$(cat /sys/devices/system/memory/memory[0-9]*/state | grep -cxF online)
- mem_block_size=$(cat /sys/devices/system/memory/block_size_bytes)
-
- echo $((num_mem_blocks * 0x$mem_block_size)) | bytes2kib && exit
- fi
- if test -r /proc/meminfo
- then
- # Fall back to meminfo file on other architectures (e.g. ARM, MIPS,
- # PowerPC)
- # NOTE: This is "usable" memory, not physically installed memory.
- awk -F ': +' '$1 == "MemTotal" { sub(/B$/, "iB", $2); print $2 }' /proc/meminfo \
- | str2bytes \
- | bytes2kib
- fi
- ;;
- (*)
- printf "Your kernel (%s) is currently not supported by the memory explorer\n" "$(uname -s)" >&2
- printf "Please contribute an implementation for it if you can.\n" >&2
- exit 1
- ;;
+ *)
+ if [ -r /proc/meminfo ]; then
+ grep "MemTotal:" /proc/meminfo | awk '{print $2}'
+ fi
+ ;;
esac
diff --git a/cdist/conf/explorer/os b/cdist/conf/explorer/os
index b9232ee4..053177eb 100755
--- a/cdist/conf/explorer/os
+++ b/cdist/conf/explorer/os
@@ -1,7 +1,6 @@
#!/bin/sh
#
# 2010-2011 Nico Schottelius (nico-cdist at schottelius.org)
-# Copyright 2017, Philippe Gregoire
#
# This file is part of cdist.
#
@@ -40,28 +39,16 @@ if [ -f /etc/cdist-preos ]; then
exit 0
fi
-if [ -d /gnu/store ]; then
- echo guixsd
- exit 0
-fi
-
### Debian and derivatives
if grep -q ^DISTRIB_ID=Ubuntu /etc/lsb-release 2>/dev/null; then
echo ubuntu
exit 0
fi
-# devuan ascii has both devuan_version and debian_version, so we need to check devuan_version first!
-if [ -f /etc/devuan_version ]; then
- echo devuan
- exit 0
-fi
-
if [ -f /etc/debian_version ]; then
echo debian
exit 0
fi
-
###
if [ -f /etc/gentoo-release ]; then
@@ -80,11 +67,6 @@ if [ -f /etc/owl-release ]; then
fi
### Redhat and derivatives
-if grep -q ^Scientific /etc/redhat-release 2>/dev/null; then
- echo scientific
- exit 0
-fi
-
if grep -q ^CentOS /etc/redhat-release 2>/dev/null; then
echo centos
exit 0
@@ -95,11 +77,6 @@ if grep -q ^Fedora /etc/redhat-release 2>/dev/null; then
exit 0
fi
-if grep -q ^Mitel /etc/redhat-release 2>/dev/null; then
- echo mitel
- exit 0
-fi
-
if [ -f /etc/redhat-release ]; then
echo redhat
exit 0
@@ -116,13 +93,6 @@ if [ -f /etc/slackware-version ]; then
exit 0
fi
-# Appliances
-
-if grep -q '^Check Point Gaia' /etc/cp-release 2>/dev/null; then
- echo checkpoint
- exit 0
-fi
-
uname_s="$(uname -s)"
# Assume there is no tr on the client -> do lower case ourselves
@@ -149,19 +119,5 @@ case "$uname_s" in
;;
esac
-if [ -f /etc/os-release ]; then
- # after sles15, suse don't provide an /etc/SuSE-release anymore, but there is almost no difference between sles and opensuse leap, so call it suse
- # shellcheck disable=SC1091
- if (. /etc/os-release && echo "${ID_LIKE}" | grep -q '\(^\|\ \)suse\($\|\ \)')
- then
- echo suse
- exit 0
- fi
- # already lowercase, according to:
- # https://www.freedesktop.org/software/systemd/man/os-release.html
- awk -F= '/^ID=/ { if ($2 ~ /^'"'"'(.*)'"'"'$/ || $2 ~ /^"(.*)"$/) { print substr($2, 2, length($2) - 2) } else { print $2 } }' /etc/os-release
- exit 0
-fi
-
echo "Unknown OS" >&2
exit 1
diff --git a/cdist/conf/explorer/os_release b/cdist/conf/explorer/os_release
deleted file mode 100644
index ec85046f..00000000
--- a/cdist/conf/explorer/os_release
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/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.
-#
-# 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 .
-#
-#
-
-# See os-release(5) and http://0pointer.de/blog/projects/os-release
-
-if test -f /etc/os-release
-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
-elif test -f /etc/cp-release
-then
- # Checkpoint firewall or management (actually linux based)
- cat /etc/cp-release
-fi
-
diff --git a/cdist/conf/explorer/os_version b/cdist/conf/explorer/os_version
index 430200ae..50889429 100755
--- a/cdist/conf/explorer/os_version
+++ b/cdist/conf/explorer/os_version
@@ -1,7 +1,6 @@
-#!/bin/sh -e
+#!/bin/sh
#
# 2010-2011 Nico Schottelius (nico-cdist at schottelius.org)
-# 2020-2021 Dennis Camera (dennis.camera at ssrq-sds-fds.ch)
#
# This file is part of cdist.
#
@@ -18,22 +17,12 @@
# You should have received a copy of the GNU General Public License
# along with cdist. If not, see .
#
+#
# All os variables are lower case
#
+#
-rc_getvar() {
- awk -F= -v varname="$2" '
- function unquote(s) {
- if (s ~ /^".*"$/ || s ~ /^'\''.*'\''$/)
- return substr(s, 2, length(s) - 2)
- else
- return s
- }
- $1 == varname { print unquote(substr($0, index($0, "=") + 1)) }' "$1"
-}
-
-case $("${__explorer:?}/os")
-in
+case "$($__explorer/os)" in
amazon)
cat /etc/system-release
;;
@@ -41,57 +30,8 @@ in
# empty, but well...
cat /etc/arch-release
;;
- checkpoint)
- awk '{version=$NF; printf("%s\n", substr(version, 2))}' /etc/cp-release
- ;;
debian)
- debian_version=$(cat /etc/debian_version)
- case $debian_version
- in
- testing/unstable)
- # previous to Debian 4.0 testing/unstable was used
- # cf. https://metadata.ftp-master.debian.org/changelogs/main/b/base-files/base-files_11_changelog
- echo 3.99
- ;;
- */sid)
- # sid versions don't have a number, so we decode by codename:
- case $(expr "$debian_version" : '\([a-z]\{1,\}\)/')
- in
- trixie) echo 12.99 ;;
- bookworm) echo 11.99 ;;
- bullseye) echo 10.99 ;;
- buster) echo 9.99 ;;
- stretch) echo 8.99 ;;
- jessie) echo 7.99 ;;
- wheezy) echo 6.99 ;;
- squeeze) echo 5.99 ;;
- lenny) echo 4.99 ;;
- *) echo 99.99 ;;
- esac
- ;;
- *)
- echo "$debian_version"
- ;;
- esac
- ;;
- devuan)
- devuan_version=$(cat /etc/devuan_version)
- case ${devuan_version}
- in
- (*/ceres)
- # ceres versions don't have a number, so we decode by codename:
- case ${devuan_version}
- in
- (chimaera/ceres) echo 3.99 ;;
- (beowulf/ceres) echo 2.99 ;;
- (ascii/ceres) echo 1.99 ;;
- (*) exit 1
- esac
- ;;
- (*)
- echo "${devuan_version}"
- ;;
- esac
+ cat /etc/debian_version
;;
fedora)
cat /etc/fedora-release
@@ -100,20 +40,7 @@ in
cat /etc/gentoo-release
;;
macosx)
- # NOTE: Legacy versions (< 10.3) do not support options
- sw_vers | awk -F ':[ \t]+' '$1 == "ProductVersion" { print $2 }'
- ;;
- freebsd)
- # Apparently uname -r is not a reliable way to get the patch level.
- # See: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=251743
- if command -v freebsd-version >/dev/null 2>&1
- then
- # get userland version
- freebsd-version -u
- else
- # fallback to kernel release for FreeBSD < 10.0
- uname -r
- fi
+ sw_vers -productVersion
;;
*bsd|solaris)
uname -r
@@ -124,36 +51,16 @@ in
owl)
cat /etc/owl-release
;;
- redhat|centos|mitel|scientific)
+ redhat|centos)
cat /etc/redhat-release
;;
slackware)
cat /etc/slackware-version
;;
suse)
- if [ -f /etc/os-release ]; then
- cat /etc/os-release
- else
- cat /etc/SuSE-release
- fi
+ cat /etc/SuSE-release
;;
ubuntu)
- if command -v lsb_release >/dev/null 2>&1
- then
- lsb_release -sr
- elif test -r /usr/lib/os-release
- then
- # fallback to /usr/lib/os-release if lsb_release is not present (like
- # on minimized Ubuntu installations)
- rc_getvar /usr/lib/os-release VERSION_ID
- elif test -r /etc/lsb-release
- then
- # extract DISTRIB_RELEASE= variable from /etc/lsb-release on old
- # versions without /usr/lib/os-release.
- rc_getvar /etc/lsb-release DISTRIB_RELEASE
- fi
- ;;
- alpine)
- cat /etc/alpine-release
+ lsb_release -sr
;;
esac
diff --git a/cdist/conf/type/__acl/explorer/acl_is b/cdist/conf/type/__acl/explorer/acl_is
deleted file mode 100755
index a693c023..00000000
--- a/cdist/conf/type/__acl/explorer/acl_is
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh -e
-#
-# 2018 Ander Punnar (ander-at-kvlt-dot-ee)
-#
-# This file is part of cdist.
-#
-# cdist is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# cdist is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with cdist. If not, see .
-#
-
-[ ! -e "/$__object_id" ] && exit 0
-
-if ! command -v getfacl > /dev/null
-then
- echo 'getfacl not available' >&2
- exit 1
-fi
-
-getfacl "/$__object_id" 2>/dev/null \
- | grep -Eo '^(default:)?(user|group|(mask|other):):[^:][[:graph:]]+' \
- || true
diff --git a/cdist/conf/type/__acl/explorer/file_is b/cdist/conf/type/__acl/explorer/file_is
deleted file mode 100755
index 096cffd1..00000000
--- a/cdist/conf/type/__acl/explorer/file_is
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh -e
-#
-# 2018 Ander Punnar (ander-at-kvlt-dot-ee)
-#
-# This file is part of cdist.
-#
-# cdist is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# cdist is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with cdist. If not, see .
-#
-
-if [ -e "/$__object_id" ]
-then
- if [ -d "/$__object_id" ]
- then echo directory
- elif [ -f "/$__object_id" ]
- then echo regular
- else echo other
- fi
-else
- echo missing
-fi
diff --git a/cdist/conf/type/__acl/explorer/getent b/cdist/conf/type/__acl/explorer/getent
deleted file mode 100755
index 7e6c2c30..00000000
--- a/cdist/conf/type/__acl/explorer/getent
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh -e
-
-getent passwd | awk -F: '{print "user:"$1}'
-getent group | awk -F: '{print "group:"$1}'
diff --git a/cdist/conf/type/__acl/gencode-remote b/cdist/conf/type/__acl/gencode-remote
deleted file mode 100755
index 32318e91..00000000
--- a/cdist/conf/type/__acl/gencode-remote
+++ /dev/null
@@ -1,143 +0,0 @@
-#!/bin/sh -e
-#
-# 2018 Ander Punnar (ander-at-kvlt-dot-ee)
-#
-# This file is part of cdist.
-#
-# cdist is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# cdist is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with cdist. If not, see .
-#
-
-file_is="$( cat "$__object/explorer/file_is" )"
-
-if [ "$file_is" = 'missing' ] \
- && [ -z "$__cdist_dry_run" ] \
- && [ ! -f "$__object/parameter/file" ] \
- && [ ! -f "$__object/parameter/directory" ]
-then
- exit 0
-fi
-
-os="$( cat "$__global/explorer/os" )"
-
-acl_path="/$__object_id"
-
-acl_is="$( cat "$__object/explorer/acl_is" )"
-
-if [ -f "$__object/parameter/source" ]
-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" )"
-else
- echo 'no parameters set' >&2
- exit 1
-fi
-
-# instead of setfacl's non-helpful message "Option -m: Invalid argument near character X"
-# let's check if target has necessary users and groups, since mistyped or missing
-# users/groups in target is most common reason.
-echo "$acl_should" \
- | grep -Po '(user|group):[^:]+' \
- | sort -u \
- | while read -r l
- do
- if ! grep "$l" -Fxq "$__object/explorer/getent"
- then
- echo "no $l' in target" | sed "s/:/ '/" >&2
- exit 1
- fi
- done
-
-if [ -f "$__object/parameter/default" ]
-then
- acl_should="$( echo "$acl_should" \
- | sed 's/^default://' \
- | sort -u \
- | sed 's/\(.*\)/default:\1\n\1/' )"
-fi
-
-if [ "$file_is" = 'regular' ] \
- && echo "$acl_should" | grep -Eq '^default:'
-then
- # only directories can have default ACLs,
- # but instead of error,
- # let's just remove default entries
- acl_should="$( echo "$acl_should" | grep -Ev '^default:' )"
-fi
-
-if echo "$acl_should" | awk -F: '{ print $NF }' | grep -Fq 'X'
-then
- [ "$file_is" = 'directory' ] && rep=x || rep=-
-
- acl_should="$( echo "$acl_should" | sed "s/\\(.*\\)X/\\1$rep/" )"
-fi
-
-setfacl_exec='setfacl'
-
-if [ -f "$__object/parameter/recursive" ]
-then
- if echo "$os" | grep -Fq 'freebsd'
- then
- echo "$os setfacl do not support recursive operations" >&2
- else
- setfacl_exec="$setfacl_exec -R"
- fi
-fi
-
-if [ -f "$__object/parameter/remove" ]
-then
- echo "$acl_is" | while read -r acl
- do
- # skip wanted ACL entries which already exist
- # and skip mask and other entries, because we
- # can't actually remove them, but only change.
- if echo "$acl_should" | grep -Eq "^$acl" \
- || echo "$acl" | grep -Eq '^(default:)?(mask|other)'
- then continue
- fi
-
- if echo "$os" | grep -Fq 'freebsd'
- then
- remove="$acl"
- else
- remove="$( echo "$acl" | sed 's/:...$//' )"
- fi
-
- echo "$setfacl_exec -x \"$remove\" \"$acl_path\""
- echo "removed '$remove'" >> "$__messages_out"
- done
-fi
-
-for acl in $acl_should
-do
- if ! echo "$acl_is" | grep -Eq "^$acl"
- then
- if echo "$os" | grep -Fq 'freebsd' \
- && echo "$acl" | grep -Eq '^default:'
- then
- echo "setting default ACL in $os is currently not supported" >&2
- else
- echo "$setfacl_exec -m \"$acl\" \"$acl_path\""
- echo "added '$acl'" >> "$__messages_out"
- fi
- fi
-done
diff --git a/cdist/conf/type/__acl/man.rst b/cdist/conf/type/__acl/man.rst
deleted file mode 100644
index 307be72b..00000000
--- a/cdist/conf/type/__acl/man.rst
+++ /dev/null
@@ -1,108 +0,0 @@
-cdist-type__acl(7)
-==================
-
-NAME
-----
-cdist-type__acl - Set ACL entries
-
-
-DESCRIPTION
------------
-Fully supported and tested on Linux (ext4 filesystem), partial support for FreeBSD.
-
-See ``setfacl`` and ``acl`` manpages for more details.
-
-One of ``--entry`` or ``--source`` must be used.
-
-
-OPTIONAL MULTIPLE PARAMETERS
-----------------------------
-entry
- Set ACL entry following ``getfacl`` output syntax.
- Must be used if ``--source`` is not used.
-
-
-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.
- Must be used if ``--entry`` is not used.
-
-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
- Set all ACL entries as default too.
- Only directories can have default ACLs.
- Setting default ACL in FreeBSD is currently not supported.
-
-recursive
- Make ``setfacl`` recursive (Linux only), but not ``getfacl`` in explorer.
-
-remove
- Remove undefined ACL entries.
- ``mask`` and ``other`` entries can't be removed, but only changed.
-
-
-EXAMPLES
---------
-
-.. code-block:: sh
-
- __acl /srv/project \
- --default \
- --recursive \
- --remove \
- --entry user:alice:rwx \
- --entry user:bob:r-x \
- --entry group:project-group:rwx \
- --entry group:some-other-group:r-x \
- --entry mask::r-x \
- --entry other::r-x
-
- # give Alice read-only access to subdir,
- # but don't allow her to see parent content.
-
- __acl /srv/project2 \
- --remove \
- --entry default:group:secret-project:rwx \
- --entry group:secret-project:rwx \
- --entry user:alice:--x
-
- __acl /srv/project2/subdir \
- --default \
- --remove \
- --entry group:secret-project:rwx \
- --entry user:alice:r-x
-
- # 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
--------
-Ander Punnar
-
-
-COPYING
--------
-Copyright \(C) 2018 Ander Punnar. You can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
diff --git a/cdist/conf/type/__acl/manifest b/cdist/conf/type/__acl/manifest
deleted file mode 100755
index 5fd23110..00000000
--- a/cdist/conf/type/__acl/manifest
+++ /dev/null
@@ -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
diff --git a/cdist/conf/type/__acl/parameter/boolean b/cdist/conf/type/__acl/parameter/boolean
deleted file mode 100644
index 8b96693f..00000000
--- a/cdist/conf/type/__acl/parameter/boolean
+++ /dev/null
@@ -1,3 +0,0 @@
-recursive
-default
-remove
diff --git a/cdist/conf/type/__acl/parameter/optional b/cdist/conf/type/__acl/parameter/optional
deleted file mode 100644
index 5a0c29a3..00000000
--- a/cdist/conf/type/__acl/parameter/optional
+++ /dev/null
@@ -1,3 +0,0 @@
-source
-file
-directory
diff --git a/cdist/conf/type/__acl/parameter/optional_multiple b/cdist/conf/type/__acl/parameter/optional_multiple
deleted file mode 100644
index 4c884f03..00000000
--- a/cdist/conf/type/__acl/parameter/optional_multiple
+++ /dev/null
@@ -1 +0,0 @@
-entry
diff --git a/cdist/conf/type/__apt_backports/man.rst b/cdist/conf/type/__apt_backports/man.rst
deleted file mode 100644
index 7036fb84..00000000
--- a/cdist/conf/type/__apt_backports/man.rst
+++ /dev/null
@@ -1,104 +0,0 @@
-cdist-type__debian_backports(7)
-===============================
-
-NAME
-----
-cdist-type__apt_backports - Install backports
-
-
-DESCRIPTION
------------
-This singleton type installs backports for the current OS release.
-It aborts if backports are not supported for the specified OS or
-no version codename could be fetched (like Debian unstable).
-
-The package index will be automatically updated if required.
-
-It supports backports from following OSes:
-
-- Debian
-- Devuan
-- Ubuntu
-
-
-REQUIRED PARAMETERS
--------------------
-None.
-
-
-OPTIONAL PARAMETERS
--------------------
-state
- Represents the state of the backports repository. ``present`` or
- ``absent``, defaults to ``present``.
-
- Will be directly passed to :strong:`cdist-type__apt_source`\ (7).
-
-mirror
- The mirror to fetch the backports from. Will defaults to the generic
- mirror of the current OS.
-
- Will be directly passed to :strong:`cdist-type__apt_source`\ (7).
-
-
-BOOLEAN PARAMETERS
-------------------
-None.
-
-
-MESSAGES
---------
-None.
-
-
-EXAMPLES
---------
-
-.. code-block:: sh
-
- # setup the backports
- __apt_backports
- __apt_backports --state absent
- __apt_backports --state present --mirror "http://ftp.de.debian.org/debian/"
-
- # install a backports package
- # currently for the buster release backports
- require="__apt_backports" __package_apt wireguard \
- --target-release buster-backports
-
-
-ABORTS
-------
-Aborts if the detected os is not Debian.
-
-Aborts if no distribuition codename could be detected. This is common for the
-unstable distribution, but there is no backports repository for it already.
-
-
-CAVEATS
--------
-For Ubuntu, it setup all componenents for the backports repository: ``main``,
-``restricted``, ``universe`` and ``multiverse``. The user may not want to
-install proprietary packages, which will only be installed if the user
-explicitly uses the backports target-release. The user may change this behavior
-to install backports packages without the need of explicitly select it.
-
-
-SEE ALSO
---------
-`Official Debian Backports site `_
-
-:strong:`cdist-type__apt_source`\ (7)
-
-
-AUTHORS
--------
-Matthias Stecher
-
-
-COPYING
--------
-Copyright \(C) 2020 Matthias Stecher. 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.
diff --git a/cdist/conf/type/__apt_backports/manifest b/cdist/conf/type/__apt_backports/manifest
deleted file mode 100755
index 6fcd9212..00000000
--- a/cdist/conf/type/__apt_backports/manifest
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/bin/sh -e
-# __apt_backports/manifest
-#
-# 2020 Matthias Stecher (matthiasstecher at gmx.de)
-#
-# 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 .
-#
-#
-# Enables/disables backports repository. Utilises __apt_source for it.
-#
-
-
-# Get the distribution codename by /etc/os-release.
-# is already executed in a subshell by string substitution
-# lsb_release may not be given in all installations
-codename_os_release() {
- # shellcheck disable=SC1090
- # shellcheck disable=SC1091
- . "$__global/explorer/os_release"
- printf "%s" "$VERSION_CODENAME"
-}
-
-# detect backport distribution
-os="$(cat "$__global/explorer/os")"
-case "$os" in
- debian)
- dist="$( codename_os_release )"
- components="main"
- mirror="http://deb.debian.org/debian/"
- ;;
- devuan)
- dist="$( codename_os_release )"
- components="main"
- mirror="http://deb.devuan.org/merged"
- ;;
- ubuntu)
- dist="$( codename_os_release )"
- components="main restricted universe multiverse"
- mirror="http://archive.ubuntu.com/ubuntu"
- ;;
-
- *)
- printf "Backports for %s are not supported!\n" "$os" >&2
- exit 1
- ;;
-esac
-
-# error if no codename given (e.g. on Debian unstable)
-if [ -z "$dist" ]; then
- printf "No backports for unkown version of distribution %s!\n" "$os" >&2
- exit 1
-fi
-
-
-# parameters
-state="$(cat "$__object/parameter/state")"
-
-# mirror already set for the os, only override user-values
-if [ -f "$__object/parameter/mirror" ]; then
- mirror="$(cat "$__object/parameter/mirror")"
-fi
-
-
-# install the given backports repository
-__apt_source "${dist}-backports" \
- --state "$state" \
- --distribution "${dist}-backports" \
- --component "$components" \
- --uri "$mirror"
diff --git a/cdist/conf/type/__apt_backports/parameter/default/state b/cdist/conf/type/__apt_backports/parameter/default/state
deleted file mode 100644
index e7f6134f..00000000
--- a/cdist/conf/type/__apt_backports/parameter/default/state
+++ /dev/null
@@ -1 +0,0 @@
-present
diff --git a/cdist/conf/type/__apt_backports/parameter/optional b/cdist/conf/type/__apt_backports/parameter/optional
deleted file mode 100644
index 4b05c235..00000000
--- a/cdist/conf/type/__apt_backports/parameter/optional
+++ /dev/null
@@ -1,2 +0,0 @@
-state
-mirror
diff --git a/cdist/conf/type/__apt_default_release/man.rst b/cdist/conf/type/__apt_default_release/man.rst
deleted file mode 100644
index 0277a06f..00000000
--- a/cdist/conf/type/__apt_default_release/man.rst
+++ /dev/null
@@ -1,46 +0,0 @@
-cdist-type__apt_default_release(7)
-==================================
-
-NAME
-----
-cdist-type__apt_default_release - Configure the default release for apt
-
-
-DESCRIPTION
------------
-Configure the default release for apt, using the APT::Default-Release
-configuration value.
-
-REQUIRED PARAMETERS
--------------------
-release
- The value to set APT::Default-Release to.
-
- This can contain release name, codename or release version. Examples:
- 'stable', 'testing', 'unstable', 'stretch', 'buster', '4.0', '5.0*'.
-
-
-OPTIONAL PARAMETERS
--------------------
-None.
-
-
-EXAMPLES
---------
-
-.. code-block:: sh
-
- __apt_default_release --release stretch
-
-
-AUTHORS
--------
-Matthijs Kooijman
-
-
-COPYING
--------
-Copyright \(C) 2017 Matthijs Kooijman. You can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
diff --git a/cdist/conf/type/__apt_default_release/manifest b/cdist/conf/type/__apt_default_release/manifest
deleted file mode 100755
index 1232efb5..00000000
--- a/cdist/conf/type/__apt_default_release/manifest
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh -e
-#
-# 2014 Steven Armstrong (steven-cdist at armstrong.cc)
-# 2017 Matthijs Kooijman (matthijs at stdin.nl)
-#
-# This file is part of cdist.
-#
-# cdist is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# cdist is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with cdist. If not, see .
-#
-
-
-os=$(cat "$__global/explorer/os")
-release="$(cat "$__object/parameter/release")"
-
-case "$os" in
- ubuntu|debian|devuan)
- __file /etc/apt/apt.conf.d/99-default-release \
- --owner root --group root --mode 644 \
- --source - << DONE
-APT::Default-Release "$release";
-DONE
- ;;
- *)
- cat >&2 << DONE
-The developer of this type (${__type##*/}) did not think your operating system
-($os) would have any use for it. If you think otherwise please submit a patch.
-DONE
- exit 1
- ;;
-esac
diff --git a/cdist/conf/type/__apt_default_release/parameter/required b/cdist/conf/type/__apt_default_release/parameter/required
deleted file mode 100644
index d7025695..00000000
--- a/cdist/conf/type/__apt_default_release/parameter/required
+++ /dev/null
@@ -1 +0,0 @@
-release
diff --git a/cdist/conf/type/__apt_default_release/singleton b/cdist/conf/type/__apt_default_release/singleton
deleted file mode 100644
index e69de29b..00000000
diff --git a/cdist/conf/type/__apt_key/explorer/state b/cdist/conf/type/__apt_key/explorer/state
index 8ab268c1..f7940741 100755
--- a/cdist/conf/type/__apt_key/explorer/state
+++ b/cdist/conf/type/__apt_key/explorer/state
@@ -27,25 +27,6 @@ else
keyid="$__object_id"
fi
-# From apt-key(8):
-# Use of apt-key is deprecated, except for the use of apt-key del in
-# maintainer scripts to remove existing keys from the main keyring.
-# If such usage of apt-key is desired the additional installation of
-# the GNU Privacy Guard suite (packaged in gnupg) is required.
-if [ -f "${__object}/parameter/use-deprecated-apt-key" ]; then
- if apt-key export "$keyid" | head -n 1 | grep -Fqe "BEGIN PGP PUBLIC KEY BLOCK"
- then echo present
- else echo absent
- fi
- exit
-fi
-
-keydir="$(cat "$__object/parameter/keydir")"
-keyfile="$keydir/$__object_id.gpg"
-
-if [ -f "$keyfile" ]
-then
- echo present
- exit
-fi
-echo absent
+apt-key export "$keyid" | head -n 1 | grep -Fqe "BEGIN PGP PUBLIC KEY BLOCK" \
+ && echo present \
+ || echo absent
diff --git a/cdist/conf/type/__apt_key/gencode-remote b/cdist/conf/type/__apt_key/gencode-remote
index 17dc9bfc..c6ead91c 100755
--- a/cdist/conf/type/__apt_key/gencode-remote
+++ b/cdist/conf/type/__apt_key/gencode-remote
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/sh
#
# 2011-2014 Steven Armstrong (steven-cdist at armstrong.cc)
#
@@ -25,75 +25,18 @@ else
fi
state_should="$(cat "$__object/parameter/state")"
state_is="$(cat "$__object/explorer/state")"
-method="$(cat "$__object/key_method")"
-keydir="$(cat "$__object/parameter/keydir")"
-keyfile="$keydir/$__object_id.gpg"
+if [ "$state_should" = "$state_is" ]; then
+ # nothing to do
+ exit 0
+fi
case "$state_should" in
present)
keyserver="$(cat "$__object/parameter/keyserver")"
- # Using __download or __file as key source
- # Propagate messages if needed
- if [ "${method}" = "uri" ] || [ "${method}" = "source" ]; then
- if grep -Eq "^__(file|download)$keyfile" "$__messages_in"; then
- echo "added '$keyid'" >> "$__messages_out"
- fi
- exit 0
- elif [ "${state_is}" = "present" ]; then
- exit 0
- fi
- # Using key servers to fetch the key
- if [ ! -f "$__object/parameter/use-deprecated-apt-key" ]; then
- # we need to kill gpg after 30 seconds, because gpg
- # can get stuck if keyserver is not responding.
- # exporting env var and not exit 1,
- # because we need to clean up and kill dirmngr.
- cat << EOF
-
-gpgtmphome="\$( mktemp -d )"
-
-if timeout 30s \\
- gpg --homedir "\$gpgtmphome" \\
- --keyserver "$keyserver" \\
- --recv-keys "$keyid"
-then
- gpg --homedir "\$gpgtmphome" \\
- --export "$keyid" \\
- > "$keyfile"
-else
- export GPG_GOT_STUCK=1
-fi
-
-GNUPGHOME="\$gpgtmphome" gpgconf --kill dirmngr
-
-rm -rf "\$gpgtmphome"
-
-if [ -n "\$GPG_GOT_STUCK" ]
-then
- echo "GPG GOT STUCK - no response from keyserver after 30 seconds" >&2
- exit 1
-fi
-
-EOF
- else
- # fallback to deprecated apt-key
- echo "apt-key adv --keyserver \"$keyserver\" --recv-keys \"$keyid\""
- fi
-
- echo "added '$keyid'" >> "$__messages_out"
+ echo "apt-key adv --keyserver \"$keyserver\" --recv-keys \"$keyid\""
;;
absent)
- # Removal for keys added from a keyserver without this flag
- # is done in the manifest
- if [ "$state_is" != "absent" ] && \
- [ -f "$__object/parameter/use-deprecated-apt-key" ]; then
- # fallback to deprecated apt-key
- echo "apt-key del \"$keyid\""
- echo "removed '$keyid'" >> "$__messages_out"
- # Propagate messages if needed
- elif grep -Eq "^__file$keyfile" "$__messages_in"; then
- echo "removed '$keyid'" >> "$__messages_out"
- fi
+ echo "apt-key del \"$keyid\""
;;
esac
diff --git a/cdist/conf/type/__apt_key/man.rst b/cdist/conf/type/__apt_key/man.rst
deleted file mode 100644
index e35eaa0f..00000000
--- a/cdist/conf/type/__apt_key/man.rst
+++ /dev/null
@@ -1,114 +0,0 @@
-cdist-type__apt_key(7)
-======================
-
-NAME
-----
-cdist-type__apt_key - Manage the list of keys used by apt
-
-
-DESCRIPTION
------------
-Manages the list of keys used by apt to authenticate packages.
-
-This is done by placing the requested key in a file named
-``$__object_id.gpg`` in the ``keydir`` directory.
-
-This is supported by modern releases of Debian-based distributions.
-
-In order of preference, exactly one of: ``source``, ``uri`` or ``keyid``
-must be specified.
-
-
-REQUIRED PARAMETERS
--------------------
-None.
-
-
-OPTIONAL PARAMETERS
--------------------
-keydir
- keyring directory, defaults to ``/etc/apt/trusted.pgp.d``, which is
- enabled system-wide by default.
-
-source
- path to a file containing the GPG key of the repository.
- Using this is recommended as it ensures that the manifest/type manintainer
- has validated the key.
- If ``-``, the GPG key is read from the type's stdin.
-
-state
- 'present' or 'absent'. Defaults to 'present'
-
-uri
- the URI from which to download the key.
- It is highly recommended that you only use protocols with TLS like HTTPS.
- This uses ``__download`` but does not use checksums, if you want to ensure
- that the key doesn't change, you are better off downloading it and using
- ``--source``.
-
-
-DEPRECATED OPTIONAL PARAMETERS
-------------------------------
-keyid
- the id of the key to download from the ``keyserver``.
- This is to be used in absence of ``--source`` and ``--uri`` or together
- with ``--use-deprecated-apt-key`` for key removal.
- Defaults to ``$__object_id``.
-
-keyserver
- the keyserver from which to fetch the key.
- Defaults to ``pool.sks-keyservers.net``.
-
-
-DEPRECATED BOOLEAN PARAMETERS
------------------------------
-use-deprecated-apt-key
- ``apt-key(8)`` will last be available in Debian 11 and Ubuntu 22.04.
- You can use this parameter to force usage of ``apt-key(8)``.
- Please only use this parameter to *remove* keys from the keyring,
- in order to prepare for removal of ``apt-key``.
- Adding keys should be done without this parameter.
- This parameter will be removed when Debian 11 stops being supported.
-
-
-EXAMPLES
---------
-
-.. code-block:: sh
-
- # add a key that has been verified by a type maintainer
- __apt_key jitsi_meet_2021 \
- --source cdist-contrib/type/__jitsi_meet/files/apt_2021.gpg
-
- # remove an old, deprecated or expired key
- __apt_key jitsi_meet_2016 --state absent
-
- # Get rid of a key that might have been added to
- # /etc/apt/trusted.gpg with apt-key
- __apt_key 0x40976EAF437D05B5 --use-deprecated-apt-key --state absent
-
- # add a key that we define in-line
- __apt_key jitsi_meet_2021 --source '-' <
-Ander Punnar
-Evilham
-
-
-COPYING
--------
-Copyright \(C) 2011-2021 Steven Armstrong, Ander Punnar and Evilham. 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.
diff --git a/cdist/conf/type/__apt_key/man.text b/cdist/conf/type/__apt_key/man.text
new file mode 100644
index 00000000..1a33e732
--- /dev/null
+++ b/cdist/conf/type/__apt_key/man.text
@@ -0,0 +1,61 @@
+cdist-type__apt_key(7)
+======================
+Steven Armstrong
+
+
+NAME
+----
+cdist-type__apt_key - manage the list of keys used by apt
+
+
+DESCRIPTION
+-----------
+Manages the list of keys used by apt to authenticate packages.
+
+
+REQUIRED PARAMETERS
+-------------------
+None.
+
+
+OPTIONAL PARAMETERS
+-------------------
+state::
+ 'present' or 'absent'. Defaults to 'present'
+
+keyid::
+ the id of the key to add. Defaults to __object_id
+
+keyserver::
+ the keyserver from which to fetch the key. If omitted the default set in
+ ./parameter/default/keyserver is used.
+
+
+EXAMPLES
+--------
+
+--------------------------------------------------------------------------------
+# Add Ubuntu Archive Automatic Signing Key
+__apt_key 437D05B5
+# Same thing
+__apt_key 437D05B5 --state present
+# Get rid of it
+__apt_key 437D05B5 --state absent
+
+# same thing with human readable name and explicit keyid
+__apt_key UbuntuArchiveKey --keyid 437D05B5
+
+# same thing with other keyserver
+__apt_key UbuntuArchiveKey --keyid 437D05B5 --keyserver keyserver.ubuntu.com
+--------------------------------------------------------------------------------
+
+
+SEE ALSO
+--------
+- cdist-type(7)
+
+
+COPYING
+-------
+Copyright \(C) 2011-2014 Steven Armstrong. Free use of this software is
+granted under the terms of the GNU General Public License version 3 (GPLv3).
diff --git a/cdist/conf/type/__apt_key/manifest b/cdist/conf/type/__apt_key/manifest
deleted file mode 100755
index 889a764a..00000000
--- a/cdist/conf/type/__apt_key/manifest
+++ /dev/null
@@ -1,106 +0,0 @@
-#!/bin/sh -e
-
-__package gnupg
-
-state_should="$(cat "${__object}/parameter/state")"
-
-incompatible_args()
-{
- cat >> /dev/stderr <<-EOF
- This type does not support --${1} and --${method} simultaneously.
- EOF
- exit 1
-}
-
-if [ -f "${__object}/parameter/source" ]; then
- method="source"
- src="$(cat "${__object}/parameter/source")"
- if [ "${src}" = "-" ]; then
- src="${__object}/stdin"
- fi
-fi
-if [ -f "${__object}/parameter/uri" ]; then
- if [ -n "${method}" ]; then
- incompatible_args uri
- fi
- method="uri"
- src="$(cat "${__object}/parameter/uri")"
-fi
-if [ -f "${__object}/parameter/keyid" ]; then
- if [ -n "${method}" ]; then
- incompatible_args keyid
- fi
- method="keyid"
-fi
-# Keep old default
-if [ -z "${method}" ]; then
- method="keyid"
-fi
-# Save this for later in gencode-remote
-echo "${method}" > "${__object}/key_method"
-
-# Required remotely (most likely already installed)
-__package dirmngr
-# We need this in case a key has to be dearmor'd
-__package gnupg
-export require="__package/gnupg"
-
-if [ -f "${__object}/parameter/use-deprecated-apt-key" ]; then
- # This is required if apt-key(8) is to be used
- if [ "${method}" = "source" ] || [ "${method}" = "uri" ]; then
- incompatible_args use-deprecated-apt-key
- fi
-else
- if [ "${state_should}" = "absent" ] && \
- [ -f "${__object}/parameter/keyid" ]; then
- cat >> /dev/stderr < /dev/null | grep -Fqe "$name" \
+apt-key list | grep -Fqe "$name" \
&& echo present \
|| echo absent
diff --git a/cdist/conf/type/__apt_key_uri/gencode-remote b/cdist/conf/type/__apt_key_uri/gencode-remote
index 229b6564..078b8695 100755
--- a/cdist/conf/type/__apt_key_uri/gencode-remote
+++ b/cdist/conf/type/__apt_key_uri/gencode-remote
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/sh
#
# 2011-2014 Steven Armstrong (steven-cdist at armstrong.cc)
#
diff --git a/cdist/conf/type/__apt_key_uri/man.rst b/cdist/conf/type/__apt_key_uri/man.rst
deleted file mode 100644
index 82a191b9..00000000
--- a/cdist/conf/type/__apt_key_uri/man.rst
+++ /dev/null
@@ -1,51 +0,0 @@
-cdist-type__apt_key_uri(7)
-==========================
-
-NAME
-----
-cdist-type__apt_key_uri - Add apt key from uri
-
-
-DESCRIPTION
------------
-Download a key from an uri and add it to the apt keyring.
-
-
-REQUIRED PARAMETERS
--------------------
-uri
- the uri from which to download the key
-
-
-OPTIONAL PARAMETERS
--------------------
-state
- 'present' or 'absent', defaults to 'present'
-
-name
- a name for this key, used when testing if it is already installed.
- Defaults to __object_id
-
-
-EXAMPLES
---------
-
-.. code-block:: sh
-
- __apt_key_uri rabbitmq \
- --name 'RabbitMQ Release Signing Key ' \
- --uri http://www.rabbitmq.com/rabbitmq-signing-key-public.asc \
- --state present
-
-
-AUTHORS
--------
-Steven Armstrong
-
-
-COPYING
--------
-Copyright \(C) 2011-2014 Steven Armstrong. You can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
diff --git a/cdist/conf/type/__apt_key_uri/man.text b/cdist/conf/type/__apt_key_uri/man.text
new file mode 100644
index 00000000..fe9c3a25
--- /dev/null
+++ b/cdist/conf/type/__apt_key_uri/man.text
@@ -0,0 +1,51 @@
+cdist-type__apt_key_uri(7)
+==========================
+Steven Armstrong
+
+
+NAME
+----
+cdist-type__apt_key_uri - add apt key from uri
+
+
+DESCRIPTION
+-----------
+Download a key from an uri and add it to the apt keyring.
+
+
+REQUIRED PARAMETERS
+-------------------
+uri::
+ the uri from which to download the key
+
+
+OPTIONAL PARAMETERS
+-------------------
+state::
+ 'present' or 'absent', defaults to 'present'
+
+name::
+ a name for this key, used when testing if it is already installed.
+ Defaults to __object_id
+
+
+EXAMPLES
+--------
+
+--------------------------------------------------------------------------------
+__apt_key_uri rabbitmq \
+ --name 'RabbitMQ Release Signing Key ' \
+ --uri http://www.rabbitmq.com/rabbitmq-signing-key-public.asc \
+ --state present
+--------------------------------------------------------------------------------
+
+
+SEE ALSO
+--------
+- cdist-type(7)
+
+
+COPYING
+-------
+Copyright \(C) 2011-2014 Steven Armstrong. Free use of this software is
+granted under the terms of the GNU General Public License version 3 (GPLv3).
diff --git a/cdist/conf/type/__apt_key_uri/manifest b/cdist/conf/type/__apt_key_uri/manifest
index bf7b267d..8dddde56 100755
--- a/cdist/conf/type/__apt_key_uri/manifest
+++ b/cdist/conf/type/__apt_key_uri/manifest
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/sh
#
# 2013-2014 Steven Armstrong (steven-cdist at armstrong.cc)
#
diff --git a/cdist/conf/type/__apt_mark/explorer/apt_version b/cdist/conf/type/__apt_mark/explorer/apt_version
deleted file mode 100755
index 7bb90cc2..00000000
--- a/cdist/conf/type/__apt_mark/explorer/apt_version
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh -e
-#
-# 2016 Ander Punnar (cdist at kvlt.ee)
-#
-# This file is part of cdist.
-#
-# cdist is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# cdist is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with cdist. If not, see .
-#
-
-apt_version_is=$(dpkg-query --show --showformat '${Version}' apt)
-
-# from APT changelog:
-# apt (0.8.14.2) UNRELEASED; urgency=low
-# provide a 'dpkg --set-selections' wrapper to set/release holds
-
-apt_version_should=0.8.14.2
-
-dpkg --compare-versions "$apt_version_should" le "$apt_version_is" \
- && echo 0 \
- || echo 1
diff --git a/cdist/conf/type/__apt_mark/explorer/package_installed b/cdist/conf/type/__apt_mark/explorer/package_installed
deleted file mode 100755
index 0b072cbc..00000000
--- a/cdist/conf/type/__apt_mark/explorer/package_installed
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh -e
-#
-# 2016 Ander Punnar (cdist at kvlt.ee)
-#
-# This file is part of cdist.
-#
-# cdist is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# cdist is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with cdist. If not, see .
-#
-
-if [ -f "$__object/parameter/name" ]; then
- name="$(cat "$__object/parameter/name")"
-else
- name="$__object_id"
-fi
-
-dpkg-query --show --showformat '${Status}' "$name" 2>/dev/null \
- | grep -Fq 'ok installed' \
- && echo 0 \
- || echo 1
diff --git a/cdist/conf/type/__apt_mark/explorer/state b/cdist/conf/type/__apt_mark/explorer/state
deleted file mode 100755
index b7fe08fa..00000000
--- a/cdist/conf/type/__apt_mark/explorer/state
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh -e
-#
-# 2016 Ander Punnar (cdist at kvlt.ee)
-#
-# This file is part of cdist.
-#
-# cdist is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# cdist is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with cdist. If not, see .
-#
-
-if [ -f "$__object/parameter/name" ]; then
- name="$(cat "$__object/parameter/name")"
-else
- name="$__object_id"
-fi
-
-apt-mark showhold | grep -Fq "$name" && echo hold || echo unhold
diff --git a/cdist/conf/type/__apt_mark/gencode-remote b/cdist/conf/type/__apt_mark/gencode-remote
deleted file mode 100755
index bc995444..00000000
--- a/cdist/conf/type/__apt_mark/gencode-remote
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/bin/sh -e
-#
-# 2016 Ander Punnar (cdist at kvlt.ee)
-#
-# This file is part of cdist.
-#
-# cdist is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# cdist is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with cdist. If not, see .
-#
-
-if [ -f "$__object/parameter/name" ]; then
- name="$(cat "$__object/parameter/name")"
-else
- name="$__object_id"
-fi
-
-apt_version="$(cat "$__object/explorer/apt_version")"
-
-if [ "$apt_version" != '0' ]; then
- echo 'APT version not supported' >&2
- exit 1
-fi
-
-package_installed="$(cat "$__object/explorer/package_installed")"
-
-if [ "$package_installed" != '0' ]; then
- exit 0
-fi
-
-state_should="$(cat "$__object/parameter/state")"
-
-state_is="$(cat "$__object/explorer/state")"
-
-if [ "$state_should" = "$state_is" ]; then
- exit 0
-fi
-
-case "$state_should" in
- hold|unhold)
- echo "apt-mark $state_should $name > /dev/null"
- ;;
- *)
- echo "Unknown state: $state_should" >&2
- exit 1
- ;;
-esac
diff --git a/cdist/conf/type/__apt_mark/man.rst b/cdist/conf/type/__apt_mark/man.rst
deleted file mode 100644
index 7aa2a519..00000000
--- a/cdist/conf/type/__apt_mark/man.rst
+++ /dev/null
@@ -1,47 +0,0 @@
-cdist-type__apt_mark(7)
-=======================
-
-NAME
-----
-cdist-type__apt_mark - set package state as 'hold' or 'unhold'
-
-
-DESCRIPTION
------------
-See apt-mark(8) for details.
-
-
-REQUIRED PARAMETERS
--------------------
-state
- Either "hold" or "unhold".
-
-
-OPTIONAL PARAMETERS
--------------------
-name
- If supplied, use the name and not the object id as the package name.
-
-
-EXAMPLES
---------
-
-.. code-block:: sh
-
- # hold package
- __apt_mark quagga --state hold
- # unhold package
- __apt_mark quagga --state unhold
-
-
-AUTHORS
--------
-Ander Punnar
-
-
-COPYING
--------
-Copyright \(C) 2016 Ander Punnar. You can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
diff --git a/cdist/conf/type/__apt_mark/parameter/optional b/cdist/conf/type/__apt_mark/parameter/optional
deleted file mode 100644
index f121bdbf..00000000
--- a/cdist/conf/type/__apt_mark/parameter/optional
+++ /dev/null
@@ -1 +0,0 @@
-name
diff --git a/cdist/conf/type/__apt_mark/parameter/required b/cdist/conf/type/__apt_mark/parameter/required
deleted file mode 100644
index ff72b5c7..00000000
--- a/cdist/conf/type/__apt_mark/parameter/required
+++ /dev/null
@@ -1 +0,0 @@
-state
diff --git a/cdist/conf/type/__apt_norecommends/man.rst b/cdist/conf/type/__apt_norecommends/man.rst
deleted file mode 100644
index 9297b518..00000000
--- a/cdist/conf/type/__apt_norecommends/man.rst
+++ /dev/null
@@ -1,43 +0,0 @@
-cdist-type__apt_norecommends(7)
-===============================
-
-NAME
-----
-cdist-type__apt_norecommends - Configure apt to not install recommended packages
-
-
-DESCRIPTION
------------
-Configure apt to not install any recommended or suggested packages.
-
-
-REQUIRED PARAMETERS
--------------------
-None.
-
-
-OPTIONAL PARAMETERS
--------------------
-None.
-
-
-EXAMPLES
---------
-
-.. code-block:: sh
-
- __apt_norecommends
-
-
-AUTHORS
--------
-Steven Armstrong
-Dennis Camera
-
-
-COPYING
--------
-Copyright \(C) 2014 Steven Armstrong, 2020 Dennis Camera.
-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.
diff --git a/cdist/conf/type/__apt_norecommends/man.text b/cdist/conf/type/__apt_norecommends/man.text
new file mode 100644
index 00000000..3b65e72f
--- /dev/null
+++ b/cdist/conf/type/__apt_norecommends/man.text
@@ -0,0 +1,42 @@
+cdist-type__apt_norecommends(7)
+===============================
+Steven Armstrong
+
+
+NAME
+----
+cdist-type__apt_norecommends - configure apt to not install recommended packages
+
+
+DESCRIPTION
+-----------
+Configure apt to not install any recommended or suggested packages.
+
+
+REQUIRED PARAMETERS
+-------------------
+None.
+
+
+OPTIONAL PARAMETERS
+-------------------
+None.
+
+
+EXAMPLES
+--------
+
+--------------------------------------------------------------------------------
+__apt_norecommends
+--------------------------------------------------------------------------------
+
+
+SEE ALSO
+--------
+- cdist-type(7)
+
+
+COPYING
+-------
+Copyright \(C) 2014 Steven Armstrong. Free use of this software is
+granted under the terms of the GNU General Public License version 3 (GPLv3).
diff --git a/cdist/conf/type/__apt_norecommends/manifest b/cdist/conf/type/__apt_norecommends/manifest
index fc187784..881c2427 100755
--- a/cdist/conf/type/__apt_norecommends/manifest
+++ b/cdist/conf/type/__apt_norecommends/manifest
@@ -1,7 +1,6 @@
-#!/bin/sh -e
+#!/bin/sh
#
# 2014 Steven Armstrong (steven-cdist at armstrong.cc)
-# 2020 Dennis Camera (dennis.camera at ssrq-sds-fds.ch)
#
# This file is part of cdist.
#
@@ -20,28 +19,24 @@
#
-os=$(cat "${__global:?}/explorer/os")
+os=$(cat "$__global/explorer/os")
-case ${os}
-in
- (ubuntu|debian|devuan)
- __file /etc/apt/apt.conf.d/00InstallRecommends --state present \
- --owner root --group root --mode 0644 --source - <<-'EOF'
- APT::Install-Recommends "false";
- APT::Install-Suggests "false";
- APT::AutoRemove::RecommendsImportant "false";
- APT::AutoRemove::SuggestsImportant "false";
- EOF
-
- # TODO: Remove the following object after some time
- require=__file/etc/apt/apt.conf.d/00InstallRecommends \
- __file /etc/apt/apt.conf.d/99-no-recommends --state absent
- ;;
- (*)
- cat >&2 <&2 << DONE
The developer of this type (${__type##*/}) did not think your operating system
($os) would have any use for it. If you think otherwise please submit a patch.
-EOF
- exit 1
- ;;
+DONE
+ exit 1
+ ;;
esac
diff --git a/cdist/conf/type/__apt_pin/man.rst b/cdist/conf/type/__apt_pin/man.rst
deleted file mode 100644
index 4229c0cd..00000000
--- a/cdist/conf/type/__apt_pin/man.rst
+++ /dev/null
@@ -1,79 +0,0 @@
-cdist-type__apt_pin(7)
-======================
-
-NAME
-----
-cdist-type__apt_pin - Manage apt pinning rules
-
-
-DESCRIPTION
------------
-Adds/removes/edits rules to pin some packages to a specific distribution. Useful if using multiple debian repositories at the same time. (Useful, if one wants to use a few specific packages from backports or perhaps Debain testing... or even sid.)
-
-
-REQUIRED PARAMETERS
--------------------
-distribution
- Specifies what distribution the package should be pinned to. Accepts both codenames (buster/bullseye/sid) and suite names (stable/testing/...).
-
-
-OPTIONAL PARAMETERS
--------------------
-package
- Package name, glob or regular expression to match (multiple) packages. If not specified `__object_id` is used.
-
-priority
- The priority value to assign to matching packages. Deafults to 500. (To match the default target distro's priority)
-
-state
- Will be passed to underlying `__file` type; see there for valid values and defaults.
-
-
-
-BOOLEAN PARAMETERS
-------------------
-None.
-
-
-EXAMPLES
---------
-
-.. code-block:: sh
-
- # Add the bullseye repo to buster, but do not install any packages by default,
- # only if explicitely asked for (-1 means "never" for apt)
- __apt_pin bullseye-default \
- --package "*" \
- --distribution bullseye \
- --priority -1
-
- require="__apt_pin/bullseye-default" __apt_source bullseye \
- --uri http://deb.debian.org/debian/ \
- --distribution bullseye \
- --component main
-
- __apt_pin foo --package "foo foo-*" --distribution bullseye
-
- __foo # Assuming, this installs the `foo` package internally
-
- __package foo-plugin-extras # Assuming we also need some extra stuff
-
-
-SEE ALSO
---------
-:strong:`apt_preferences`\ (5)
-:strong:`cdist-type__apt_source`\ (7)
-:strong:`cdist-type__apt_backports`\ (7)
-:strong:`cdist-type__file`\ (7)
-
-AUTHORS
--------
-Daniel Fancsali
-
-
-COPYING
--------
-Copyright \(C) 2021 Daniel Fancsali. 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.
diff --git a/cdist/conf/type/__apt_pin/manifest b/cdist/conf/type/__apt_pin/manifest
deleted file mode 100755
index 983b2b42..00000000
--- a/cdist/conf/type/__apt_pin/manifest
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/sh -e
-#
-# 2021 Daniel Fancsali (fancsali@gmail.com)
-#
-# This file is part of cdist.
-#
-# cdist is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# cdist is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with cdist. If not, see .
-#
-
-
-name="$__object_id"
-
-os=$(cat "$__global/explorer/os")
-state="$(cat "$__object/parameter/state")"
-
-if [ -f "$__object/parameter/package" ]; then
- package="$(cat "$__object/parameter/package")"
-else
- package=$name
-fi
-
-distribution="$(cat "$__object/parameter/distribution")"
-priority="$(cat "$__object/parameter/priority")"
-
-
-case "$os" in
- debian|ubuntu|devuan)
- ;;
- *)
- printf "This type is specific to Debian and it's derivatives" >&2
- exit 1
- ;;
-esac
-
-case $distribution in
- stable|testing|unstable|experimental)
- pin="release a=$distribution"
- ;;
- *)
- pin="release n=$distribution"
- ;;
-esac
-
-
-__file "/etc/apt/preferences.d/$name" \
- --owner root --group root --mode 0644 \
- --state "$state" \
- --source - << EOF
-# Created by cdist ${__type##*/}
-# Do not change. Changes will be overwritten.
-#
-
-# $name
-Package: $package
-Pin: $pin
-Pin-Priority: $priority
-EOF
diff --git a/cdist/conf/type/__apt_pin/nonparallel b/cdist/conf/type/__apt_pin/nonparallel
deleted file mode 100644
index e69de29b..00000000
diff --git a/cdist/conf/type/__apt_pin/parameter/default/priority b/cdist/conf/type/__apt_pin/parameter/default/priority
deleted file mode 100644
index 1b79f38e..00000000
--- a/cdist/conf/type/__apt_pin/parameter/default/priority
+++ /dev/null
@@ -1 +0,0 @@
-500
diff --git a/cdist/conf/type/__apt_pin/parameter/default/state b/cdist/conf/type/__apt_pin/parameter/default/state
deleted file mode 100644
index e7f6134f..00000000
--- a/cdist/conf/type/__apt_pin/parameter/default/state
+++ /dev/null
@@ -1 +0,0 @@
-present
diff --git a/cdist/conf/type/__apt_pin/parameter/optional b/cdist/conf/type/__apt_pin/parameter/optional
deleted file mode 100644
index 847e703d..00000000
--- a/cdist/conf/type/__apt_pin/parameter/optional
+++ /dev/null
@@ -1,3 +0,0 @@
-state
-package
-priority
diff --git a/cdist/conf/type/__apt_pin/parameter/required b/cdist/conf/type/__apt_pin/parameter/required
deleted file mode 100644
index c8572d92..00000000
--- a/cdist/conf/type/__apt_pin/parameter/required
+++ /dev/null
@@ -1 +0,0 @@
-distribution
diff --git a/cdist/conf/type/__apt_ppa/explorer/state b/cdist/conf/type/__apt_ppa/explorer/state
index d47e7d20..2bb4f65a 100755
--- a/cdist/conf/type/__apt_ppa/explorer/state
+++ b/cdist/conf/type/__apt_ppa/explorer/state
@@ -23,11 +23,10 @@
name="$__object_id"
-# shellcheck disable=SC1091
. /etc/lsb-release
repo_name="${name#ppa:}"
-repo_file_name="$(echo "$repo_name" | sed -e 's|[/:]|-|' -e 's|\.|_|')-${DISTRIB_CODENAME}.list"
+repo_file_name="$(echo "$repo_name" | sed -e "s|[/:]|-|" -e "s|\.|_|")-${DISTRIB_CODENAME}.list"
[ -s "/etc/apt/sources.list.d/${repo_file_name}" ] \
&& echo present || echo absent
diff --git a/cdist/conf/type/__apt_ppa/files/remove-apt-repository b/cdist/conf/type/__apt_ppa/files/remove-apt-repository
new file mode 100755
index 00000000..3eb7d491
--- /dev/null
+++ b/cdist/conf/type/__apt_ppa/files/remove-apt-repository
@@ -0,0 +1,55 @@
+#!/usr/bin/env python
+#
+# Remove the given apt repository.
+#
+# Exit with:
+# 0: if it worked
+# 1: if not
+# 2: on other error
+
+import os
+import sys
+from aptsources import distro, sourceslist
+from softwareproperties import ppa
+from softwareproperties.SoftwareProperties import SoftwareProperties
+
+
+def remove_if_empty(file_name):
+ with open(file_name, 'r') as f:
+ if f.read().strip():
+ return
+ os.unlink(file_name)
+
+def remove_repository(repository):
+ #print 'repository:', repository
+ codename = distro.get_distro().codename
+ #print 'codename:', codename
+ (line, file) = ppa.expand_ppa_line(repository.strip(), codename)
+ #print 'line:', line
+ #print 'file:', file
+ deb_source_entry = sourceslist.SourceEntry(line, file)
+ src_source_entry = sourceslist.SourceEntry('deb-src{}'.format(line[3:]), file)
+
+ try:
+ sp = SoftwareProperties()
+ sp.remove_source(deb_source_entry)
+ try:
+ # If there's a deb-src entry, remove that too
+ sp.remove_source(src_source_entry)
+ except:
+ pass
+ remove_if_empty(file)
+ return True
+ except ValueError:
+ print >> sys.stderr, "Error: '%s' doesn't exists in a sourcelist file" % line
+ return False
+
+if __name__ == '__main__':
+ if (len(sys.argv) != 2):
+ print >> sys.stderr, 'Error: need a repository as argument'
+ sys.exit(2)
+ repository = sys.argv[1]
+ if remove_repository(repository):
+ sys.exit(0)
+ else:
+ sys.exit(1)
diff --git a/cdist/conf/type/__apt_ppa/gencode-remote b/cdist/conf/type/__apt_ppa/gencode-remote
index e41341b8..300a0e1e 100755
--- a/cdist/conf/type/__apt_ppa/gencode-remote
+++ b/cdist/conf/type/__apt_ppa/gencode-remote
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/sh
#
# 2011 Steven Armstrong (steven-cdist at armstrong.cc)
#
@@ -29,9 +29,9 @@ fi
case "$state_should" in
present)
- echo "add-apt-repository -y '$name'"
+ echo add-apt-repository \"$name\"
;;
absent)
- echo "add-apt-repository -r -y '$name'"
+ echo remove-apt-repository \"$name\"
;;
esac
diff --git a/cdist/conf/type/__apt_ppa/man.rst b/cdist/conf/type/__apt_ppa/man.rst
deleted file mode 100644
index 8347c908..00000000
--- a/cdist/conf/type/__apt_ppa/man.rst
+++ /dev/null
@@ -1,50 +0,0 @@
-cdist-type__apt_ppa(7)
-======================
-
-NAME
-----
-cdist-type__apt_ppa - Manage ppa repositories
-
-
-DESCRIPTION
------------
-This cdist type allows manage ubuntu ppa repositories.
-
-
-REQUIRED PARAMETERS
--------------------
-state
- The state the ppa should be in, either 'present' or 'absent'.
- Defaults to 'present'
-
-
-OPTIONAL PARAMETERS
--------------------
-None.
-
-
-EXAMPLES
---------
-
-.. code-block:: sh
-
- # Enable a ppa repository
- __apt_ppa ppa:sans-intern/missing-bits
- # same as
- __apt_ppa ppa:sans-intern/missing-bits --state present
-
- # Disable a ppa repository
- __apt_ppa ppa:sans-intern/missing-bits --state absent
-
-
-AUTHORS
--------
-Steven Armstrong
-
-
-COPYING
--------
-Copyright \(C) 2011-2014 Steven Armstrong. You can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
diff --git a/cdist/conf/type/__apt_ppa/man.text b/cdist/conf/type/__apt_ppa/man.text
new file mode 100644
index 00000000..da18e9f0
--- /dev/null
+++ b/cdist/conf/type/__apt_ppa/man.text
@@ -0,0 +1,50 @@
+cdist-type__apt_ppa(7)
+======================
+Steven Armstrong
+
+
+NAME
+----
+cdist-type__apt_ppa - Manage ppa repositories
+
+
+DESCRIPTION
+-----------
+This cdist type allows manage ubuntu ppa repositories.
+
+
+REQUIRED PARAMETERS
+-------------------
+state::
+ The state the ppa should be in, either 'present' or 'absent'.
+ Defaults to 'present'
+
+
+OPTIONAL PARAMETERS
+-------------------
+None.
+
+
+EXAMPLES
+--------
+
+--------------------------------------------------------------------------------
+# Enable a ppa repository
+__apt_ppa ppa:sans-intern/missing-bits
+# same as
+__apt_ppa ppa:sans-intern/missing-bits --state present
+
+# Disable a ppa repository
+__apt_ppa ppa:sans-intern/missing-bits --state absent
+--------------------------------------------------------------------------------
+
+
+SEE ALSO
+--------
+- cdist-type(7)
+
+
+COPYING
+-------
+Copyright \(C) 2011-2014 Steven Armstrong. Free use of this software is
+granted under the terms of the GNU General Public License version 3 (GPLv3).
diff --git a/cdist/conf/type/__apt_ppa/manifest b/cdist/conf/type/__apt_ppa/manifest
index 57e85442..1d90e9c4 100755
--- a/cdist/conf/type/__apt_ppa/manifest
+++ b/cdist/conf/type/__apt_ppa/manifest
@@ -1,6 +1,6 @@
-#!/bin/sh -e
+#!/bin/sh
#
-# 2011-2016 Steven Armstrong (steven-cdist at armstrong.cc)
+# 2011-2014 Steven Armstrong (steven-cdist at armstrong.cc)
#
# This file is part of cdist.
#
@@ -18,6 +18,14 @@
# along with cdist. If not, see .
#
+name="$__object_id"
+
__package software-properties-common
+__package python-software-properties
+
+require="__package/software-properties-common __package/python-software-properties" \
+ __file /usr/local/bin/remove-apt-repository \
+ --source "$__type/files/remove-apt-repository" \
+ --mode 0755
require="$__object_name" __apt_update_index
diff --git a/cdist/conf/type/__apt_source/files/source.list.template b/cdist/conf/type/__apt_source/files/source.list.template
index a28bb45f..d4420e96 100755
--- a/cdist/conf/type/__apt_source/files/source.list.template
+++ b/cdist/conf/type/__apt_source/files/source.list.template
@@ -2,14 +2,13 @@
set -u
entry="$uri $distribution $component"
-
cat << DONE
# Created by cdist ${__type##*/}
# Do not change. Changes will be overwritten.
#
# $name
-deb ${options} $entry
+deb ${forcedarch} $entry
DONE
if [ -f "$__object/parameter/include-src" ]; then
echo "deb-src $entry"
diff --git a/cdist/conf/type/__apt_source/gencode-remote b/cdist/conf/type/__apt_source/gencode-remote
deleted file mode 100755
index 973b0f6c..00000000
--- a/cdist/conf/type/__apt_source/gencode-remote
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/sh -e
-#
-# 2018 Steven Armstrong (steven-cdist at armstrong.cc)
-#
-# This file is part of cdist.
-#
-# cdist is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# cdist is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with cdist. If not, see .
-#
-#
-
-name="$__object_id"
-destination="/etc/apt/sources.list.d/${name}.list"
-
-# There are special arguments to apt(8) to prevent aborts if apt woudn't been
-# updated after the 19th April 2021 till the bullseye release. The additional
-# arguments acknoledge the happend suite change (the apt(8) update does the
-# same by itself).
-#
-# Using '-o $config' instead of the --allow-releaseinfo-change-* parameter
-# allows backward compatablility to pre-buster Debian versions.
-#
-# See more: ticket #861
-# https://code.ungleich.ch/ungleich-public/cdist/-/issues/861
-apt_opts="-o Acquire::AllowReleaseInfoChange::Suite=true -o Acquire::AllowReleaseInfoChange::Version=true"
-
-# run 'apt-get update' only if something changed with our sources.list file
-# it will be run a second time on error as a redundancy messure to success
-if grep -q "^__file${destination}" "$__messages_in"; then
- printf 'apt-get %s update || apt-get %s update\n' "$apt_opts" "$apt_opts"
-fi
-
diff --git a/cdist/conf/type/__apt_source/man.rst b/cdist/conf/type/__apt_source/man.rst
deleted file mode 100644
index d317a135..00000000
--- a/cdist/conf/type/__apt_source/man.rst
+++ /dev/null
@@ -1,78 +0,0 @@
-cdist-type__apt_source(7)
-=========================
-
-NAME
-----
-cdist-type__apt_source - Manage apt sources
-
-
-DESCRIPTION
------------
-This cdist type allows you to manage apt sources. It invokes index update
-internally when needed so call of index updating type is not needed.
-
-
-REQUIRED PARAMETERS
--------------------
-uri
- the uri to the apt repository
-
-
-OPTIONAL PARAMETERS
--------------------
-arch
- set this if you need to force and specific arch (ubuntu specific)
-
-signed-by
- provide a GPG key fingerprint or keyring path for signature checks
-
-state
- 'present' or 'absent', defaults to 'present'
-
-distribution
- the distribution codename to use. Defaults to DISTRIB_CODENAME from
- the targets /etc/lsb-release
-
-component
- space delimited list of components to enable. Defaults to an empty string.
-
-
-BOOLEAN PARAMETERS
-------------------
-include-src
- include deb-src entries
-
-
-EXAMPLES
---------
-
-.. code-block:: sh
-
- __apt_source rabbitmq \
- --uri http://www.rabbitmq.com/debian/ \
- --distribution testing \
- --component main \
- --include-src \
- --state present
-
- __apt_source canonical_partner \
- --uri http://archive.canonical.com/ \
- --component partner --state present
-
- __apt_source goaccess \
- --uri http://deb.goaccess.io/ \
- --component main \
- --signed-by C03B48887D5E56B046715D3297BD1A0133449C3D
-
-
-AUTHORS
--------
-Steven Armstrong
-
-
-COPYING
--------
-Copyright \(C) 2011-2018 Steven Armstrong. You can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
diff --git a/cdist/conf/type/__apt_source/man.text b/cdist/conf/type/__apt_source/man.text
new file mode 100644
index 00000000..03b2b311
--- /dev/null
+++ b/cdist/conf/type/__apt_source/man.text
@@ -0,0 +1,69 @@
+cdist-type__apt_source(7)
+=========================
+Steven Armstrong
+
+
+NAME
+----
+cdist-type__apt_source - manage apt sources
+
+
+DESCRIPTION
+-----------
+This cdist type allows you to manage apt sources.
+
+
+REQUIRED PARAMETERS
+-------------------
+uri::
+ the uri to the apt repository
+
+
+OPTIONAL PARAMETERS
+-------------------
+arch::
+ set this if you need to force and specific arch (ubuntu specific)
+
+state::
+ 'present' or 'absent', defaults to 'present'
+
+distribution::
+ the distribution codename to use. Defaults to DISTRIB_CODENAME from
+ the targets /etc/lsb-release
+
+component::
+ space delimited list of components to enable. Defaults to an empty string.
+
+
+BOOLEAN PARAMETERS
+------------------
+include-src::
+ include deb-src entries
+
+
+EXAMPLES
+--------
+
+--------------------------------------------------------------------------------
+__apt_source rabbitmq \
+ --uri http://www.rabbitmq.com/debian/ \
+ --distribution testing \
+ --component main \
+ --include-src \
+ --state present
+
+__apt_source canonical_partner \
+ --uri http://archive.canonical.com/ \
+ --component partner --state present
+--------------------------------------------------------------------------------
+
+
+SEE ALSO
+--------
+- cdist-type(7)
+
+
+COPYING
+-------
+Copyright \(C) 2011-2014 Steven Armstrong. Free use of this software is
+granted under the terms of the GNU General Public License version 3 (GPLv3).
diff --git a/cdist/conf/type/__apt_source/manifest b/cdist/conf/type/__apt_source/manifest
index cdb526d3..59c7c567 100755
--- a/cdist/conf/type/__apt_source/manifest
+++ b/cdist/conf/type/__apt_source/manifest
@@ -1,6 +1,6 @@
-#!/bin/sh -e
+#!/bin/sh
#
-# 2011-2018 Steven Armstrong (steven-cdist at armstrong.cc)
+# 2011-2013 Steven Armstrong (steven-cdist at armstrong.cc)
#
# This file is part of cdist.
#
@@ -31,15 +31,9 @@ fi
component="$(cat "$__object/parameter/component")"
if [ -f "$__object/parameter/arch" ]; then
- options="arch=$(cat "$__object/parameter/arch")"
-fi
-
-if [ -f "$__object/parameter/signed-by" ]; then
- options="$options signed-by=$(cat "$__object/parameter/signed-by")"
-fi
-
-if [ "$options" ]; then
- options="[$options]"
+ forcedarch="[arch=$(cat "$__object/parameter/arch")]"
+else
+ forcedarch=""
fi
# export variables for use in template
@@ -47,7 +41,7 @@ export name
export uri
export distribution
export component
-export options
+export forcedarch
# generate file from template
mkdir "$__object/files"
@@ -56,3 +50,5 @@ __file "/etc/apt/sources.list.d/${name}.list" \
--source "$__object/files/source.list" \
--owner root --group root --mode 0644 \
--state "$state"
+
+require="$__object_name" __apt_update_index
diff --git a/cdist/conf/type/__apt_source/nonparallel b/cdist/conf/type/__apt_source/nonparallel
deleted file mode 100644
index e69de29b..00000000
diff --git a/cdist/conf/type/__apt_source/parameter/optional b/cdist/conf/type/__apt_source/parameter/optional
index 0b5470a1..87537335 100644
--- a/cdist/conf/type/__apt_source/parameter/optional
+++ b/cdist/conf/type/__apt_source/parameter/optional
@@ -1,5 +1,4 @@
state
distribution
component
-arch
-signed-by
+arch
\ No newline at end of file
diff --git a/cdist/conf/type/__apt_unattended_upgrades/man.rst b/cdist/conf/type/__apt_unattended_upgrades/man.rst
deleted file mode 100644
index 2231b5f9..00000000
--- a/cdist/conf/type/__apt_unattended_upgrades/man.rst
+++ /dev/null
@@ -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
-
-
-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.
diff --git a/cdist/conf/type/__apt_unattended_upgrades/manifest b/cdist/conf/type/__apt_unattended_upgrades/manifest
deleted file mode 100755
index 3c00e2f4..00000000
--- a/cdist/conf/type/__apt_unattended_upgrades/manifest
+++ /dev/null
@@ -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 .
-#
-
-__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
diff --git a/cdist/conf/type/__apt_unattended_upgrades/parameter/optional_multiple b/cdist/conf/type/__apt_unattended_upgrades/parameter/optional_multiple
deleted file mode 100644
index ea4fba2b..00000000
--- a/cdist/conf/type/__apt_unattended_upgrades/parameter/optional_multiple
+++ /dev/null
@@ -1,2 +0,0 @@
-option
-blacklist
diff --git a/cdist/conf/type/__apt_unattended_upgrades/singleton b/cdist/conf/type/__apt_unattended_upgrades/singleton
deleted file mode 100644
index e69de29b..00000000
diff --git a/cdist/conf/type/__apt_update_index/gencode-remote b/cdist/conf/type/__apt_update_index/gencode-remote
index 2d7f9030..61ce11a9 100755
--- a/cdist/conf/type/__apt_update_index/gencode-remote
+++ b/cdist/conf/type/__apt_update_index/gencode-remote
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/sh
#
# 2011 Steven Armstrong (steven-cdist at armstrong.cc)
#
@@ -18,23 +18,9 @@
# along with cdist. If not, see .
#
-
-# There are special arguments to apt(8) to prevent aborts if apt woudn't been
-# updated after the 19th April 2021 till the bullseye release. The additional
-# arguments acknoledge the happend suite change (the apt(8) update does the
-# same by itself).
-#
-# Using '-o $config' instead of the --allow-releaseinfo-change-* parameter
-# allows backward compatablility to pre-buster Debian versions.
-#
-# See more: ticket #861
-# https://code.ungleich.ch/ungleich-public/cdist/-/issues/861
-apt_opts="-o Acquire::AllowReleaseInfoChange::Suite=true -o Acquire::AllowReleaseInfoChange::Version=true"
-
# run 'apt-get update' if anything in /etc/apt is newer then /var/lib/apt/lists
-# it will be run a second time on error as a redundancy messure to success
cat << DONE
if find /etc/apt -mindepth 1 -cnewer /var/lib/apt/lists | grep . > /dev/null; then
- apt-get $apt_opts update || apt-get $apt_opts update
+ apt-get update || apt-get update
fi
DONE
diff --git a/cdist/conf/type/__apt_update_index/man.rst b/cdist/conf/type/__apt_update_index/man.text
similarity index 53%
rename from cdist/conf/type/__apt_update_index/man.rst
rename to cdist/conf/type/__apt_update_index/man.text
index 3031902f..628292dc 100644
--- a/cdist/conf/type/__apt_update_index/man.rst
+++ b/cdist/conf/type/__apt_update_index/man.text
@@ -1,5 +1,7 @@
cdist-type__apt_update_index(7)
===============================
+Steven Armstrong
+
NAME
----
@@ -23,19 +25,17 @@ None.
EXAMPLES
--------
-.. code-block:: sh
-
- __apt_update_index
+--------------------------------------------------------------------------------
+__apt_update_index
+--------------------------------------------------------------------------------
-AUTHORS
--------
-Steven Armstrong
+SEE ALSO
+--------
+- cdist-type(7)
COPYING
-------
-Copyright \(C) 2011 Steven Armstrong. You can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
+Copyright \(C) 2011 Steven Armstrong. Free use of this software is
+granted under the terms of the GNU General Public License version 3 (GPLv3).
diff --git a/cdist/conf/type/__block/gencode-remote b/cdist/conf/type/__block/gencode-remote
index 7a1f4064..2e2147e5 100755
--- a/cdist/conf/type/__block/gencode-remote
+++ b/cdist/conf/type/__block/gencode-remote
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/sh
#
# 2013 Steven Armstrong (steven-cdist at armstrong.cc)
#
@@ -18,11 +18,6 @@
# along with cdist. If not, see .
#
-# quote function from http://www.etalabs.net/sh_tricks.html
-quote() {
- printf '%s\n' "$1" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/'/"
-}
-
file="$(cat "$__object/parameter/file" 2>/dev/null || echo "/$__object_id")"
state_should=$(cat "$__object/parameter/state")
prefix=$(cat "$__object/parameter/prefix" 2>/dev/null || echo "#cdist:__block/$__object_id")
@@ -46,29 +41,28 @@ fi
remove_block() {
cat << DONE
-tmpfile=\$(mktemp ${quoted_file}.cdist.XXXXXXXXXX)
+tmpfile=\$(mktemp ${file}.cdist.XXXXXXXXXX)
# preserve ownership and permissions of existing file
-if [ -f $quoted_file ]; then
- cp -p $quoted_file "\$tmpfile"
+if [ -f "$file" ]; then
+ cp -p "$file" "\$tmpfile"
fi
-awk -v prefix=$(quote "$prefix") -v suffix=$(quote "$suffix") '
+awk -v prefix="^$prefix\$" -v suffix="^$suffix\$" '
{
- if (\$0 == prefix) {
+ if (match(\$0,prefix)) {
triggered=1
}
if (triggered) {
- if (\$0 == suffix) {
+ if (match(\$0,suffix)) {
triggered=0
}
} else {
print
}
-}' $quoted_file > "\$tmpfile"
-mv -f "\$tmpfile" $quoted_file
+}' "$file" > "\$tmpfile"
+mv -f "\$tmpfile" "$file"
DONE
}
-quoted_file="$(quote "$file")"
case "$state_should" in
present)
if [ "$state_is" = "changed" ]; then
@@ -78,7 +72,7 @@ case "$state_should" in
echo add >> "$__messages_out"
fi
cat << DONE
-cat >> $quoted_file << '${__type##*/}_DONE'
+cat >> "$file" << ${__type##*/}_DONE
$(cat "$block")
${__type##*/}_DONE
DONE
diff --git a/cdist/conf/type/__block/man.rst b/cdist/conf/type/__block/man.text
similarity index 57%
rename from cdist/conf/type/__block/man.rst
rename to cdist/conf/type/__block/man.text
index 90e50381..2312d293 100644
--- a/cdist/conf/type/__block/man.rst
+++ b/cdist/conf/type/__block/man.text
@@ -1,5 +1,7 @@
cdist-type__block(7)
====================
+Steven Armstrong
+
NAME
----
@@ -16,67 +18,65 @@ of text.
REQUIRED PARAMETERS
-------------------
-text
+text::
the text to manage.
If text is '-' (dash), take what was written to stdin as the text.
OPTIONAL PARAMETERS
-------------------
-file
+file::
the file in which to manage the text block.
Defaults to object_id.
-prefix
+prefix::
the prefix to add before the text.
Defaults to #cdist:__block/$__object_id
-suffix
- the suffix to add after the text.
+suffix::
+ the prefix to add after the text.
Defaults to #/cdist:__block/$__object_id
-state
+state::
'present' or 'absent', defaults to 'present'
MESSAGES
--------
-add
+add::
block was added
-update
+update::
block was updated/changed
-remove
+remove::
block was removed
EXAMPLES
--------
-.. code-block:: sh
+--------------------------------------------------------------------------------
+# text from argument
+__block /path/to/file \
+ --prefix '#start' \
+ --suffix '#end' \
+ --text 'some\nblock of\ntext'
- # text from argument
- __block /path/to/file \
- --prefix '#start' \
- --suffix '#end' \
- --text 'some\nblock of\ntext'
-
- # text from stdin
- __block some-id \
- --file /path/to/file \
- --text - << DONE
- here some block
- of text
- DONE
+# text from stdin
+__block some-id \
+ --file /path/to/file \
+ --text - << DONE
+here some block
+of text
+DONE
+--------------------------------------------------------------------------------
-AUTHORS
--------
-Steven Armstrong
+SEE ALSO
+--------
+- cdist-type(7)
COPYING
-------
-Copyright \(C) 2013 Steven Armstrong. You can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
+Copyright \(C) 2013 Steven Armstrong. Free use of this software is
+granted under the terms of the GNU General Public License version 3 (GPLv3).
diff --git a/cdist/conf/type/__block/manifest b/cdist/conf/type/__block/manifest
index 726950d3..bf96181c 100755
--- a/cdist/conf/type/__block/manifest
+++ b/cdist/conf/type/__block/manifest
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/sh
#
# 2013-2014 Steven Armstrong (steven-cdist at armstrong.cc)
#
@@ -18,6 +18,8 @@
# along with cdist. If not, see .
#
+
+file="$(cat "$__object/parameter/file" 2>/dev/null || echo "/$__object_id")"
prefix=$(cat "$__object/parameter/prefix" 2>/dev/null || echo "#cdist:__block/$__object_id")
suffix=$(cat "$__object/parameter/suffix" 2>/dev/null || echo "#/cdist:__block/$__object_id")
text=$(cat "$__object/parameter/text")
diff --git a/cdist/conf/type/__ccollect_source/explorer/stat b/cdist/conf/type/__ccollect_source/explorer/stat
index 9b5ad75b..7c86d94f 100755
--- a/cdist/conf/type/__ccollect_source/explorer/stat
+++ b/cdist/conf/type/__ccollect_source/explorer/stat
@@ -25,7 +25,7 @@ destination="/$__object_id"
os=$("$__explorer/os")
case "$os" in
- "freebsd"|"netbsd"|"openbsd")
+ "freebsd"|"openbsd")
# FIXME: should be something like this based on man page, but can not test
stat -f "type: %ST
owner: %Du %Su
diff --git a/cdist/conf/type/__ccollect_source/gencode-remote b/cdist/conf/type/__ccollect_source/gencode-remote
index 57353c24..c41b5179 100755
--- a/cdist/conf/type/__ccollect_source/gencode-remote
+++ b/cdist/conf/type/__ccollect_source/gencode-remote
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/sh
#
# 2014 Nico Schottelius (nico-cdist at schottelius.org)
#
@@ -42,20 +42,21 @@ get_current_value() {
}
set_group() {
- echo "chgrp '$1' '$destination'"
- echo "chgrp '$1'" >> "$__messages_out"
+ echo chgrp \"$1\" \"$destination\"
+ echo chgrp $1 >> "$__messages_out"
}
set_owner() {
- echo "chown '$1' '$destination'"
- echo "chown '$1'" >> "$__messages_out"
+ echo chown \"$1\" \"$destination\"
+ echo chown $1 >> "$__messages_out"
}
set_mode() {
- echo "chmod '$1' '$destination'"
- echo "chmod '$1'" >> "$__messages_out"
+ echo chmod \"$1\" \"$destination\"
+ echo chmod $1 >> "$__messages_out"
}
+set_attributes=
case "$state_should" in
present|exists)
# Note: Mode - needs to happen last as a chown/chgrp can alter mode by
@@ -66,11 +67,11 @@ case "$state_should" in
# change 0xxx format to xxx format => same as stat returns
if [ "$attribute" = mode ]; then
- value_should="$(echo "$value_should" | sed 's/^0\(...\)/\1/')"
+ value_should="$(echo $value_should | sed 's/^0\(...\)/\1/')"
fi
value_is="$(get_current_value "$attribute" "$value_should")"
- if [ -f "$__object/files/set-attributes" ] || [ "$value_should" != "$value_is" ]; then
+ if [ -f "$__object/files/set-attributes" -o "$value_should" != "$value_is" ]; then
"set_$attribute" "$value_should"
fi
fi
@@ -80,7 +81,7 @@ case "$state_should" in
absent)
if [ "$type" = "file" ]; then
- echo "rm -f '$destination'"
+ echo rm -f \"$destination\"
echo remove >> "$__messages_out"
fi
;;
diff --git a/cdist/conf/type/__ccollect_source/man.rst b/cdist/conf/type/__ccollect_source/man.rst
deleted file mode 100644
index b0c23482..00000000
--- a/cdist/conf/type/__ccollect_source/man.rst
+++ /dev/null
@@ -1,78 +0,0 @@
-cdist-type__ccollect_source(7)
-==============================
-
-NAME
-----
-cdist-type__ccollect_source - Manage ccollect sources
-
-
-DESCRIPTION
------------
-This cdist type allows you to create or delete ccollect sources.
-
-
-REQUIRED PARAMETERS
--------------------
-source
- The source from which to backup
-destination
- The destination directory
-
-
-OPTIONAL PARAMETERS
--------------------
-state
- 'present' or 'absent', defaults to 'present'
-ccollectconf
- The CCOLLECT_CONF directory. Defaults to /etc/ccollect.
-
-
-OPTIONAL MULTIPLE PARAMETERS
-----------------------------
-exclude
- Paths to exclude of backup
-
-
-BOOLEAN PARAMETERS
-------------------
-verbose
- Whether to report backup verbosely
-
-create-destination
- Create the directory specified in the destination parameter on the remote host
-
-EXAMPLES
---------
-
-.. code-block:: sh
-
- __ccollect_source doc.ungleich.ch \
- --source doc.ungleich.ch:/ \
- --destination /backup/doc.ungleich.ch \
- --exclude '/proc/*' --exclude '/sys/*' \
- --verbose
-
- __ccollect_source doc.ungleich.ch \
- --source doc.ungleich.ch:/ \
- --destination /backup/doc.ungleich.ch \
- --exclude '/proc/*' --exclude '/sys/*' \
- --verbose \
- --create-destination
-
-
-SEE ALSO
---------
-:strong:`ccollect`\ (1)
-
-
-AUTHORS
--------
-Nico Schottelius
-
-
-COPYING
--------
-Copyright \(C) 2014 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.
diff --git a/cdist/conf/type/__ccollect_source/man.text b/cdist/conf/type/__ccollect_source/man.text
new file mode 100644
index 00000000..32a7467e
--- /dev/null
+++ b/cdist/conf/type/__ccollect_source/man.text
@@ -0,0 +1,64 @@
+cdist-type__ccollect_source(7)
+==============================
+Nico Schottelius
+
+
+NAME
+----
+cdist-type__ccollect_source - Manage ccollect sources
+
+
+DESCRIPTION
+-----------
+This cdist type allows you to create or delete ccollect sources.
+
+REQUIRED PARAMETERS
+-------------------
+source::
+ The source from which to backup
+destination::
+ The destination directory
+
+
+OPTIONAL PARAMETERS
+-------------------
+state::
+ 'present' or 'absent', defaults to 'present'
+ccollectconf::
+ The CCOLLECT_CONF directory. Defaults to /etc/ccollect.
+
+
+OPTIONAL MULTIPLE PARAMETERS
+----------------------------
+exclude::
+ Paths to exclude of backup
+
+BOOLEAN PARAMETERS
+------------------
+verbose::
+ Whether to report backup verbosely
+
+EXAMPLES
+--------
+
+--------------------------------------------------------------------------------
+__ccollect_source doc.ungleich.ch \
+ --source doc.ungleich.ch:/ \
+ --destination /backup/doc.ungleich.ch \
+ --exclude '/proc/*' --exclude '/sys/*' \
+ --verbose
+
+--------------------------------------------------------------------------------
+
+
+SEE ALSO
+--------
+- cdist-type(7)
+- ccollect(1)
+- http://www.nico.schottelius.org/software/ccollect/
+
+
+COPYING
+-------
+Copyright \(C) 2014 Nico Schottelius. Free use of this software is
+granted under the terms of the GNU General Public License version 3 (GPLv3).
diff --git a/cdist/conf/type/__ccollect_source/manifest b/cdist/conf/type/__ccollect_source/manifest
index 727a4c97..89c2ef2b 100755
--- a/cdist/conf/type/__ccollect_source/manifest
+++ b/cdist/conf/type/__ccollect_source/manifest
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/sh
#
# 2014 Nico Schottelius (nico-cdist at schottelius.org)
#
@@ -22,7 +22,7 @@ name="$__object_id"
state="$(cat "$__object/parameter/state")"
source="$(cat "$__object/parameter/source")"
destination="$(cat "$__object/parameter/destination")"
-ccollectconf="$(sed 's,/$,,' "$__object/parameter/ccollectconf")"
+ccollectconf="$(cat "$__object/parameter/ccollectconf" | sed 's,/$,,')"
sourcedir="$ccollectconf/sources"
basedir="$sourcedir/$name"
@@ -40,9 +40,7 @@ echo "$source" | __file "$source_file" --source - --state "$state"
################################################################################
# Booleans
-if [ "${state}" = "absent" ]; then
- verbosestate="absent"
-elif [ -f "$__object/parameter/verbose" ]; then
+if [ -f "$__object/parameter/verbose" ]; then
verbosestate="present"
else
verbosestate="absent"
@@ -53,7 +51,3 @@ if [ -f "$__object/parameter/exclude" ]; then
__file "$exclude_file" --source - --state "$state" \
< "$__object/parameter/exclude"
fi
-
-if [ -f "$__object/parameter/create-destination" ]; then
- __directory "${destination}" --parents --state "${state}"
-fi
diff --git a/cdist/conf/type/__ccollect_source/parameter/boolean b/cdist/conf/type/__ccollect_source/parameter/boolean
index 434c644f..c00ee94a 100644
--- a/cdist/conf/type/__ccollect_source/parameter/boolean
+++ b/cdist/conf/type/__ccollect_source/parameter/boolean
@@ -1,2 +1 @@
verbose
-create-destination
diff --git a/cdist/conf/type/__cdist/man.rst b/cdist/conf/type/__cdist/man.text
similarity index 55%
rename from cdist/conf/type/__cdist/man.rst
rename to cdist/conf/type/__cdist/man.text
index be082781..0805598e 100644
--- a/cdist/conf/type/__cdist/man.rst
+++ b/cdist/conf/type/__cdist/man.text
@@ -1,5 +1,7 @@
cdist-type__cdist(7)
====================
+Nico Schottelius
+
NAME
----
@@ -24,16 +26,16 @@ REQUIRED PARAMETERS
OPTIONAL PARAMETERS
-------------------
-username
+username::
Select the user to create for the cdist installation.
Defaults to "cdist".
-source
+source::
Select the source from which to clone cdist from.
- Defaults to "git@code.ungleich.ch:ungleich-public/cdist.git".
+ Defaults to "git://github.com/telmich/cdist.git".
-branch
+branch::
Select the branch to checkout from.
Defaults to "master".
@@ -41,23 +43,21 @@ branch
EXAMPLES
--------
-.. code-block:: sh
+--------------------------------------------------------------------------------
+# Install cdist for user cdist in her home as subfolder cdist
+__cdist /home/cdist/cdist
- # Install cdist for user cdist in her home as subfolder cdist
- __cdist /home/cdist/cdist
-
- # Use alternative source
- __cdist --source "git@code.ungleich.ch:ungleich-public/cdist.git" /home/cdist/cdist
+# Use alternative source
+__cdist --source "git://git.schottelius.org/cdist" /home/cdist/cdist
+--------------------------------------------------------------------------------
-AUTHORS
--------
-Nico Schottelius
+SEE ALSO
+--------
+- cdist-type(7)
COPYING
-------
-Copyright \(C) 2013 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.
+Copyright \(C) 2013 Nico Schottelius. Free use of this software is
+granted under the terms of the GNU General Public License version 3 (GPLv3).
diff --git a/cdist/conf/type/__cdist/manifest b/cdist/conf/type/__cdist/manifest
index 0b0f1263..7c0ae60e 100755
--- a/cdist/conf/type/__cdist/manifest
+++ b/cdist/conf/type/__cdist/manifest
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/sh
#
# 2013 Nico Schottelius (nico-cdist at schottelius.org)
#
@@ -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" \
diff --git a/cdist/conf/type/__cdist/parameter/default/source b/cdist/conf/type/__cdist/parameter/default/source
index 1ad3a250..d669308f 100644
--- a/cdist/conf/type/__cdist/parameter/default/source
+++ b/cdist/conf/type/__cdist/parameter/default/source
@@ -1 +1 @@
-git@code.ungleich.ch:ungleich-public/cdist.git
+git://github.com/telmich/cdist.git
diff --git a/cdist/conf/type/__cdist_preos/man.text b/cdist/conf/type/__cdist_preos/man.text
new file mode 100644
index 00000000..19caa8e2
--- /dev/null
+++ b/cdist/conf/type/__cdist_preos/man.text
@@ -0,0 +1,38 @@
+cdist-type__cdist_preos(7)
+==========================
+Nico Schottelius
+
+
+NAME
+----
+cdist-type__cdist - Manage cdist installations
+
+
+DESCRIPTION
+-----------
+This cdist type creates a directory containing an operating
+suitable for installation using cdist.
+
+REQUIRED PARAMETERS
+-------------------
+
+OPTIONAL PARAMETERS
+-------------------
+EXAMPLES
+--------
+
+--------------------------------------------------------------------------------
+__cdist_preos /tmp/random_name_for_packaging
+--------------------------------------------------------------------------------
+
+
+SEE ALSO
+--------
+- cdist-type(7)
+- cdist-type__cdist(7)
+
+
+COPYING
+-------
+Copyright \(C) 2015 Nico Schottelius. Free use of this software is
+granted under the terms of the GNU General Public License version 3 (GPLv3).
diff --git a/cdist/conf/type/__cdist_preos/manifest b/cdist/conf/type/__cdist_preos/manifest
new file mode 100755
index 00000000..78166b38
--- /dev/null
+++ b/cdist/conf/type/__cdist_preos/manifest
@@ -0,0 +1,79 @@
+#!/bin/sh
+#
+# 2015 Nico Schottelius (nico-cdist at schottelius.org)
+#
+# This file is part of cdist.
+#
+# cdist is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# cdist is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with cdist. If not, see .
+#
+#
+
+destination="/$__object_id"
+
+os=$(cat "$__global/explorer/os")
+
+case "$os" in
+ archlinux)
+ kernel=/boot/vmlinuz-linux
+ initramfs=/boot/initramfs-linux-fallback.img
+ required_pkg="cdrkit syslinux"
+ ;;
+ *)
+ 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
+ ;;
+esac
+
+# Our root
+__directory "$destination" \
+ --mode 0755
+
+for rootdir in boot bin etc lib; do
+ require="__directory/$destination" __directory "$destination/$rootdir" \
+ --mode 0755
+done
+
+require="__directory/$destination/etc" __cdistmarker \
+ --destination "$destination/etc/cdist-configured"
+
+for pkg in $required_pkg; do
+ __package "$pkg" --state present
+done
+
+# Create full dependency chain, because we don't know which file depends on which package
+export CDIST_ORDER_DEPENDENCY=1
+
+require="__directory/$destination/boot" __file "$destination/boot/linux" \
+ --source "$kernel" --mode 0644
+
+require="__directory/$destination/boot" __file "$destination/boot/initramfs" \
+ --source "$initramfs" --mode 0644
+
+require="__directory/$destination/boot" __file "$destination/boot/syslinux.cfg" \
+
+
+ PROMPT 1
+ TIMEOUT 50
+ DEFAULT arch
+
+ LABEL arch
+ LINUX ../vmlinuz-linux
+ APPEND root=/dev/sda2 rw
+ INITRD ../initramfs-linux.img
+
+ LABEL archfallback
+ LINUX ../vmlinuz-linux
+ APPEND root=/dev/sda2 rw
+ INITRD ../initramfs-linux-fallback.img
diff --git a/cdist/conf/type/__cdist_preos/parameter/default/branch b/cdist/conf/type/__cdist_preos/parameter/default/branch
new file mode 100644
index 00000000..1f7391f9
--- /dev/null
+++ b/cdist/conf/type/__cdist_preos/parameter/default/branch
@@ -0,0 +1 @@
+master
diff --git a/cdist/conf/type/__cdist_preos/parameter/default/source b/cdist/conf/type/__cdist_preos/parameter/default/source
new file mode 100644
index 00000000..d669308f
--- /dev/null
+++ b/cdist/conf/type/__cdist_preos/parameter/default/source
@@ -0,0 +1 @@
+git://github.com/telmich/cdist.git
diff --git a/cdist/conf/type/__cdist_preos/parameter/default/username b/cdist/conf/type/__cdist_preos/parameter/default/username
new file mode 100644
index 00000000..a585e141
--- /dev/null
+++ b/cdist/conf/type/__cdist_preos/parameter/default/username
@@ -0,0 +1 @@
+cdist
diff --git a/cdist/conf/type/__cdist_preos/parameter/optional b/cdist/conf/type/__cdist_preos/parameter/optional
new file mode 100644
index 00000000..a5f14343
--- /dev/null
+++ b/cdist/conf/type/__cdist_preos/parameter/optional
@@ -0,0 +1,4 @@
+branch
+source
+username
+shell
diff --git a/cdist/conf/type/__cdistmarker/gencode-remote b/cdist/conf/type/__cdistmarker/gencode-remote
index e71955c4..92ea582b 100755
--- a/cdist/conf/type/__cdistmarker/gencode-remote
+++ b/cdist/conf/type/__cdistmarker/gencode-remote
@@ -1,8 +1,8 @@
-#!/bin/sh -e
+#!/bin/sh
#
# Copyright (C) 2011 Daniel Maher (phrawzty+cdist at gmail.com)
#
-# This file is part of cdist.
+# This file is part of cdist (https://github.com/telmich/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
diff --git a/cdist/conf/type/__cdistmarker/man.rst b/cdist/conf/type/__cdistmarker/man.text
similarity index 60%
rename from cdist/conf/type/__cdistmarker/man.rst
rename to cdist/conf/type/__cdistmarker/man.text
index f3a8bafe..3a59659b 100644
--- a/cdist/conf/type/__cdistmarker/man.rst
+++ b/cdist/conf/type/__cdistmarker/man.text
@@ -1,5 +1,7 @@
cdist-type__cdistmarker(7)
==========================
+Daniel Maher
+
NAME
----
@@ -21,11 +23,11 @@ None.
OPTIONAL PARAMETERS
-------------------
-destination
+destination::
The path and filename of the marker.
Default: /etc/cdist-configured
-format
+format::
The format of the timestamp. This is passed directly to system 'date'.
Default: -u
@@ -33,23 +35,21 @@ format
EXAMPLES
--------
-.. code-block:: sh
+--------------------------------------------------------------------------------
+# Creates the marker as normal.
+__cdistmarker
- # Creates the marker as normal.
- __cdistmarker
-
- # Creates the marker differently.
- __cdistmarker --destination /tmp/cdist_marker --format '+%s'
+# Creates the marker differently.
+__cdistmarker --destination /tmp/cdist_marker --format '+%s'
+--------------------------------------------------------------------------------
-AUTHORS
--------
-Daniel Maher
+SEE ALSO
+--------
+- cdist-type(7)
COPYING
-------
-Copyright \(C) 2011 Daniel Maher. 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.
+Copyright \(C) 2011 Daniel Maher. Free use of this software is granted under
+the terms of the GNU General Public License version 3 (GPLv3).
diff --git a/cdist/conf/type/__check_messages/gencode-remote b/cdist/conf/type/__check_messages/gencode-remote
deleted file mode 100755
index ec36cecc..00000000
--- a/cdist/conf/type/__check_messages/gencode-remote
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh -e
-#
-# 2019 Ander Punnar (ander-at-kvlt-dot-ee)
-#
-# This file is part of cdist.
-#
-# cdist is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# cdist is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with cdist. If not, see .
-#
-
-if grep -Eq \
- "$( cat "$__object/parameter/pattern" )" \
- "$__messages_in"
-then
- tee "$__messages_out" < "$__object/parameter/execute"
-fi
diff --git a/cdist/conf/type/__check_messages/man.rst b/cdist/conf/type/__check_messages/man.rst
deleted file mode 100644
index 5c80a0ae..00000000
--- a/cdist/conf/type/__check_messages/man.rst
+++ /dev/null
@@ -1,52 +0,0 @@
-cdist-type__check_messages(7)
-=============================
-
-NAME
-----
-cdist-type__check_messages - Check messages for pattern and execute command on match.
-
-
-DESCRIPTION
------------
-Check messages for pattern and execute command on match.
-
-This type is useful if you chain together multiple related types using
-dependencies and want to restart service if at least one type changes
-something.
-
-For more information about messages see `cdist messaging `_.
-
-For more information about dependencies and execution order see
-`cdist manifest `_ documentation.
-
-
-REQUIRED PARAMETERS
--------------------
-pattern
- Extended regular expression pattern for search (passed to ``grep -E``).
-
-execute
- Command to execute on pattern match.
-
-
-EXAMPLES
---------
-
-.. code-block:: sh
-
- __check_messages munin \
- --pattern '^__(file|link|line)/etc/munin/' \
- --execute 'service munin-node restart'
-
-
-AUTHORS
--------
-Ander Punnar
-
-
-COPYING
--------
-Copyright \(C) 2019 Ander Punnar. You can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
diff --git a/cdist/conf/type/__check_messages/parameter/required b/cdist/conf/type/__check_messages/parameter/required
deleted file mode 100644
index 374363cb..00000000
--- a/cdist/conf/type/__check_messages/parameter/required
+++ /dev/null
@@ -1,2 +0,0 @@
-pattern
-execute
diff --git a/cdist/conf/type/__chroot_mount/gencode-local b/cdist/conf/type/__chroot_mount/gencode-local
deleted file mode 100755
index b131346c..00000000
--- a/cdist/conf/type/__chroot_mount/gencode-local
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh -e
-#
-# 2016 Steven Armstrong (steven-cdist at armstrong.cc)
-#
-# This file is part of cdist.
-#
-# cdist is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# cdist is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with cdist. If not, see .
-#
-
-chroot="/$__object_id"
-
-if [ -f "$__object/parameter/manage-resolv-conf" ]; then
- suffix="$(cat "$__object/parameter/manage-resolv-conf")"
- resolv_conf="${chroot}/etc/resolv.conf"
- original_resolv_conf="${resolv_conf}.${suffix}"
- cat << DONE
-$__remote_exec $__target_host << EOSSH
-if [ -f "${resolv_conf}" ]; then
- mv "${resolv_conf}" "${original_resolv_conf}"
-fi
-# copy hosts resolv.conf into chroot
-cp /etc/resolv.conf "${resolv_conf}"
-EOSSH
-DONE
-fi
diff --git a/cdist/conf/type/__chroot_mount/gencode-remote b/cdist/conf/type/__chroot_mount/gencode-remote
index 4fbb3ffc..6d855f41 100755
--- a/cdist/conf/type/__chroot_mount/gencode-remote
+++ b/cdist/conf/type/__chroot_mount/gencode-remote
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/sh
#
# 2012 Steven Armstrong (steven-cdist at armstrong.cc)
#
@@ -41,4 +41,8 @@ mountpoint -q "${chroot}/dev/pts" \
[ -d "${chroot}/tmp" ] || mkdir -m 1777 "${chroot}/tmp"
mountpoint -q "${chroot}/tmp" \
|| mount -t tmpfs -o mode=1777,strictatime,nodev,nosuid tmpfs "${chroot}/tmp"
+
+if [ ! -f "${chroot}/etc/resolv.conf" ]; then
+ cp /etc/resolv.conf "${chroot}/etc/"
+fi
DONE
diff --git a/cdist/conf/type/__chroot_mount/man.rst b/cdist/conf/type/__chroot_mount/man.rst
deleted file mode 100644
index 41fd496b..00000000
--- a/cdist/conf/type/__chroot_mount/man.rst
+++ /dev/null
@@ -1,55 +0,0 @@
-cdist-type__chroot_mount(7)
-===========================
-
-NAME
-----
-cdist-type__chroot_mount - mount a chroot
-
-
-DESCRIPTION
------------
-Mount and prepare a chroot for running commands within it.
-
-
-REQUIRED PARAMETERS
--------------------
-None
-
-
-OPTIONAL PARAMETERS
--------------------
-manage-resolv-conf
- manage /etc/resolv.conf inside the chroot.
- Use the value of this parameter as the suffix to save a copy
- of the current /etc/resolv.conf to /etc/resolv.conf.$suffix.
- This is used by the __chroot_umount type to restore the initial
- file content when unmounting the chroot.
-
-
-BOOLEAN PARAMETERS
-------------------
-None.
-
-
-EXAMPLES
---------
-
-.. code-block:: sh
-
- __chroot_mount /path/to/chroot
-
- __chroot_mount /path/to/chroot \
- --manage-resolv-conf "some-known-string"
-
-
-AUTHORS
--------
-Steven Armstrong
-
-
-COPYING
--------
-Copyright \(C) 2012-2017 Steven Armstrong. You can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
diff --git a/cdist/conf/type/__chroot_mount/man.text b/cdist/conf/type/__chroot_mount/man.text
new file mode 100644
index 00000000..adce80d9
--- /dev/null
+++ b/cdist/conf/type/__chroot_mount/man.text
@@ -0,0 +1,42 @@
+cdist-type__install_chroot_mount(7)
+===================================
+Steven Armstrong
+
+
+NAME
+----
+cdist-type__install_chroot_mount - mount a chroot
+
+
+DESCRIPTION
+-----------
+Mount and prepare a chroot for running commands within it.
+
+
+REQUIRED PARAMETERS
+-------------------
+None.
+
+
+OPTIONAL PARAMETERS
+-------------------
+None.
+
+
+EXAMPLES
+--------
+
+--------------------------------------------------------------------------------
+__install_chroot_mount /path/to/chroot
+--------------------------------------------------------------------------------
+
+
+SEE ALSO
+--------
+- cdist-type(7)
+
+
+COPYING
+-------
+Copyright \(C) 2012 Steven Armstrong. Free use of this software is
+granted under the terms of the GNU General Public License version 3 (GPLv3).
diff --git a/cdist/conf/type/__chroot_mount/parameter/optional b/cdist/conf/type/__chroot_mount/parameter/optional
deleted file mode 100644
index 27928f2c..00000000
--- a/cdist/conf/type/__chroot_mount/parameter/optional
+++ /dev/null
@@ -1 +0,0 @@
-manage-resolv-conf
diff --git a/cdist/conf/type/__chroot_umount/gencode-local b/cdist/conf/type/__chroot_umount/gencode-local
deleted file mode 100755
index b3cb69c6..00000000
--- a/cdist/conf/type/__chroot_umount/gencode-local
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh -e
-#
-# 2016 Steven Armstrong (steven-cdist at armstrong.cc)
-#
-# This file is part of cdist.
-#
-# cdist is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# cdist is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with cdist. If not, see .
-#
-
-chroot="/$__object_id"
-
-if [ -f "$__object/parameter/manage-resolv-conf" ]; then
- suffix="$(cat "$__object/parameter/manage-resolv-conf")"
- resolv_conf="${chroot}/etc/resolv.conf"
- original_resolv_conf="${resolv_conf}.${suffix}"
-cat << DONE
-$__remote_exec $__target_host << EOSSH
-if [ -f "${original_resolv_conf}" ]; then
- # restore original /etc/resolv.conf that we moved out of the way
- # in __chroot_mount/gencode-local
- mv -f "${original_resolv_conf}" "${resolv_conf}"
-fi
-EOSSH
-DONE
-fi
diff --git a/cdist/conf/type/__chroot_umount/gencode-remote b/cdist/conf/type/__chroot_umount/gencode-remote
index ff669e1b..caf2c40c 100755
--- a/cdist/conf/type/__chroot_umount/gencode-remote
+++ b/cdist/conf/type/__chroot_umount/gencode-remote
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/sh
#
# 2012 Steven Armstrong (steven-cdist at armstrong.cc)
#
@@ -26,6 +26,7 @@ umount -l "${chroot}/dev/pts"
umount -l "${chroot}/dev"
umount -l "${chroot}/sys"
umount -l "${chroot}/proc"
+rm -f "${chroot}/etc/resolv.conf"
if [ -d "${chroot}/etc/resolvconf/resolv.conf.d" ]; then
# ensure /etc/resolvconf/resolv.conf.d/tail is not linked to \
# e.g. /etc/resolvconf/resolv.conf.d/original
diff --git a/cdist/conf/type/__chroot_umount/man.rst b/cdist/conf/type/__chroot_umount/man.rst
deleted file mode 100644
index 2a15f362..00000000
--- a/cdist/conf/type/__chroot_umount/man.rst
+++ /dev/null
@@ -1,60 +0,0 @@
-cdist-type__chroot_umount(7)
-============================
-
-NAME
-----
-cdist-type__chroot_umount - unmount a chroot mounted by __chroot_mount
-
-
-DESCRIPTION
------------
-Undo what __chroot_mount did.
-
-
-REQUIRED PARAMETERS
--------------------
-None
-
-
-OPTIONAL PARAMETERS
--------------------
-manage-resolv-conf
- manage /etc/resolv.conf inside the chroot.
- Use the value of this parameter as the suffix to find the backup file
- that was saved by the __chroot_mount.
- This is used by the to restore the initial file content when unmounting
- the chroot.
-
-
-BOOLEAN PARAMETERS
-------------------
-None.
-
-
-EXAMPLES
---------
-
-.. code-block:: sh
-
- __chroot_umount /path/to/chroot
-
- __chroot_umount /path/to/chroot \
- --manage-resolv-conf "some-known-string"
-
-
-SEE ALSO
---------
-:strong:`cdist-type__chroot_mount`\ (7)
-
-
-AUTHORS
--------
-Steven Armstrong
-
-
-COPYING
--------
-Copyright \(C) 2012-2017 Steven Armstrong. You can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
diff --git a/cdist/conf/type/__chroot_umount/man.text b/cdist/conf/type/__chroot_umount/man.text
new file mode 100644
index 00000000..a5ca1ef0
--- /dev/null
+++ b/cdist/conf/type/__chroot_umount/man.text
@@ -0,0 +1,42 @@
+cdist-type__install_chroot_umount(7)
+====================================
+Steven Armstrong
+
+
+NAME
+----
+cdist-type__install_chroot_umount - unmount a chroot mounted by __chroot_mount
+
+
+DESCRIPTION
+-----------
+Undo what __chroot_mount did.
+
+
+REQUIRED PARAMETERS
+-------------------
+None.
+
+
+OPTIONAL PARAMETERS
+-------------------
+None.
+
+
+EXAMPLES
+--------
+
+--------------------------------------------------------------------------------
+__install_chroot_umount /path/to/chroot
+--------------------------------------------------------------------------------
+
+
+SEE ALSO
+--------
+- cdist-type(7)
+
+
+COPYING
+-------
+Copyright \(C) 2012 Steven Armstrong. Free use of this software is
+granted under the terms of the GNU General Public License version 3 (GPLv3).
diff --git a/cdist/conf/type/__chroot_umount/manifest b/cdist/conf/type/__chroot_umount/manifest
deleted file mode 100755
index b3cb69c6..00000000
--- a/cdist/conf/type/__chroot_umount/manifest
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh -e
-#
-# 2016 Steven Armstrong (steven-cdist at armstrong.cc)
-#
-# This file is part of cdist.
-#
-# cdist is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# cdist is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with cdist. If not, see .
-#
-
-chroot="/$__object_id"
-
-if [ -f "$__object/parameter/manage-resolv-conf" ]; then
- suffix="$(cat "$__object/parameter/manage-resolv-conf")"
- resolv_conf="${chroot}/etc/resolv.conf"
- original_resolv_conf="${resolv_conf}.${suffix}"
-cat << DONE
-$__remote_exec $__target_host << EOSSH
-if [ -f "${original_resolv_conf}" ]; then
- # restore original /etc/resolv.conf that we moved out of the way
- # in __chroot_mount/gencode-local
- mv -f "${original_resolv_conf}" "${resolv_conf}"
-fi
-EOSSH
-DONE
-fi
diff --git a/cdist/conf/type/__chroot_umount/parameter/optional b/cdist/conf/type/__chroot_umount/parameter/optional
deleted file mode 100644
index 27928f2c..00000000
--- a/cdist/conf/type/__chroot_umount/parameter/optional
+++ /dev/null
@@ -1 +0,0 @@
-manage-resolv-conf
diff --git a/cdist/conf/type/__clean_path/explorer/list b/cdist/conf/type/__clean_path/explorer/list
deleted file mode 100755
index 2bdc63a5..00000000
--- a/cdist/conf/type/__clean_path/explorer/list
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/sh -e
-#
-# 2019 Ander Punnar (ander-at-kvlt-dot-ee)
-#
-# This file is part of cdist.
-#
-# cdist is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# cdist is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with cdist. If not, see .
-#
-
-if [ -f "$__object/parameter/path" ]
-then
- path="$( cat "$__object/parameter/path" )"
-else
- path="/$__object_id"
-fi
-
-[ ! -d "$path" ] && exit 0
-
-pattern="$( cat "$__object/parameter/pattern" )"
-
-if [ -f "$__object/parameter/exclude" ]
-then
- exclude="$( cat "$__object/parameter/exclude" )"
-
- find "$path" -mindepth 1 -maxdepth 1 -regex "$pattern" \
- -and -not -regex "$exclude"
-else
- find "$path" -mindepth 1 -maxdepth 1 -regex "$pattern"
-fi
diff --git a/cdist/conf/type/__clean_path/gencode-remote b/cdist/conf/type/__clean_path/gencode-remote
deleted file mode 100755
index 2899c4a5..00000000
--- a/cdist/conf/type/__clean_path/gencode-remote
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/sh -e
-#
-# 2019 Ander Punnar (ander-at-kvlt-dot-ee)
-#
-# This file is part of cdist.
-#
-# cdist is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# cdist is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with cdist. If not, see .
-#
-
-[ ! -s "$__object/explorer/list" ] && exit 0
-
-if [ -f "$__object/parameter/path" ]
-then
- path="$( cat "$__object/parameter/path" )"
-else
- path="/$__object_id"
-fi
-
-pattern="$( cat "$__object/parameter/pattern" )"
-
-if [ -f "$__object/parameter/exclude" ]
-then
- exclude="$( cat "$__object/parameter/exclude" )"
-
- echo "find '$path' -mindepth 1 -maxdepth 1 -regex '$pattern'" \
- "-and -not -regex '$exclude'" \
- '-exec rm -rf {} \;'
-else
- echo "find '$path' -mindepth 1 -maxdepth 1 -regex '$pattern'" \
- '-exec rm -rf {} \;'
-fi
-
-while read -r f
-do
- echo "removed '$f'" >> "$__messages_out"
-done \
-< "$__object/explorer/list"
-
-if [ -f "$__object/parameter/onchange" ]
-then
- cat "$__object/parameter/onchange"
-fi
diff --git a/cdist/conf/type/__clean_path/man.rst b/cdist/conf/type/__clean_path/man.rst
deleted file mode 100644
index 31d90701..00000000
--- a/cdist/conf/type/__clean_path/man.rst
+++ /dev/null
@@ -1,68 +0,0 @@
-cdist-type__clean_path(7)
-=========================
-
-NAME
-----
-cdist-type__clean_path - Remove files and directories which match the pattern.
-
-
-DESCRIPTION
------------
-Remove files and directories which match the pattern.
-
-Provided path must be a directory.
-
-Patterns are passed to ``find``'s ``-regex`` - see ``find(1)`` for more details.
-
-Look up of files and directories is non-recursive (``-maxdepth 1``).
-
-Parent directory is excluded (``-mindepth 1``).
-
-This type is not POSIX compatible (sorry, Solaris users).
-
-
-REQUIRED PARAMETERS
--------------------
-pattern
- Pattern of files which are removed from path.
-
-
-OPTIONAL PARAMETERS
--------------------
-path
- Path which will be cleaned. Defaults to ``$__object_id``.
-
-exclude
- Pattern of files which are excluded from removal.
-
-onchange
- The code to run if files or directories were removed.
-
-
-EXAMPLES
---------
-
-.. code-block:: sh
-
- __clean_path /etc/apache2/conf-enabled \
- --pattern '.+' \
- --exclude '.+\(charset\.conf\|security\.conf\)' \
- --onchange 'service apache2 restart'
-
- __clean_path apache2-conf-enabled \
- --path /etc/apache2/conf-enabled \
- --pattern '.+' \
- --exclude '.+\(charset\.conf\|security\.conf\)' \
- --onchange 'service apache2 restart'
-
-AUTHORS
--------
-Ander Punnar
-
-
-COPYING
--------
-Copyright \(C) 2019 Ander Punnar. You can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
diff --git a/cdist/conf/type/__clean_path/parameter/optional b/cdist/conf/type/__clean_path/parameter/optional
deleted file mode 100644
index 3b97f71c..00000000
--- a/cdist/conf/type/__clean_path/parameter/optional
+++ /dev/null
@@ -1,3 +0,0 @@
-exclude
-onchange
-path
diff --git a/cdist/conf/type/__clean_path/parameter/required b/cdist/conf/type/__clean_path/parameter/required
deleted file mode 100644
index 54774947..00000000
--- a/cdist/conf/type/__clean_path/parameter/required
+++ /dev/null
@@ -1 +0,0 @@
-pattern
diff --git a/cdist/conf/type/__config_file/gencode-remote b/cdist/conf/type/__config_file/gencode-remote
index 5f1626be..e9b38c35 100755
--- a/cdist/conf/type/__config_file/gencode-remote
+++ b/cdist/conf/type/__config_file/gencode-remote
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/sh
#
# 2015 Steven Armstrong (steven-cdist at armstrong.cc)
#
@@ -19,9 +19,16 @@
#
destination="$__object_id"
+state="$(cat "$__object/parameter/state")"
+
+if [ "$state" = "absent" ]; then
+ # nothing to do
+ exit 0
+fi
if [ -f "$__object/parameter/onchange" ]; then
if grep -q "^__file/${destination}" "$__messages_in"; then
cat "$__object/parameter/onchange"
fi
fi
+
diff --git a/cdist/conf/type/__config_file/man.rst b/cdist/conf/type/__config_file/man.rst
deleted file mode 100644
index 5e0e58bd..00000000
--- a/cdist/conf/type/__config_file/man.rst
+++ /dev/null
@@ -1,64 +0,0 @@
-cdist-type__config_file(7)
-==========================
-
-NAME
-----
-cdist-type__config_file - _Manages config files
-
-
-DESCRIPTION
------------
-Deploy config files using the file type.
-Run the given code if the files changes.
-
-
-REQUIRED PARAMETERS
--------------------
-None.
-
-
-OPTIONAL PARAMETERS
--------------------
-group
- see cdist-type__file
-mode
- see cdist-type__file
-onchange
- the code to run if the file changes
-owner
- see cdist-type__file
-source
- Path to the config file.
- If source is '-' (dash), take what was written to stdin as the config file content.
-state
- see cdist-type__file
-
-
-EXAMPLES
---------
-
-.. code-block:: sh
-
- __config_file /etc/consul/conf.d/watch_foo.json \
- --owner root --group consul --mode 640 \
- --source "$__type/files/watch_foo.json" \
- --state present \
- --onchange 'service consul status >/dev/null && service consul reload || true'
-
-
-SEE ALSO
---------
-:strong:`cdist-type__file`\ (7)
-
-
-AUTHORS
--------
-Steven Armstrong
-
-
-COPYING
--------
-Copyright \(C) 2015 Steven Armstrong. You can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
diff --git a/cdist/conf/type/__config_file/man.text b/cdist/conf/type/__config_file/man.text
new file mode 100644
index 00000000..a4ec7363
--- /dev/null
+++ b/cdist/conf/type/__config_file/man.text
@@ -0,0 +1,60 @@
+cdist-type__config_file(7)
+==========================
+Steven Armstrong
+
+
+NAME
+----
+cdist-type__config_file - manages config files
+
+
+DESCRIPTION
+-----------
+Deploy config files using the file type.
+Run the given code if the files changes.
+
+
+REQUIRED PARAMETERS
+-------------------
+None.
+
+
+OPTIONAL PARAMETERS
+-------------------
+group::
+ see cdist-type__file
+mode::
+ see cdist-type__file
+onchange::
+ the code to run if the file changes
+owner::
+ see cdist-type__file
+source::
+ Path to the config file.
+ If source is '-' (dash), take what was written to stdin as the config file content.
+state::
+ see cdist-type__file
+
+
+EXAMPLES
+--------
+
+--------------------------------------------------------------------------------
+__config_file /etc/consul/conf.d/watch_foo.json \
+ --owner root --group consul --mode 640 \
+ --source "$__type/files/watch_foo.json" \
+ --state present \
+ --onchange 'service consul status >/dev/null && service consul reload || true'
+--------------------------------------------------------------------------------
+
+
+SEE ALSO
+--------
+- cdist-type(7)
+- cdist-type__file(7)
+
+
+COPYING
+-------
+Copyright \(C) 2015 Steven Armstrong. Free use of this software is
+granted under the terms of the GNU General Public License version 3 (GPLv3).
diff --git a/cdist/conf/type/__config_file/manifest b/cdist/conf/type/__config_file/manifest
index be8f9f67..29add8b7 100755
--- a/cdist/conf/type/__config_file/manifest
+++ b/cdist/conf/type/__config_file/manifest
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/sh
#
# 2015 Steven Armstrong (steven-cdist at armstrong.cc)
#
@@ -19,8 +19,7 @@
#
set -- "/${__object_id}"
-cd "$__object/parameter/"
-for param in *; do
+for param in $(ls "$__object/parameter/"); do
case "$param" in
source)
source="$(cat "$__object/parameter/source")"
diff --git a/cdist/conf/type/__consul/files/versions/0.5.2/cksum b/cdist/conf/type/__consul/files/versions/0.5.2/cksum
deleted file mode 100644
index 1c077266..00000000
--- a/cdist/conf/type/__consul/files/versions/0.5.2/cksum
+++ /dev/null
@@ -1 +0,0 @@
-2207534901 18245010 consul
diff --git a/cdist/conf/type/__consul/files/versions/0.5.2/source b/cdist/conf/type/__consul/files/versions/0.5.2/source
deleted file mode 100644
index 43b43d55..00000000
--- a/cdist/conf/type/__consul/files/versions/0.5.2/source
+++ /dev/null
@@ -1 +0,0 @@
-https://releases.hashicorp.com/consul/0.5.2/consul_0.5.2_linux_amd64.zip
diff --git a/cdist/conf/type/__consul/files/versions/0.6.0/cksum b/cdist/conf/type/__consul/files/versions/0.6.0/cksum
deleted file mode 100644
index bf41a9b8..00000000
--- a/cdist/conf/type/__consul/files/versions/0.6.0/cksum
+++ /dev/null
@@ -1 +0,0 @@
-688442448 19798264 consul
diff --git a/cdist/conf/type/__consul/files/versions/0.6.0/source b/cdist/conf/type/__consul/files/versions/0.6.0/source
deleted file mode 100644
index 691f2a87..00000000
--- a/cdist/conf/type/__consul/files/versions/0.6.0/source
+++ /dev/null
@@ -1 +0,0 @@
-https://releases.hashicorp.com/consul/0.6.0/consul_0.6.0_linux_amd64.zip
diff --git a/cdist/conf/type/__consul/files/versions/0.6.1/cksum b/cdist/conf/type/__consul/files/versions/0.6.1/cksum
deleted file mode 100644
index aa354351..00000000
--- a/cdist/conf/type/__consul/files/versions/0.6.1/cksum
+++ /dev/null
@@ -1 +0,0 @@
-3100584780 20416856 consul
diff --git a/cdist/conf/type/__consul/files/versions/0.6.1/source b/cdist/conf/type/__consul/files/versions/0.6.1/source
deleted file mode 100644
index 3b20388f..00000000
--- a/cdist/conf/type/__consul/files/versions/0.6.1/source
+++ /dev/null
@@ -1 +0,0 @@
-https://releases.hashicorp.com/consul/0.6.1/consul_0.6.1_linux_amd64.zip
diff --git a/cdist/conf/type/__consul/files/versions/0.6.2/cksum b/cdist/conf/type/__consul/files/versions/0.6.2/cksum
deleted file mode 100644
index 9c0b35c5..00000000
--- a/cdist/conf/type/__consul/files/versions/0.6.2/cksum
+++ /dev/null
@@ -1 +0,0 @@
-2124180907 20416920 consul
diff --git a/cdist/conf/type/__consul/files/versions/0.6.2/source b/cdist/conf/type/__consul/files/versions/0.6.2/source
deleted file mode 100644
index b0c6eeed..00000000
--- a/cdist/conf/type/__consul/files/versions/0.6.2/source
+++ /dev/null
@@ -1 +0,0 @@
-https://releases.hashicorp.com/consul/0.6.2/consul_0.6.2_linux_amd64.zip
diff --git a/cdist/conf/type/__consul/files/versions/0.6.3/cksum b/cdist/conf/type/__consul/files/versions/0.6.3/cksum
deleted file mode 100644
index 886d01bb..00000000
--- a/cdist/conf/type/__consul/files/versions/0.6.3/cksum
+++ /dev/null
@@ -1 +0,0 @@
-1832669072 20417720 consul
diff --git a/cdist/conf/type/__consul/files/versions/0.6.3/source b/cdist/conf/type/__consul/files/versions/0.6.3/source
deleted file mode 100644
index fef668be..00000000
--- a/cdist/conf/type/__consul/files/versions/0.6.3/source
+++ /dev/null
@@ -1 +0,0 @@
-https://releases.hashicorp.com/consul/0.6.3/consul_0.6.3_linux_amd64.zip
diff --git a/cdist/conf/type/__consul/files/versions/0.6.4/cksum b/cdist/conf/type/__consul/files/versions/0.6.4/cksum
deleted file mode 100644
index 1124b7aa..00000000
--- a/cdist/conf/type/__consul/files/versions/0.6.4/cksum
+++ /dev/null
@@ -1 +0,0 @@
-3832641574 23002736 consul
diff --git a/cdist/conf/type/__consul/files/versions/0.6.4/source b/cdist/conf/type/__consul/files/versions/0.6.4/source
deleted file mode 100644
index 96879b8d..00000000
--- a/cdist/conf/type/__consul/files/versions/0.6.4/source
+++ /dev/null
@@ -1 +0,0 @@
-https://releases.hashicorp.com/consul/0.6.4/consul_0.6.4_linux_amd64.zip
diff --git a/cdist/conf/type/__consul/files/versions/0.7.0/cksum b/cdist/conf/type/__consul/files/versions/0.7.0/cksum
deleted file mode 100644
index 3bffeedb..00000000
--- a/cdist/conf/type/__consul/files/versions/0.7.0/cksum
+++ /dev/null
@@ -1 +0,0 @@
-695240564 24003648 consul
diff --git a/cdist/conf/type/__consul/files/versions/0.7.0/source b/cdist/conf/type/__consul/files/versions/0.7.0/source
deleted file mode 100644
index ad610fc7..00000000
--- a/cdist/conf/type/__consul/files/versions/0.7.0/source
+++ /dev/null
@@ -1 +0,0 @@
-https://releases.hashicorp.com/consul/0.7.0/consul_0.7.0_linux_amd64.zip
diff --git a/cdist/conf/type/__consul/files/versions/0.7.1/cksum b/cdist/conf/type/__consul/files/versions/0.7.1/cksum
deleted file mode 100644
index 476bd9f6..00000000
--- a/cdist/conf/type/__consul/files/versions/0.7.1/cksum
+++ /dev/null
@@ -1 +0,0 @@
-3128343188 28402769 consul
diff --git a/cdist/conf/type/__consul/files/versions/0.7.1/source b/cdist/conf/type/__consul/files/versions/0.7.1/source
deleted file mode 100644
index 6ba2e7bf..00000000
--- a/cdist/conf/type/__consul/files/versions/0.7.1/source
+++ /dev/null
@@ -1 +0,0 @@
-https://releases.hashicorp.com/consul/0.7.1/consul_0.7.1_linux_amd64.zip
diff --git a/cdist/conf/type/__consul/files/versions/0.8.1/cksum b/cdist/conf/type/__consul/files/versions/0.8.1/cksum
deleted file mode 100644
index 9125cc8f..00000000
--- a/cdist/conf/type/__consul/files/versions/0.8.1/cksum
+++ /dev/null
@@ -1 +0,0 @@
-283033689 36101209 consul
diff --git a/cdist/conf/type/__consul/files/versions/0.8.1/source b/cdist/conf/type/__consul/files/versions/0.8.1/source
deleted file mode 100644
index 92386c7c..00000000
--- a/cdist/conf/type/__consul/files/versions/0.8.1/source
+++ /dev/null
@@ -1 +0,0 @@
-https://releases.hashicorp.com/consul/0.8.1/consul_0.8.1_linux_amd64.zip
diff --git a/cdist/conf/type/__consul/files/versions/1.0.6/cksum b/cdist/conf/type/__consul/files/versions/1.0.6/cksum
deleted file mode 100644
index b70b55f4..00000000
--- a/cdist/conf/type/__consul/files/versions/1.0.6/cksum
+++ /dev/null
@@ -1 +0,0 @@
-4120550353 48801129 consul
diff --git a/cdist/conf/type/__consul/files/versions/1.0.6/source b/cdist/conf/type/__consul/files/versions/1.0.6/source
deleted file mode 100644
index 769d3134..00000000
--- a/cdist/conf/type/__consul/files/versions/1.0.6/source
+++ /dev/null
@@ -1 +0,0 @@
-https://releases.hashicorp.com/consul/1.0.6/consul_1.0.6_linux_amd64.zip
diff --git a/cdist/conf/type/__consul/files/versions/1.2.3/cksum b/cdist/conf/type/__consul/files/versions/1.2.3/cksum
deleted file mode 100644
index 6352409e..00000000
--- a/cdist/conf/type/__consul/files/versions/1.2.3/cksum
+++ /dev/null
@@ -1 +0,0 @@
-191982 110369685
diff --git a/cdist/conf/type/__consul/files/versions/1.2.3/source b/cdist/conf/type/__consul/files/versions/1.2.3/source
deleted file mode 100644
index 5e67bc37..00000000
--- a/cdist/conf/type/__consul/files/versions/1.2.3/source
+++ /dev/null
@@ -1 +0,0 @@
-https://releases.hashicorp.com/consul/1.2.3/consul_1.2.3_linux_amd64.zip
diff --git a/cdist/conf/type/__consul/files/versions/1.3.0/cksum b/cdist/conf/type/__consul/files/versions/1.3.0/cksum
deleted file mode 100644
index 7a885378..00000000
--- a/cdist/conf/type/__consul/files/versions/1.3.0/cksum
+++ /dev/null
@@ -1 +0,0 @@
-1714523667 98363467 consul
diff --git a/cdist/conf/type/__consul/files/versions/1.3.0/source b/cdist/conf/type/__consul/files/versions/1.3.0/source
deleted file mode 100644
index 18a1ba8e..00000000
--- a/cdist/conf/type/__consul/files/versions/1.3.0/source
+++ /dev/null
@@ -1 +0,0 @@
-https://releases.hashicorp.com/consul/1.3.0/consul_1.3.0_linux_amd64.zip
diff --git a/cdist/conf/type/__consul/files/versions/1.5.0/cksum b/cdist/conf/type/__consul/files/versions/1.5.0/cksum
deleted file mode 100644
index efca9caa..00000000
--- a/cdist/conf/type/__consul/files/versions/1.5.0/cksum
+++ /dev/null
@@ -1 +0,0 @@
-886614099 103959898 consul
diff --git a/cdist/conf/type/__consul/files/versions/1.5.0/source b/cdist/conf/type/__consul/files/versions/1.5.0/source
deleted file mode 100644
index cafa9248..00000000
--- a/cdist/conf/type/__consul/files/versions/1.5.0/source
+++ /dev/null
@@ -1 +0,0 @@
-https://releases.hashicorp.com/consul/1.5.0/consul_1.5.0_linux_amd64.zip
diff --git a/cdist/conf/type/__consul/gencode-remote b/cdist/conf/type/__consul/gencode-remote
deleted file mode 100755
index 2a21054f..00000000
--- a/cdist/conf/type/__consul/gencode-remote
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/bin/sh -e
-#
-# 2018 Darko Poljak (darko.poljak at gmail.com)
-#
-# This file is part of cdist.
-#
-# cdist is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# cdist is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with cdist. If not, see .
-#
-
-#set -x
-
-if [ ! -f "$__object/parameter/direct" ]; then
- # Nothing here, staged file is used.
- exit 0
-fi
-
-state=$(cat "$__object/parameter/state")
-destination="/usr/local/bin/consul"
-
-if [ "$state" = "absent" ]; then
- printf 'rm -f "%s"' "$destination"
- exit 0
-fi
-
-versions_dir="$__type/files/versions"
-version="$(cat "$__object/parameter/version")"
-version_dir="$versions_dir/$version"
-
-source=$(cat "$version_dir/source")
-source_file_name="${source##*/}"
-cksum_should=$(cut -d' ' -f1,2 "$version_dir/cksum")
-
-cat << eof
- tmpdir=\$(mktemp -d -p /tmp "${__type##*/}.XXXXXXXXXX")
- curl -s -L "$source" > "\$tmpdir/$source_file_name"
- unzip -p "\$tmpdir/$source_file_name" > "${destination}.tmp"
- rm -rf "\$tmpdir"
-
- cksum_is=\$(cksum "${destination}.tmp" | cut -d' ' -f1,2)
- if [ "\$cksum_is" = "$cksum_should" ]; then
- rm -f "${destination}"
- mv "${destination}.tmp" "${destination}"
- chown root:root "$destination"
- chmod 755 "$destination"
- else
- rm -f "${destination}.tmp"
- echo "Failed to verify checksum for $__object_name" >&2
- exit 1
- fi
-eof
-
-echo "/usr/local/bin/consul created" >> "$__messages_out"
diff --git a/cdist/conf/type/__consul/man.rst b/cdist/conf/type/__consul/man.rst
deleted file mode 100644
index 5b2db50a..00000000
--- a/cdist/conf/type/__consul/man.rst
+++ /dev/null
@@ -1,75 +0,0 @@
-cdist-type__consul(7)
-=====================
-
-NAME
-----
-cdist-type__consul - Install consul
-
-
-DESCRIPTION
------------
-Downloads and installs the consul binary from https://dl.bintray.com/mitchellh/consul.
-Note that the consul binary is downloaded on the server (the machine running
-cdist) and then deployed to the target host using the __file type unless --direct
-parameter is used.
-
-
-REQUIRED PARAMETERS
--------------------
-None.
-
-
-OPTIONAL PARAMETERS
--------------------
-state
- either 'present' or 'absent'. Defaults to 'present'
-
-version
- which version of consul to install. See ./files/versions for a list of
- supported versions. Defaults to the latest known version.
-
-
-BOOLEAN PARAMETERS
-------------------
-direct
- Download and deploy consul binary directly on the target machine.
-
-
-MESSAGES
---------
-If consul binary is created using __staged_file then underlaying __file type messages are emitted.
-
-If consul binary is created by direct method then the following messages are emitted:
-
-/usr/local/bin/consul created
- consul binary was created
-
-
-EXAMPLES
---------
-
-.. code-block:: sh
-
- # just install using defaults
- __consul
-
- # install by downloading consul binary directly on the target machine
- __consul --direct
-
- # specific version
- __consul \
- --version 0.4.1
-
-
-AUTHORS
--------
-| Steven Armstrong
-| Darko Poljak
-
-
-COPYING
--------
-Copyright \(C) 2015 Steven Armstrong. You can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
diff --git a/cdist/conf/type/__consul/man.text b/cdist/conf/type/__consul/man.text
new file mode 100644
index 00000000..5ebaf1e8
--- /dev/null
+++ b/cdist/conf/type/__consul/man.text
@@ -0,0 +1,54 @@
+cdist-type__consul(7)
+=====================
+Steven Armstrong
+
+
+NAME
+----
+cdist-type__consul - install consul
+
+
+DESCRIPTION
+-----------
+Downloads and installs the consul binary from https://dl.bintray.com/mitchellh/consul.
+Note that the consul binary is downloaded on the server (the machine running
+cdist) and then deployed to the target host using the __file type.
+
+
+REQUIRED PARAMETERS
+-------------------
+None.
+
+
+OPTIONAL PARAMETERS
+-------------------
+state::
+ either 'present' or 'absent'. Defaults to 'present'
+
+version::
+ which version of consul to install. See ./files/versions for a list of
+ supported versions. Defaults to the latest known version.
+
+
+EXAMPLES
+--------
+
+--------------------------------------------------------------------------------
+# just install using defaults
+__consul
+
+# specific version
+__consul \
+ --version 0.4.1
+--------------------------------------------------------------------------------
+
+
+SEE ALSO
+--------
+- cdist-type(7)
+
+
+COPYING
+-------
+Copyright \(C) 2015 Steven Armstrong. Free use of this software is
+granted under the terms of the GNU General Public License version 3 (GPLv3).
diff --git a/cdist/conf/type/__consul/manifest b/cdist/conf/type/__consul/manifest
index 156eb667..ea1a728f 100755
--- a/cdist/conf/type/__consul/manifest
+++ b/cdist/conf/type/__consul/manifest
@@ -1,8 +1,6 @@
-#!/bin/sh -e
+#!/bin/sh
#
# 2015 Steven Armstrong (steven-cdist at armstrong.cc)
-# 2016 Nico Schottelius (nico-cdist at schottelius.org)
-# 2018 Darko Poljak (darko.poljak at gmail.com)
#
# This file is part of cdist.
#
@@ -24,7 +22,7 @@
os=$(cat "$__global/explorer/os")
case "$os" in
- alpine|scientific|centos|redhat|ubuntu|debian|devuan|archlinux|gentoo)
+ centos|redhat|ubuntu|debian|archlinux|gentoo)
# any linux should work
:
;;
@@ -45,17 +43,14 @@ if [ ! -d "$version_dir" ]; then
exit 1
fi
-if [ -f "$__object/parameter/direct" ]; then
- __package unzip
- __package curl
-else
- __staged_file /usr/local/bin/consul \
- --source "$(cat "$version_dir/source")" \
- --cksum "$(cat "$version_dir/cksum")" \
- --fetch-command 'curl -s -L "%s"' \
- --prepare-command 'unzip -p "%s"' \
- --state "$(cat "$__object/parameter/state")" \
- --group root \
- --owner root \
- --mode 755
-fi
+__package unzip
+
+require="__package/unzip" __staged_file /usr/local/bin/consul \
+ --source "$(cat "$version_dir/source")" \
+ --cksum "$(cat "$version_dir/cksum")" \
+ --fetch-command 'curl -s -L "%s"' \
+ --prepare-command 'unzip -p "%s"' \
+ --state "$(cat "$__object/parameter/state")" \
+ --group root \
+ --owner root \
+ --mode 755
diff --git a/cdist/conf/type/__consul/parameter/boolean b/cdist/conf/type/__consul/parameter/boolean
deleted file mode 100644
index aa81b5e0..00000000
--- a/cdist/conf/type/__consul/parameter/boolean
+++ /dev/null
@@ -1 +0,0 @@
-direct
diff --git a/cdist/conf/type/__consul/parameter/default/version b/cdist/conf/type/__consul/parameter/default/version
index af0b7ddb..8f0916f7 100644
--- a/cdist/conf/type/__consul/parameter/default/version
+++ b/cdist/conf/type/__consul/parameter/default/version
@@ -1 +1 @@
-1.0.6
+0.5.0
diff --git a/cdist/conf/type/__consul_agent/files/consul-prepare.upstart b/cdist/conf/type/__consul_agent/files/consul-prepare.upstart
deleted file mode 100644
index 569220d1..00000000
--- a/cdist/conf/type/__consul_agent/files/consul-prepare.upstart
+++ /dev/null
@@ -1,9 +0,0 @@
-start on starting consul
-
-task
-
-script
- mkdir -p /var/run/consul
- chown consul:consul /var/run/consul
- chmod 2770 /var/run/consul
-end script
diff --git a/cdist/conf/type/__consul_agent/files/consul.sys-openrc b/cdist/conf/type/__consul_agent/files/consul.sys-openrc
deleted file mode 100644
index 1dbe9375..00000000
--- a/cdist/conf/type/__consul_agent/files/consul.sys-openrc
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/sbin/openrc-run
-# 2019 Nico Schottelius (nico-cdist at schottelius.org)
-
-description="consul agent"
-
-pidfile="${CONSUL_PIDFILE:-"/var/run/$RC_SVCNAME/pidfile"}"
-command="${CONSUL_BINARY:-"/usr/local/bin/consul"}"
-
-
-checkconfig() {
- if [ ! -d /var/run/consul ] ; then
- mkdir -p /var/run/consul || return 1
- chown consul:consul /var/run/$NAME || return 1
- chmod 2770 /var/run/$NAME || return 1
- fi
-}
-
-start() {
- need net
-
- start-stop-daemon --start --quiet --oknodo \
- --pidfile "$pidfile" --background \
- --exec $command -- agent -pid-file="$pidfile" -config-dir /etc/consul/conf.d
-}
-start_pre() {
- checkconfig
-}
-
-stop() {
- if [ "${RC_CMD}" = "restart" ] ; then
- checkconfig || return 1
- fi
-
- ebegin "Stopping $RC_SVCNAME"
- start-stop-daemon --stop --exec "$command" \
- --pidfile "$pidfile" --quiet
- eend $?
-}
diff --git a/cdist/conf/type/__consul_agent/files/consul.systemd b/cdist/conf/type/__consul_agent/files/consul.systemd
index 8d5fd323..db624fd1 100644
--- a/cdist/conf/type/__consul_agent/files/consul.systemd
+++ b/cdist/conf/type/__consul_agent/files/consul.systemd
@@ -7,11 +7,6 @@ After=basic.target network.target
User=consul
Group=consul
Environment="GOMAXPROCS=2"
-# Run ExecStartPre with root-permissions
-PermissionsStartOnly=true
-ExecStartPre=/usr/bin/mkdir -p /var/run/consul
-ExecStartPre=/usr/bin/chown consul:consul /var/run/consul
-ExecStartPre=/usr/bin/chmod 2770 /var/run/consul
ExecStart=/usr/local/bin/consul agent -config-dir /etc/consul/conf.d
ExecReload=/bin/kill -HUP $MAINPID
KillMode=process
diff --git a/cdist/conf/type/__consul_agent/files/consul.sysv-debian b/cdist/conf/type/__consul_agent/files/consul.sysv-debian
index 4f43c000..f4498041 100644
--- a/cdist/conf/type/__consul_agent/files/consul.sysv-debian
+++ b/cdist/conf/type/__consul_agent/files/consul.sysv-debian
@@ -1,7 +1,6 @@
#!/bin/sh
#
-# 2015-2018 Nico Schottelius (nico-cdist at schottelius.org)
-# 2015 Steven Armstrong (steven-cdist at armstrong.cc)
+# 2015 Nico Schottelius (nico-cdist at schottelius.org)
#
# This file is part of cdist.
#
@@ -18,24 +17,11 @@
# You should have received a copy of the GNU General Public License
# along with cdist. If not, see .
#
-### BEGIN INIT INFO
-# Provides: consul
-# Required-Start: $network $local_fs $remote_fs
-# Required-Stop: $local_fs
-# Should-Start:
-# Should-Stop:
-# Short-Description: consul
-# Description: consul agent
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-### END INIT INFO
if [ -f "/etc/default/consul" ]; then
- # shellcheck disable=SC1091
. /etc/default/consul
fi
-# shellcheck disable=SC1091
. /lib/lsb/init-functions
NAME=consul
@@ -43,10 +29,6 @@ CONSUL=/usr/local/bin/consul
CONFIG=/etc/$NAME/conf.d
PID_FILE=/var/run/$NAME/pidfile
-mkdir -p /var/run/$NAME
-chown consul:consul /var/run/$NAME
-chmod 2770 /var/run/$NAME
-
export PATH="${PATH:+$PATH:}/usr/sbin:/sbin"
case "$1" in
@@ -69,7 +51,7 @@ case "$1" in
log_end_msg 1 || true
fi
;;
-
+
reload)
log_daemon_msg "Reloading consul agent" "consul" || true
if start-stop-daemon --stop --signal HUP --quiet --oknodo --pidfile $PID_FILE --exec $CONSUL; then
diff --git a/cdist/conf/type/__consul_agent/files/consul.sysv-redhat b/cdist/conf/type/__consul_agent/files/consul.sysv-redhat
index 58fc9bd9..9a2aaeb2 100644
--- a/cdist/conf/type/__consul_agent/files/consul.sysv-redhat
+++ b/cdist/conf/type/__consul_agent/files/consul.sysv-redhat
@@ -11,52 +11,47 @@
# pidfile: /var/run/consul/pidfile
# Source function library.
-
-# shellcheck disable=SC1091
. /etc/init.d/functions
NAME=consul
CONSUL=/usr/local/bin/consul
-CONFIG="/etc/$NAME/conf.d"
-PID_FILE="/var/run/$NAME/pidfile"
-LOG_FILE="/var/log/$NAME"
+CONFIG=/etc/$NAME/conf.d
+PID_FILE=/var/run/$NAME/pidfile
+LOG_FILE=/var/log/$NAME
-# shellcheck disable=SC1090
-[ -e "/etc/sysconfig/$NAME" ] && . "/etc/sysconfig/$NAME"
-export GOMAXPROCS="${GOMAXPROCS:-2}"
-
-mkdir -p "/var/run/$NAME"
-chown consul:consul "/var/run/$NAME"
-chmod 2770 "/var/run/$NAME"
+[ -e /etc/sysconfig/$NAME ] && . /etc/sysconfig/$NAME
+export GOMAXPROCS=${GOMAXPROCS:-2}
+mkdir -p /var/run/$NAME
+chown consul /var/run/$NAME
start() {
- printf "Starting %s: " "$NAME"
+ echo -n "Starting $NAME: "
daemon --user=consul \
--pidfile="$PID_FILE" \
"$CONSUL" agent -pid-file="$PID_FILE" -config-dir "$CONFIG" >> "$LOG_FILE" &
retcode=$?
- touch "/var/lock/subsys/$NAME"
- return "$retcode"
+ touch /var/lock/subsys/$NAME
+ return $retcode
}
stop() {
- printf "Shutting down %s: " "$NAME"
- killproc -p "$PID_FILE" "$NAME"
+ echo -n "Shutting down $NAME: "
+ "$CONSUL" leave
retcode=$?
- rm -f "/var/lock/subsys/$NAME"
- return "$retcode"
+ rm -f /var/lock/subsys/$NAME
+ return $retcode
}
case "$1" in
start)
- if status -p "$PID_FILE" "$NAME" >/dev/null; then
+ if $(status -p "$PID_FILE" $NAME >/dev/null); then
echo "$NAME already running"
else
start
fi
;;
stop)
- if status -p "$PID_FILE" "$NAME" >/dev/null; then
+ if $(status -p "$PID_FILE" $NAME >/dev/null); then
stop
else
echo "$NAME not running"
@@ -66,32 +61,32 @@ case "$1" in
"$CONSUL" info
;;
status)
- status -p "$PID_FILE" "$NAME"
+ status -p "$PID_FILE" $NAME
exit $?
;;
restart)
- if status -p "$PID_FILE" "$NAME" >/dev/null; then
+ if $(status -p "$PID_FILE" $NAME >/dev/null); then
stop
fi
start
;;
reload)
- if status -p "$PID_FILE" "$NAME" >/dev/null; then
- kill -HUP "$(cat "$PID_FILE")"
+ if $(status -p "$PID_FILE" $NAME >/dev/null); then
+ kill -HUP `cat $PID_FILE`
else
echo "$NAME not running"
fi
;;
condrestart)
- if [ -f "/var/lock/subsys/$NAME" ]; then
- if status -p "$PID_FILE" "$NAME" >/dev/null; then
+ if [ -f /var/lock/subsys/$NAME ]; then
+ if $(status -p "$PID_FILE" $NAME >/dev/null); then
stop
fi
start
fi
;;
*)
- echo "Usage: $NAME {start|stop|status|reload|restart|condrestart|info}"
+ echo "Usage: $NAME {start|stop|status|reload|restart}"
exit 1
;;
esac
diff --git a/cdist/conf/type/__consul_agent/gencode-remote b/cdist/conf/type/__consul_agent/gencode-remote
index 997aa831..04662967 100755
--- a/cdist/conf/type/__consul_agent/gencode-remote
+++ b/cdist/conf/type/__consul_agent/gencode-remote
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/sh
#
# 2015 Steven Armstrong (steven-cdist at armstrong.cc)
#
diff --git a/cdist/conf/type/__consul_agent/man.rst b/cdist/conf/type/__consul_agent/man.text
similarity index 55%
rename from cdist/conf/type/__consul_agent/man.rst
rename to cdist/conf/type/__consul_agent/man.text
index 62ee70bb..3491eb4c 100644
--- a/cdist/conf/type/__consul_agent/man.rst
+++ b/cdist/conf/type/__consul_agent/man.text
@@ -1,9 +1,11 @@
cdist-type__consul_agent(7)
===========================
+Steven Armstrong
+
NAME
----
-cdist-type__consul_agent - Manage the consul agent
+cdist-type__consul_agent - manage the consul agent
DESCRIPTION
@@ -18,167 +20,133 @@ None.
OPTIONAL PARAMETERS
-------------------
-acl-datacenter
+acl-datacenter::
only used by servers. This designates the datacenter which is authoritative
for ACL information.
-
-acl-default-policy
+acl-default-policy::
either "allow" or "deny"; defaults to "allow". The default policy controls the
behavior of a token when there is no matching rule.
-
-acl-down-policy
+acl-down-policy::
either "allow", "deny" or "extend-cache"; "extend-cache" is the default.
-
-acl-master-token
+acl-master-token::
only used for servers in the acl_datacenter. This token will be created with
management-level permissions if it does not exist. It allows operators to
bootstrap the ACL system with a token ID that is well-known.
-
-acl-token
+acl-token::
when provided, the agent will use this token when making requests to the
Consul servers.
-
-acl-ttl
+acl-ttl::
used to control Time-To-Live caching of ACLs.
-
-bind-addr
+bind-addr::
sets the bind address for cluster communication
-
-bootstrap-expect
+bootstrap-expect::
sets server to expect bootstrap mode
-
-ca-file-source
+ca-file-source::
path to a PEM encoded certificate authority file which will be uploaded and
configure using the ca_file config option.
-
-cert-file-source
+cert-file-source::
path to a PEM encoded certificate file which will be uploaded and
configure using the cert_file config option.
-
-client-addr
+client-addr::
sets the address to bind for client access
-
-datacenter
+datacenter::
datacenter of the agent
-
-encrypt
+encrypt::
provides the gossip encryption key
-
-group
+group::
the primary group for the agent
-
-json-config
+json-config::
path to a partial json config file without leading { and trailing }.
If json-config is '-' (dash), take what was written to stdin as the file content.
-
-key-file-source
+key-file-source::
path to a PEM encoded private key file which will be uploaded and
configure using the key_file config option.
-
-node-name
+node-name::
name of this node. Must be unique in the cluster
-
-retry-join
+retry-join::
address to attempt joining every retry_interval until at least one join works.
Can be specified multiple times.
-
-user
+user::
the user to run the agent as
-
-state
+state::
if the agent is 'present' or 'absent'. Defaults to 'present'.
Currently state=absent is not working due to some dependency issues.
BOOLEAN PARAMETERS
------------------
-disable-remote-exec
+disable-remote-exec::
disables support for remote execution. When set to true, the agent will ignore any incoming remote exec requests.
-
-disable-update-check
+disable-update-check::
disables automatic checking for security bulletins and new version releases
-
-leave-on-terminate
+leave-on-terminate::
gracefully leave cluster on SIGTERM
-
-rejoin-after-leave
+rejoin-after-leave::
rejoin the cluster using the previous state after leaving
-
-server
+server::
used to control if an agent is in server or client mode
-
-enable-syslog
+syslog::
enables logging to syslog
-
-verify-incoming
- enforce the use of TLS and verify a client's authenticity on incoming connections
-
-verify-outgoing
+verify-incoming::
+ enforce the use of TLS and verify a client's authenticity on incomming connections
+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
--------
-.. code-block:: sh
+--------------------------------------------------------------------------------
+# configure as server, bootstrap and rejoin
+hostname="$(cat "$__global/explorer/hostname")"
+__consul_agent \
+ --datacenter dc1 \
+ --node-name "${hostname%%.*}" \
+ --disable-update-check \
+ --server \
+ --rejoin-after-leave \
+ --bootstrap-expect 3 \
+ --retry-join consul-01 \
+ --retry-join consul-02 \
+ --retry-join consul-03
- # configure as server, bootstrap and rejoin
- hostname="$(cat "$__global/explorer/hostname")"
- __consul_agent \
- --datacenter dc1 \
- --node-name "${hostname%%.*}" \
- --disable-update-check \
- --server \
- --rejoin-after-leave \
- --bootstrap-expect 3 \
- --retry-join consul-01 \
- --retry-join consul-02 \
- --retry-join consul-03
+# configure as server, bootstrap and rejoin with ssl support
+hostname="$(cat "$__global/explorer/hostname")"
+__consul_agent \
+ --datacenter dc1 \
+ --node-name "${hostname%%.*}" \
+ --disable-update-check \
+ --server \
+ --rejoin-after-leave \
+ --bootstrap-expect 3 \
+ --retry-join consul-01 \
+ --retry-join consul-02 \
+ --retry-join consul-03 \
+ --ca-file-source /path/to/ca.pem \
+ --cert-file-source /path/to/cert.pem \
+ --key-file-source /path/to/key.pem \
+ --verify-incoming \
+ --verify-outgoing
- # configure as server, bootstrap and rejoin with ssl support
- hostname="$(cat "$__global/explorer/hostname")"
- __consul_agent \
- --datacenter dc1 \
- --node-name "${hostname%%.*}" \
- --disable-update-check \
- --server \
- --rejoin-after-leave \
- --bootstrap-expect 3 \
- --retry-join consul-01 \
- --retry-join consul-02 \
- --retry-join consul-03 \
- --ca-file-source /path/to/ca.pem \
- --cert-file-source /path/to/cert.pem \
- --key-file-source /path/to/key.pem \
- --verify-incoming \
- --verify-outgoing
+# configure as client and try joining existing cluster
+__consul_agent \
+ --datacenter dc1 \
+ --node-name "${hostname%%.*}" \
+ --disable-update-check \
+ --retry-join consul-01 \
+ --retry-join consul-02 \
+ --retry-join consul-03
- # configure as client and try joining existing cluster
- __consul_agent \
- --datacenter dc1 \
- --node-name "${hostname%%.*}" \
- --disable-update-check \
- --retry-join consul-01 \
- --retry-join consul-02 \
- --retry-join consul-03
+--------------------------------------------------------------------------------
SEE ALSO
--------
-consul documentation at: .
-
-
-AUTHORS
--------
-Steven Armstrong
+- cdist-type(7)
+- http://www.consul.io/docs/agent/options.html
COPYING
-------
-Copyright \(C) 2015 Steven Armstrong. You can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
+Copyright \(C) 2015 Steven Armstrong. Free use of this software is
+granted under the terms of the GNU General Public License version 3 (GPLv3).
diff --git a/cdist/conf/type/__consul_agent/manifest b/cdist/conf/type/__consul_agent/manifest
index 7b54529c..f8cace94 100755
--- a/cdist/conf/type/__consul_agent/manifest
+++ b/cdist/conf/type/__consul_agent/manifest
@@ -1,8 +1,7 @@
-#!/bin/sh -e
+#!/bin/sh
#
# 2015 Steven Armstrong (steven-cdist at armstrong.cc)
-# 2015-2020 Nico Schottelius (nico-cdist at schottelius.org)
-# 2019 Timothée Floure (timothee.floure at ungleich.ch)
+# 2015 Nico Schottelius (nico-cdist at schottelius.org)
#
# This file is part of cdist.
#
@@ -20,87 +19,126 @@
# along with cdist. If not, see .
#
+
os=$(cat "$__global/explorer/os")
-###
-# Type parameters.
+case "$os" in
+ centos|debian|redhat|ubuntu)
+ # whitelist safeguard
+ :
+ ;;
+ *)
+ 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
+ ;;
+esac
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"
+conf_dir="/etc/consul/conf.d"
+conf_file="config.json"
-
-
-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"
- ;;
+# 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" --system --gid "$group" \
+ --home "$data_dir" --state "$state"
+ export require="__user/consul"
+ ;;
+ absent)
+ 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
-###
-# Sane deployment, based on distribution package when available.
+__directory /etc/consul \
+ --owner root --group "$group" --mode 750 --state "$state"
+require="__directory/etc/consul" \
+ __directory "$conf_dir" \
+ --owner root --group "$group" --mode 750 --state "$state"
-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
+if [ -f "$__object/parameter/ca-file-source" -o -f "$__object/parameter/cert-file-source" -o -f "$__object/parameter/key-file-source" ]; then
+ # create directory for ssl certs
+ require="__directory/etc/consul" \
+ __directory /etc/consul/ssl \
+ --owner root --group "$group" --mode 750 --state "$state"
+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
+__directory "$data_dir" \
+ --owner "$user" --group "$group" --mode 770 --state "$state"
- # 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"
+# Generate json config file
+(
+echo "{"
- export config_deployment_requires="__package/consul"
-}
+# parameters we define ourself
+printf ' "data_dir": "%s"\n' "$data_dir"
-###
-# LEGACY manual deployment, kept for compatibility reasons.
+for param in $(ls "$__object/parameter/"); do
+ case "$param" in
+ state|user|group|json-config) continue ;;
+ ca-file-source|cert-file-source|key-file-source)
+ source="$(cat "$__object/parameter/$param")"
+ destination="/etc/consul/ssl/${source##*/}"
+ require="__directory/etc/consul/ssl" \
+ __file "$destination" \
+ --owner root --group consul --mode 640 \
+ --source "$source" \
+ --state "$state"
+ key="$(echo "${param%-*}" | tr '-' '_')"
+ printf ' ,"%s": "%s"\n' "$key" "$destination"
+ ;;
+ disable-remote-exec|disable-update-check|leave-on-terminate|rejoin-after-leave|server|syslog|verify-incoming|verify-outgoing)
+ # handle boolean parameters
+ key="$(echo "$param" | tr '-' '_')"
+ printf ' ,"%s": true\n' "$key"
+ ;;
+ retry-join)
+ # join multiple parameters into json array
+ retry_join="$(awk '{printf "\""$1"\","}' "$__object/parameter/retry-join")"
+ # remove trailing ,
+ printf ' ,"retry_join": [%s]\n' "${retry_join%*,}"
+ ;;
+ bootstrap-expect)
+ # integer key=value parameters
+ key="$(echo "$param" | tr '-' '_')"
+ printf ' ,"%s": %s\n' "$key" "$(cat "$__object/parameter/$param")"
+ ;;
+ *)
+ # string key=value parameters
+ key="$(echo "$param" | tr '-' '_')"
+ printf ' ,"%s": "%s"\n' "$key" "$(cat "$__object/parameter/$param")"
+ ;;
+ esac
+done
+if [ -f "$__object/parameter/json-config" ]; then
+ json_config="$(cat "$__object/parameter/json-config")"
+ if [ "$json_config" = "-" ]; then
+ json_config="$__object/stdin"
+ fi
+ printf ','
+ # remove trailing ,
+ json=$(cat "$json_config")
+ echo "${json%*,}"
+fi
+echo "}"
+) | \
+require="__directory${conf_dir}" \
+ __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 -
init_sysvinit()
{
@@ -122,198 +160,51 @@ init_systemd()
init_upstart()
{
- __file /etc/init/consul-prepare.conf \
+ __file /etc/init/consul.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"
+ --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 \
- type (${__type##*/})." >&2
- echo "Please contribute an implementation for it if you can." >&2
- exit 1
- ;;
- esac
+# Install init script to start on boot
+case "$os" in
+ 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
+ ;;
- # 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" \
- --system --gid "$group" --home "$data_dir" --state "$state"
- ;;
- *)
- echo "The $state state is not (yet?) supported by this type." >&2
- exit 1
- ;;
- esac
+ debian)
+ os_version=$(cat "$__global/explorer/os_version")
+ major_version="${os_version%%.*}"
- # Create data directory.
- require="__user/consul" __directory "$data_dir" \
- --owner "$user" --group "$group" --mode 770 --state "$state"
+ case "$major_version" in
+ [567])
+ init_sysvinit debian
+ ;;
+ 8)
+ init_systemd
+ ;;
+ *)
+ echo "Unsupported Debian version $os_version" >&2
+ exit 1
+ ;;
+ esac
+ ;;
- # 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.
- restart_requires="$restart_requires __directory/$conf_dir/tls"
-fi
-
-###
-# Generate and deploy configuration.
-
-json_configuration=$(
- echo "{"
-
- # parameters we define ourself
- printf ' "data_dir": "%s"\n' "$data_dir"
-
- cd "$__object/parameter/"
- for param in *; do
- case "$param" in
- state|user|group|json-config|use-distribution-package) continue ;;
- ca-file-source|cert-file-source|key-file-source)
- source="$(cat "$__object/parameter/$param")"
- destination="$tls_dir/${source##*/}"
- require="__directory/$tls_dir" \
- __file "$destination" \
- --owner root --group consul --mode 640 \
- --source "$source" \
- --state "$state"
- key="$(echo "${param%-*}" | tr '-' '_')"
- printf ' ,"%s": "%s"\n' "$key" "$destination"
- ;;
- disable-remote-exec|disable-update-check|leave-on-terminate\
- |rejoin-after-leave|server|enable-syslog|verify-incoming|verify-outgoing)
- # handle boolean parameters
- key="$(echo "$param" | tr '-' '_')"
- printf ' ,"%s": true\n' "$key"
- ;;
- retry-join)
- # join multiple parameters into json array
- retry_join="$(awk '{printf "\""$1"\","}' "$__object/parameter/retry-join")"
- # remove trailing ,
- printf ' ,"retry_join": [%s]\n' "${retry_join%*,}"
- ;;
- retry-join-wan)
- # join multiple parameters into json array over wan
- retry_join_wan="$(awk '{printf "\""$1"\","}' "$__object/parameter/retry-join-wan")"
- # remove trailing ,
- printf ' ,"retry_join_wan": [%s]\n' "${retry_join_wan%*,}"
- ;;
- bootstrap-expect)
- # integer key=value parameters
- key="$(echo "$param" | tr '-' '_')"
- printf ' ,"%s": %s\n' "$key" "$(cat "$__object/parameter/$param")"
- ;;
- *)
- # string key=value parameters
- key="$(echo "$param" | tr '-' '_')"
- printf ' ,"%s": "%s"\n' "$key" "$(cat "$__object/parameter/$param")"
- ;;
- esac
- done
- if [ -f "$__object/parameter/json-config" ]; then
- json_config="$(cat "$__object/parameter/json-config")"
- if [ "$json_config" = "-" ]; then
- json_config="$__object/stdin"
- fi
- # remove leading and trailing whitespace and commas from first and last line
- # indent each line with 3 spaces for consistency
- json=$(sed -e 's/^[ \t]*/ /' -e '1s/^[ \t,]*//' -e '$s/[ \t,]*$//' "$json_config")
- printf ' ,%s\n' "$json"
- fi
- echo "}"
-)
-echo "$json_configuration" | require="$config_deployment_requires" \
- __file "$conf_dir/$conf_file" \
- --owner root --group "$group" --mode 640 \
- --state "$state" \
- --source -
-
-# Set configuration deployment as requirement for service restart.
-restart_requires="__file/$conf_dir/$conf_file"
-
-###
-# Restart consul agent after everything else.
-require="$restart_requires" __service consul --action restart
+ ubuntu)
+ init_upstart
+ ;;
+esac
diff --git a/cdist/conf/type/__consul_agent/parameter/boolean b/cdist/conf/type/__consul_agent/parameter/boolean
index c86853c3..9efecf49 100644
--- a/cdist/conf/type/__consul_agent/parameter/boolean
+++ b/cdist/conf/type/__consul_agent/parameter/boolean
@@ -3,7 +3,6 @@ disable-update-check
leave-on-terminate
rejoin-after-leave
server
-enable-syslog
+syslog
verify-incoming
verify-outgoing
-use-distribution-package
diff --git a/cdist/conf/type/__consul_agent/parameter/optional b/cdist/conf/type/__consul_agent/parameter/optional
index 37aad8c1..8940023d 100644
--- a/cdist/conf/type/__consul_agent/parameter/optional
+++ b/cdist/conf/type/__consul_agent/parameter/optional
@@ -17,4 +17,3 @@ key-file-source
node-name
user
state
-advertise-wan
diff --git a/cdist/conf/type/__consul_agent/parameter/optional_multiple b/cdist/conf/type/__consul_agent/parameter/optional_multiple
index 740e4d7f..12cd064c 100644
--- a/cdist/conf/type/__consul_agent/parameter/optional_multiple
+++ b/cdist/conf/type/__consul_agent/parameter/optional_multiple
@@ -1,2 +1 @@
retry-join
-retry-join-wan
diff --git a/cdist/conf/type/__consul_check/explorer/conf-dir b/cdist/conf/type/__consul_check/explorer/conf-dir
deleted file mode 120000
index daa712c3..00000000
--- a/cdist/conf/type/__consul_check/explorer/conf-dir
+++ /dev/null
@@ -1 +0,0 @@
-../../__consul_service/explorer/conf-dir
\ No newline at end of file
diff --git a/cdist/conf/type/__consul_check/man.rst b/cdist/conf/type/__consul_check/man.rst
deleted file mode 100644
index 9694c7af..00000000
--- a/cdist/conf/type/__consul_check/man.rst
+++ /dev/null
@@ -1,102 +0,0 @@
-cdist-type__consul_check(7)
-=============================
-
-NAME
-----
-cdist-type__consul_check - Manages consul checks
-
-
-DESCRIPTION
------------
-Generate and deploy check definitions for a consul agent.
-See http://www.consul.io/docs/agent/checks.html for parameter documentation.
-
-Use either script together with interval, or use ttl.
-
-
-REQUIRED PARAMETERS
--------------------
-None.
-
-
-OPTIONAL PARAMETERS
--------------------
-docker-container-id
- the id of the docker container to run
-
-http
- the url to check
-
-id
- The id of this check.
-
-interval
- the interval in which the check should run
-
-name
- The name of this check. Defaults to __object_id
-
-notes
- human readable description
-
-script
- the shell command to run
-
-service-id
- the id of the service this check is bound to
-
-shell
- the shell to run inside the docker container
-
-state
- if this check is 'present' or 'absent'. Defaults to 'present'.
-
-status
- specify the initial state of this health check
-
-tcp
- the host and port to check
-
-timeout
- after how long to timeout checks which take to long
-
-token
- ACL token to use for interacting with the catalog
-
-ttl
- how long a TTL check is considered healthy without being updated through the
- HTTP interface
-
-
-EXAMPLES
---------
-
-.. code-block:: sh
-
- __consul_check redis \
- --script /usr/local/bin/check_redis.py \
- --interval 10s
-
- __consul_check some-object-id \
- --id web-app \
- --name "Web App Status" \
- --notes "Web app does a curl internally every 10 seconds" \
- --ttl 30s
-
-
-SEE ALSO
---------
-:strong:`cdist-type__consul_agent`\ (7)
-
-
-AUTHORS
--------
-Steven Armstrong
-
-
-COPYING
--------
-Copyright \(C) 2015-2016 Steven Armstrong. You can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
diff --git a/cdist/conf/type/__consul_check/man.text b/cdist/conf/type/__consul_check/man.text
new file mode 100644
index 00000000..18eaf638
--- /dev/null
+++ b/cdist/conf/type/__consul_check/man.text
@@ -0,0 +1,68 @@
+cdist-type__consul_check(7)
+=============================
+Steven Armstrong
+
+
+NAME
+----
+cdist-type__consul_check - manages consul checks
+
+
+DESCRIPTION
+-----------
+Generate and deploy check definitions for a consul agent.
+See http://www.consul.io/docs/agent/checks.html for parameter documentation.
+
+Use either script toghether with interval, or use ttl.
+
+
+REQUIRED PARAMETERS
+-------------------
+None.
+
+
+OPTIONAL PARAMETERS
+-------------------
+interval::
+ the interval in which the script given with --script should be run
+script::
+ the shell command to run every --interval
+ttl::
+ how long a check is considered healthy without being updated through the
+ HTTP interfave
+id::
+ Defaults to --name
+name::
+ The name of this check. Defaults to __object_id
+notes::
+ human readable description
+state::
+ if this check is 'present' or 'absent'. Defaults to 'present'.
+
+
+EXAMPLES
+--------
+
+--------------------------------------------------------------------------------
+__consul_check redis \
+ --script /usr/local/bin/check_redis.py \
+ --interval 10s
+
+__consul_check some-object-id \
+ --id web-app \
+ --name "Web App Status" \
+ --notes "Web app does a curl internally every 10 seconds" \
+ --ttl 30s
+--------------------------------------------------------------------------------
+
+
+SEE ALSO
+--------
+- cdist-type(7)
+- cdist-type__consul_agent(7)
+
+
+COPYING
+-------
+Copyright \(C) 2015 Steven Armstrong. Free use of this software is
+granted under the terms of the GNU General Public License version 3 (GPLv3).
diff --git a/cdist/conf/type/__consul_check/manifest b/cdist/conf/type/__consul_check/manifest
index 522aa1a9..3004f319 100755
--- a/cdist/conf/type/__consul_check/manifest
+++ b/cdist/conf/type/__consul_check/manifest
@@ -1,6 +1,6 @@
-#!/bin/sh -e
+#!/bin/sh
#
-# 2015-2016 Steven Armstrong (steven-cdist at armstrong.cc)
+# 2015 Steven Armstrong (steven-cdist at armstrong.cc)
#
# This file is part of cdist.
#
@@ -19,29 +19,17 @@
#
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")"
# Sanity checks
-if [ -f "$__object/parameter/ttl" ]; then
- for conflicts_ttl in 'docker-container-id' 'http' 'script' 'tcp' 'timeout'; do
- if [ -f "$__object/parameter/${conflicts_ttl}" ]; then
- echo "Can not use --ttl together with --${conflicts_ttl}." >&2
- exit 1
- fi
- done
+if [ -f "$__object/parameter/script" -a -f "$__object/parameter/ttl" ]; then
+ echo "Use either --script together with --interval OR --ttl, but not both" >&2
+ exit 1
fi
-if [ ! -f "$__object/parameter/interval" ]; then
- for requires_interval in 'docker-id' 'http' 'script' 'tcp'; do
- if [ -f "$__object/parameter/${requires_interval}" ]; then
- echo "When using --${requires_interval} you must also define --interval." >&2
- exit 1
- fi
- done
-fi
-if [ -f "$__object/parameter/docker-container-id" ] && [ ! -f "$__object/parameter/script" ]; then
- echo "When using --docker-container-id you must also define --script." >&2
+if [ -f "$__object/parameter/script" -a ! -f "$__object/parameter/interval" ]; then
+ echo "When using --script you must also define --interval" >&2
exit 1
fi
@@ -50,10 +38,13 @@ fi
echo "{"
printf ' "check": {\n'
printf ' "name": "%s"\n' "$name"
-cd "$__object/parameter/"
-for param in *; do
+for param in $(ls "$__object/parameter/"); do
case "$param" in
- state|name) continue ;;
+ state|name|interval) continue ;;
+ script)
+ printf ' ,"script": "%s"\n' "$(cat "$__object/parameter/script")"
+ printf ' ,"interval": "%s"\n' "$(cat "$__object/parameter/interval")"
+ ;;
*)
key="$(echo "$param" | tr '-' '_')"
printf ' ,"%s": "%s"\n' "$key" "$(cat "$__object/parameter/$param")"
diff --git a/cdist/conf/type/__consul_check/parameter/optional b/cdist/conf/type/__consul_check/parameter/optional
index 0e392956..f6c3a6e4 100644
--- a/cdist/conf/type/__consul_check/parameter/optional
+++ b/cdist/conf/type/__consul_check/parameter/optional
@@ -1,15 +1,7 @@
-docker-container-id
-http
id
interval
name
notes
script
-service-id
-shell
state
-status
-tcp
-timeout
-token
ttl
diff --git a/cdist/conf/type/__consul_reload/gencode-remote b/cdist/conf/type/__consul_reload/gencode-remote
index 839fd0c3..9369db73 100755
--- a/cdist/conf/type/__consul_reload/gencode-remote
+++ b/cdist/conf/type/__consul_reload/gencode-remote
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/sh
#
# 2015 Steven Armstrong (steven-cdist at armstrong.cc)
#
diff --git a/cdist/conf/type/__consul_reload/man.rst b/cdist/conf/type/__consul_reload/man.rst
deleted file mode 100644
index f48a041a..00000000
--- a/cdist/conf/type/__consul_reload/man.rst
+++ /dev/null
@@ -1,42 +0,0 @@
-cdist-type__consul_reload(7)
-============================
-
-NAME
-----
-cdist-type__consul_reload - Reload consul
-
-
-DESCRIPTION
------------
-Reload consul after configuration changes.
-
-
-REQUIRED PARAMETERS
--------------------
-None.
-
-
-OPTIONAL PARAMETERS
--------------------
-None.
-
-
-EXAMPLES
---------
-
-.. code-block:: sh
-
- __consul_reload
-
-
-AUTHORS
--------
-Steven Armstrong
-
-
-COPYING
--------
-Copyright \(C) 2015 Steven Armstrong. You can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
diff --git a/cdist/conf/type/__consul_reload/man.text b/cdist/conf/type/__consul_reload/man.text
new file mode 100644
index 00000000..8dd045cf
--- /dev/null
+++ b/cdist/conf/type/__consul_reload/man.text
@@ -0,0 +1,42 @@
+cdist-type__consul_reload(7)
+============================
+Steven Armstrong
+
+
+NAME
+----
+cdist-type__consul_reload - reload consul
+
+
+DESCRIPTION
+-----------
+Reload consul after configuration changes.
+
+
+REQUIRED PARAMETERS
+-------------------
+None.
+
+
+OPTIONAL PARAMETERS
+-------------------
+None.
+
+
+EXAMPLES
+--------
+
+--------------------------------------------------------------------------------
+__consul_reload
+--------------------------------------------------------------------------------
+
+
+SEE ALSO
+--------
+- cdist-type(7)
+
+
+COPYING
+-------
+Copyright \(C) 2015 Steven Armstrong. Free use of this software is
+granted under the terms of the GNU General Public License version 3 (GPLv3).
diff --git a/cdist/conf/type/__consul_service/explorer/conf-dir b/cdist/conf/type/__consul_service/explorer/conf-dir
deleted file mode 100644
index 0fc9ef84..00000000
--- a/cdist/conf/type/__consul_service/explorer/conf-dir
+++ /dev/null
@@ -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
diff --git a/cdist/conf/type/__consul_service/man.rst b/cdist/conf/type/__consul_service/man.text
similarity index 55%
rename from cdist/conf/type/__consul_service/man.rst
rename to cdist/conf/type/__consul_service/man.text
index 510be3d5..6bb024b1 100644
--- a/cdist/conf/type/__consul_service/man.rst
+++ b/cdist/conf/type/__consul_service/man.text
@@ -1,9 +1,11 @@
cdist-type__consul_service(7)
=============================
+Steven Armstrong
+
NAME
----
-cdist-type__consul_service - Manages consul services
+cdist-type__consul_service - manages consul services
DESCRIPTION
@@ -21,65 +23,49 @@ None.
OPTIONAL PARAMETERS
-------------------
-check-interval
+check-interval::
the interval in which the script given with --check-script should be run
-
-check-http
- the URL to check for HTTP 200-ish status every --check-interval
-
-check-script
+check-script::
the shell command to run every --check-interval
-
-check-ttl
+check-ttl::
how long a service is considered healthy without being updated through the
HTTP interfave
-
-id
+id::
Defaults to --name
-
-name
+name::
The name of this service. Defaults to __object_id
-
-port
+port::
the port at which this service can be reached
-
-state
+state::
if this service is 'present' or 'absent'. Defaults to 'present'.
-
-tag
+tag::
a tag to add to this service. Can be specified multiple times.
EXAMPLES
--------
-.. code-block:: sh
+--------------------------------------------------------------------------------
+__consul_service redis \
+ --tag master \
+ --tag production \
+ --port 8000 \
+ --check-script /usr/local/bin/check_redis.py \
+ --check-interval 10s
- __consul_service redis \
- --tag master \
- --tag production \
- --port 8000 \
- --check-script /usr/local/bin/check_redis.py \
- --check-interval 10s
-
- __consul_service webapp \
- --port 80 \
- --check-ttl 10s
+__consul_service webapp \
+ --port 80 \
+ --check-ttl 10s
+--------------------------------------------------------------------------------
SEE ALSO
--------
-:strong:`cdist-type__consul_agent`\ (7)
-
-
-AUTHORS
--------
-Steven Armstrong
+- cdist-type(7)
+- cdist-type__consul_agent(7)
COPYING
-------
-Copyright \(C) 2015 Steven Armstrong. You can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
+Copyright \(C) 2015 Steven Armstrong. Free use of this software is
+granted under the terms of the GNU General Public License version 3 (GPLv3).
diff --git a/cdist/conf/type/__consul_service/manifest b/cdist/conf/type/__consul_service/manifest
index d16f18e0..9ba64141 100755
--- a/cdist/conf/type/__consul_service/manifest
+++ b/cdist/conf/type/__consul_service/manifest
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/sh
#
# 2015 Steven Armstrong (steven-cdist at armstrong.cc)
#
@@ -19,33 +19,28 @@
#
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")"
# Sanity checks
-if [ -f "$__object/parameter/check-script" ] && [ -f "$__object/parameter/check-ttl" ]; then
+if [ -f "$__object/parameter/check-script" -a -f "$__object/parameter/check-ttl" ]; then
echo "Use either --check-script together with --check-interval OR --check-ttl, but not both" >&2
exit 1
fi
-if [ -f "$__object/parameter/check-script" ] && [ ! -f "$__object/parameter/check-interval" ]; then
+if [ -f "$__object/parameter/check-script" -a ! -f "$__object/parameter/check-interval" ]; then
echo "When using --check-script you must also define --check-interval" >&2
exit 1
fi
-if [ -f "$__object/parameter/check-http" ] && [ ! -f "$__object/parameter/check-interval" ]; then
- echo "When using --check-http you must also define --check-interval" >&2
- exit 1
-fi
# Generate json config file
(
echo "{"
printf ' "service": {\n'
printf ' "name": "%s"\n' "$name"
-cd "$__object/parameter/"
-for param in *; do
+for param in $(ls "$__object/parameter/"); do
case "$param" in
- state|name|check-interval|conf-dir) continue ;;
+ state|name|check-interval) continue ;;
check-script)
printf ' ,"check": {\n'
printf ' "script": "%s"\n' "$(cat "$__object/parameter/check-script")"
@@ -57,12 +52,6 @@ for param in *; do
printf ' "ttl": "%s"\n' "$(cat "$__object/parameter/check-ttl")"
printf ' }\n'
;;
- check-http)
- printf ' ,"check": {\n'
- printf ' "http": "%s"\n' "$(cat "$__object/parameter/check-http")"
- printf ' ,"interval": "%s"\n' "$(cat "$__object/parameter/check-interval")"
- printf ' }\n'
- ;;
tag)
# create json array from newline delimited file
tags="$(awk '{printf "\""$1"\","}' "$__object/parameter/tag")"
@@ -86,6 +75,7 @@ echo " }"
# end json file
echo "}"
) | \
+require="__directory${conf_dir}" \
__config_file "${conf_dir}/${conf_file}" \
--owner root --group consul --mode 640 \
--state "$state" \
diff --git a/cdist/conf/type/__consul_service/parameter/optional b/cdist/conf/type/__consul_service/parameter/optional
index 2e3e8b63..496e31a3 100644
--- a/cdist/conf/type/__consul_service/parameter/optional
+++ b/cdist/conf/type/__consul_service/parameter/optional
@@ -1,4 +1,3 @@
-check-http
check-interval
check-script
check-ttl
diff --git a/cdist/conf/type/__consul_template/files/consul-template.sysv b/cdist/conf/type/__consul_template/files/consul-template.sysv
index b263915a..0a463020 100644
--- a/cdist/conf/type/__consul_template/files/consul-template.sysv
+++ b/cdist/conf/type/__consul_template/files/consul-template.sysv
@@ -10,75 +10,72 @@
# pidfile: /var/run/consul-template/pidfile
# Source function library.
-
-# shellcheck disable=SC1091
. /etc/init.d/functions
NAME=consul-template
CONSUL_TEMPLATE=/usr/local/bin/consul-template
-CONFIG="/etc/$NAME/conf.d"
-PID_FILE="/var/run/$NAME/pidfile"
-LOG_FILE="/var/log/$NAME"
+CONFIG=/etc/$NAME/conf.d
+PID_FILE=/var/run/$NAME/pidfile
+LOG_FILE=/var/log/$NAME
-# shellcheck disable=SC1090
-[ -e "/etc/sysconfig/$NAME" ] && . "/etc/sysconfig/$NAME"
-export CONSUL_TEMPLATE_LOG="${CONSUL_TEMPLATE_LOG:-info}"
-export GOMAXPROCS="${GOMAXPROCS:-2}"
+[ -e /etc/sysconfig/$NAME ] && . /etc/sysconfig/$NAME
+export CONSUL_TEMPLATE_LOG=${CONSUL_TEMPLATE_LOG:-info}
+export GOMAXPROCS=${GOMAXPROCS:-2}
-mkdir -p "/var/run/$NAME"
+mkdir -p /var/run/$NAME
start() {
- printf "Starting %s: " "$NAME"
+ echo -n "Starting $NAME: "
daemon --pidfile="$PID_FILE" \
"$CONSUL_TEMPLATE" -config "$CONFIG" >> "$LOG_FILE" 2>&1 &
- echo "$!" > "$PID_FILE"
+ echo $! > "$PID_FILE"
retcode=$?
- touch "/var/lock/subsys/$NAME"
- return "$retcode"
+ touch /var/lock/subsys/$NAME
+ return $retcode
}
stop() {
- printf "Shutting down %s: " "$NAME"
- killproc -p "$PID_FILE" "$CONSUL_TEMPLATE"
+ echo -n "Shutting down $NAME: "
+ killproc -p $PID_FILE $CONSUL_TEMPLATE
retcode=$?
- rm -f "/var/lock/subsys/$NAME"
- return "$retcode"
+ rm -f /var/lock/subsys/$NAME
+ return $retcode
}
case "$1" in
start)
- if status -p "$PID_FILE" "$NAME" >/dev/null; then
+ if $(status -p "$PID_FILE" $NAME >/dev/null); then
echo "$NAME already running"
else
start
fi
;;
stop)
- if status -p "$PID_FILE" "$NAME" >/dev/null; then
+ if $(status -p "$PID_FILE" $NAME >/dev/null); then
stop
else
echo "$NAME not running"
fi
;;
status)
- status -p "$PID_FILE" "$NAME"
+ status -p "$PID_FILE" $NAME
exit $?
;;
restart)
- if status -p "$PID_FILE" "$NAME" >/dev/null; then
+ if $(status -p "$PID_FILE" $NAME >/dev/null); then
stop
fi
start
;;
reload)
- if status -p "$PID_FILE" "$NAME" >/dev/null; then
- kill -HUP "$(cat "$PID_FILE")"
+ if $(status -p "$PID_FILE" $NAME >/dev/null); then
+ kill -HUP `cat $PID_FILE`
else
echo "$NAME not running"
fi
;;
condrestart)
- if [ -f "/var/lock/subsys/$NAME" ]; then
- if status -p "$PID_FILE" "$NAME" >/dev/null; then
+ if [ -f /var/lock/subsys/$NAME ]; then
+ if $(status -p "$PID_FILE" $NAME >/dev/null); then
stop
fi
start
diff --git a/cdist/conf/type/__consul_template/files/versions/0.10.0/cksum b/cdist/conf/type/__consul_template/files/versions/0.10.0/cksum
deleted file mode 100644
index bbf394db..00000000
--- a/cdist/conf/type/__consul_template/files/versions/0.10.0/cksum
+++ /dev/null
@@ -1 +0,0 @@
-3401777891 9273880 consul-template
diff --git a/cdist/conf/type/__consul_template/files/versions/0.10.0/source b/cdist/conf/type/__consul_template/files/versions/0.10.0/source
deleted file mode 100644
index 031b1155..00000000
--- a/cdist/conf/type/__consul_template/files/versions/0.10.0/source
+++ /dev/null
@@ -1 +0,0 @@
-https://releases.hashicorp.com/consul-template/0.10.0/consul-template_0.10.0_linux_amd64.zip
diff --git a/cdist/conf/type/__consul_template/files/versions/0.15.0/cksum b/cdist/conf/type/__consul_template/files/versions/0.15.0/cksum
deleted file mode 100644
index 426338bd..00000000
--- a/cdist/conf/type/__consul_template/files/versions/0.15.0/cksum
+++ /dev/null
@@ -1 +0,0 @@
-2643547924 12487232 consul-template
diff --git a/cdist/conf/type/__consul_template/files/versions/0.15.0/source b/cdist/conf/type/__consul_template/files/versions/0.15.0/source
deleted file mode 100644
index fdf1fccf..00000000
--- a/cdist/conf/type/__consul_template/files/versions/0.15.0/source
+++ /dev/null
@@ -1 +0,0 @@
-https://releases.hashicorp.com/consul-template/0.15.0/consul-template_0.15.0_linux_amd64.zip
diff --git a/cdist/conf/type/__consul_template/files/versions/0.6.5/cksum b/cdist/conf/type/__consul_template/files/versions/0.6.5/cksum
new file mode 100644
index 00000000..2dcac994
--- /dev/null
+++ b/cdist/conf/type/__consul_template/files/versions/0.6.5/cksum
@@ -0,0 +1 @@
+1356006333 8496656 consul-template
diff --git a/cdist/conf/type/__consul_template/files/versions/0.6.5/source b/cdist/conf/type/__consul_template/files/versions/0.6.5/source
new file mode 100644
index 00000000..09a1ce3a
--- /dev/null
+++ b/cdist/conf/type/__consul_template/files/versions/0.6.5/source
@@ -0,0 +1 @@
+https://github.com/hashicorp/consul-template/releases/download/v0.6.5/consul-template_0.6.5_linux_amd64.tar.gz
diff --git a/cdist/conf/type/__consul_template/man.rst b/cdist/conf/type/__consul_template/man.rst
deleted file mode 100644
index f13c699d..00000000
--- a/cdist/conf/type/__consul_template/man.rst
+++ /dev/null
@@ -1,141 +0,0 @@
-cdist-type__consul_template(7)
-==============================
-
-NAME
-----
-cdist-type__consul_template - Manage the consul-template service
-
-
-DESCRIPTION
------------
-Downloads and installs the consul-template binary from
-https://github.com/hashicorp/consul-template/releases/download/.
-Generates a global config file and creates directory for per template config files.
-Note that the consul-template binary is downloaded on the server (the machine running
-cdist) and then deployed to the target host using the __file type.
-
-
-REQUIRED PARAMETERS
--------------------
-None.
-
-
-OPTIONAL PARAMETERS
--------------------
-auth-username
- specify a username for basic authentication.
-
-auth-password
- specify a password for basic authentication.
-
-batch-size
- the size of the batch when polling multiple dependencies.
-
-consul
- the location of the Consul instance to query (may be an IP address or FQDN) with port.
- Defaults to 'localhost:8500'.
-
-log-level
- The log level for output. This applies to the stdout/stderr logging as well
- as syslog logging (if enabled). Valid values are "debug", "info", "warn",
- and "err". The default value is "warn".
-
-max-stale
- the maximum staleness of a query. If specified, Consul will distribute work among all
- servers instead of just the leader.
-
-retry
- the amount of time to wait if Consul returns an error when communicating
- with the API.
-
-state
- either 'present' or 'absent'. Defaults to 'present'
-
-ssl-cert
- Path to an SSL client certificate to use to authenticate to the consul server.
- Useful if the consul server "verify_incoming" option is set.
-
-ssl-ca-cert
- Path to a CA certificate file, containing one or more CA certificates to
- use to validate the certificate sent by the consul server to us. This is a
- handy alternative to setting --ssl-no-verify if you are using your own CA.
-
-syslog-facility
- The facility to use when sending to syslog. This requires the use of --syslog.
- The default value is LOCAL0.
-
-token
- the Consul API token.
-
-vault-address
- the location of the Vault instance to query (may be an IP address or FQDN) with port.
-
-vault-token
- the Vault API token.
-
-vault-ssl-cert
- Path to an SSL client certificate to use to authenticate to the vault server.
-
-vault-ssl-ca-cert
- Path to a CA certificate file, containing one or more CA certificates to
- use to validate the certificate sent by the vault server to us.
-
-version
- which version of consul-template to install. See ./files/versions for a list of
- supported versions. Defaults to the latest known version.
-
-wait
- the minimum(:maximum) to wait before rendering a new template to disk and
- triggering a command, separated by a colon (:). If the optional maximum
- value is omitted, it is assumed to be 4x the required minimum value.
-
-
-BOOLEAN PARAMETERS
-------------------
-ssl
- use HTTPS while talking to Consul. Requires the Consul server to be configured to serve secure connections.
-
-ssl-no-verify
- ignore certificate warnings. Only used if ssl is enabled.
-
-syslog
- Send log output to syslog (in addition to stdout and stderr).
-
-vault-ssl
- use HTTPS while talking to Vault. Requires the Vault server to be configured to serve secure connections.
-
-vault-ssl-no-verify
- ignore certificate warnings. Only used if vault is enabled.
-
-
-EXAMPLES
---------
-
-.. code-block:: sh
-
- __consul_template \
- --consul consul.service.consul:8500 \
- --retry 30s
-
- # specific version
- __consul_template \
- --version 0.6.5 \
- --retry 30s
-
-
-SEE ALSO
---------
-consul documentation at: .
-
-
-AUTHORS
--------
-Steven Armstrong
-
-
-COPYING
--------
-Copyright \(C) 2015 Steven Armstrong. You can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
diff --git a/cdist/conf/type/__consul_template/man.text b/cdist/conf/type/__consul_template/man.text
new file mode 100644
index 00000000..9db958eb
--- /dev/null
+++ b/cdist/conf/type/__consul_template/man.text
@@ -0,0 +1,85 @@
+cdist-type__consul_template(7)
+==============================
+Steven Armstrong
+
+
+NAME
+----
+cdist-type__consul_template - manage the consul-template service
+
+
+DESCRIPTION
+-----------
+Downloads and installs the consul-template binary from
+https://github.com/hashicorp/consul-template/releases/download/.
+Generates a global config file and creates directory for per template config files.
+Note that the consul-template binary is downloaded on the server (the machine running
+cdist) and then deployed to the target host using the __file type.
+
+
+REQUIRED PARAMETERS
+-------------------
+None.
+
+
+OPTIONAL PARAMETERS
+-------------------
+auth::
+ specify a username (and password) for basic authentication.
+batch-size::
+ the size of the batch when polling multiple dependencies.
+consul::
+ the location of the Consul instance to query (may be an IP address or FQDN) with port.
+ Defaults to 'localhost:8500'.
+max-stale::
+ the maximum staleness of a query. If specified, Consul will distribute work among all
+ servers instead of just the leader.
+retry::
+ the amount of time to wait if Consul returns an error when communicating
+ with the API.
+state::
+ either 'present' or 'absent'. Defaults to 'present'
+token::
+ the Consul API token.
+version::
+ which version of consul-template to install. See ./files/versions for a list of
+ supported versions. Defaults to the latest known version.
+wait::
+ the minimum(:maximum) to wait before rendering a new template to disk and
+ triggering a command, separated by a colon (:). If the optional maximum
+ value is omitted, it is assumed to be 4x the required minimum value.
+
+
+BOOLEAN PARAMETERS
+------------------
+ssl::
+ use HTTPS while talking to Consul. Requires the Consul server to be configured to serve secure connections.
+ssl-no-verify::
+ ignore certificate warnings. Only used if ssl is enabled.
+
+
+EXAMPLES
+--------
+
+--------------------------------------------------------------------------------
+__consul_template \
+ --consul consul.service.consul:8500 \
+ --retry 30s
+
+# specific version
+__consul_template \
+ --version 0.6.5 \
+ --retry 30s
+--------------------------------------------------------------------------------
+
+
+SEE ALSO
+--------
+- cdist-type(7)
+- https://github.com/hashicorp/consul-template
+
+
+COPYING
+-------
+Copyright \(C) 2015 Steven Armstrong. Free use of this software is
+granted under the terms of the GNU General Public License version 3 (GPLv3).
diff --git a/cdist/conf/type/__consul_template/manifest b/cdist/conf/type/__consul_template/manifest
index b02fc332..edeca89c 100755
--- a/cdist/conf/type/__consul_template/manifest
+++ b/cdist/conf/type/__consul_template/manifest
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/sh
#
# 2015 Steven Armstrong (steven-cdist at armstrong.cc)
#
@@ -22,7 +22,7 @@
os=$(cat "$__global/explorer/os")
case "$os" in
- scientific|centos|redhat)
+ centos|redhat)
# whitelist safeguard
service_onchange='service consul-template status >/dev/null && service consul-template reload || true' \
;;
@@ -52,7 +52,7 @@ __staged_file /usr/local/bin/consul-template \
--source "$(cat "$version_dir/source")" \
--cksum "$(cat "$version_dir/cksum")" \
--fetch-command 'curl -s -L "%s"' \
- --prepare-command 'unzip -p "%s"' \
+ --prepare-command 'tar -xzf "%s"; cat consul-template_*/consul-template' \
--state "$state" \
--group root \
--owner root \
@@ -75,68 +75,20 @@ require="__directory/etc/consul-template" \
# Generate hcl config file
(
-cd "$__object/parameter/"
-for param in *; do
+for param in $(ls "$__object/parameter/"); do
case "$param" in
- auth-password|state|ssl-*|syslog-*|version|vault-token|vault-ssl*) continue ;;
- auth-username)
- printf 'auth {\n'
- printf ' enabled = true\n'
- printf ' username = "%s"\n' "$(cat "$__object/parameter/auth-username")"
- if [ -f "$__object/parameter/auth-password" ]; then
- printf ' password = %s\n' "$(cat "$__object/parameter/auth-password")"
- fi
- printf '}\n'
+ ssl|ssl-no-verify) # boolean
+ key="$(echo "$param" | tr '-' '_')"
+ printf '%s = true\n' "$key"
;;
- ssl)
- printf 'ssl {\n'
- printf ' enabled = true\n'
- if [ -f "$__object/parameter/ssl-no-verify" ]; then
- printf ' verify = false\n'
- fi
- if [ -f "$__object/parameter/ssl-cert" ]; then
- printf ' cert = "%s"\n' "$(cat "$__object/parameter/ssl-cert")"
- fi
- if [ -f "$__object/parameter/ssl-ca-cert" ]; then
- printf ' ca_cert = "%s"\n' "$(cat "$__object/parameter/ssl-ca-cert")"
- fi
- printf '}\n'
- ;;
- syslog)
- printf 'syslog {\n'
- printf ' enabled = true\n'
- if [ -f "$__object/parameter/syslog-facility" ]; then
- printf ' facility = "%s"\n' "$(cat "$__object/parameter/syslog-facility")"
- fi
- printf '}\n'
- ;;
- vault-address)
- printf 'vault {\n'
- printf ' address = "%s"\n' "$(cat "$__object/parameter/vault-address")"
- if [ -f "$__object/parameter/vault-token" ]; then
- printf ' token = "%s"\n' "$(cat "$__object/parameter/vault-token")"
- fi
- if [ -f "$__object/parameter/vault-ssl" ]; then
- printf ' ssl {\n'
- printf ' enabled = true\n'
- if [ -f "$__object/parameter/vault-ssl-no-verify" ]; then
- printf ' verify = false\n'
- fi
- if [ -f "$__object/parameter/vault-ssl-cert" ]; then
- printf ' cert = "%s"\n' "$(cat "$__object/parameter/vault-ssl-cert")"
- fi
- if [ -f "$__object/parameter/vault-ssl-ca-cert" ]; then
- printf ' ca_cert = "%s"\n' "$(cat "$__object/parameter/vault-ssl-ca-cert")"
- fi
- printf ' }\n'
- fi
- printf '}\n'
- ;;
- *)
- # string key=value parameters
+ auth|batch-size|consul|max-stale|retry|token|wait)
key="$(echo "$param" | tr '-' '_')"
printf '%s = "%s"\n' "$key" "$(cat "$__object/parameter/$param")"
;;
+ *)
+ # ignore unknown parameters
+ :
+ ;;
esac
done
) | \
diff --git a/cdist/conf/type/__consul_template/notes b/cdist/conf/type/__consul_template/notes
deleted file mode 100644
index fc7cca11..00000000
--- a/cdist/conf/type/__consul_template/notes
+++ /dev/null
@@ -1,93 +0,0 @@
-# < 0.7.0
-ssl = true
-ssl_no_verify = true
-
-# >= 0.7.0
-ssl {
- enabled = true
- verify = false
-}
-
-# >= 0.9.0
-ssl-cert
-ssl-ca-cert
-
-
-
---------------------------------------------------------------------------------
-### from docs
-
-
-ssl {
- enabled = true
- verify = false
- cert = "/path/to/client/cert.pem"
- ca_cert = "/path/to/ca/cert.pem"
-}
-
-
-ssl
- Use HTTPS while talking to Consul. Requires the Consul server to be configured to serve secure connections. The default value is false.
-
-ssl-verify
- Verify certificates when connecting via SSL. This requires the use of -ssl. The default value is true.
-
-ssl-cert
- Path to an SSL client certificate to use to authenticate to the consul server. Useful if the consul server "verify_incoming" option is set.
-
-ssl-ca-cert
- Path to a CA certificate file, containing one or more CA certificates to use to validate the certificate sent by the consul server to us. This is a handy alternative to setting --ssl-verify=false if you are using your own CA.
-
---------------------------------------------------------------------------------
-
-### example config file from docs
-
-consul = "127.0.0.1:8500"
-token = "abcd1234" // May also be specified via the envvar CONSUL_TOKEN
-retry = "10s"
-max_stale = "10m"
-log_level = "warn"
-pid_file = "/path/to/pid"
-
-vault {
- address = "https://vault.service.consul:8200"
- token = "abcd1234" // May also be specified via the envvar VAULT_TOKEN
- ssl {
- enabled = true
- verify = true
- cert = "/path/to/client/cert.pem"
- ca_cert = "/path/to/ca/cert.pem"
- }
-}
-
-
---auth-username
---auth-password
-# if any are given enabled = true
-auth {
- enabled = true
- username = "test"
- password = "test"
-}
-
-ssl {
- enabled = true
- verify = false
- cert = "/path/to/client/cert.pem"
- ca_cert = "/path/to/ca/cert.pem"
-}
-
-syslog {
- enabled = true
- facility = "LOCAL5"
-}
-
-template {
- source = "/path/on/disk/to/template"
- destination = "/path/on/disk/where/template/will/render"
- command = "optional command to run when the template is updated"
-}
-
-template {
- // Multiple template definitions are supported
-}
diff --git a/cdist/conf/type/__consul_template/parameter/boolean b/cdist/conf/type/__consul_template/parameter/boolean
index 10057e46..5e17dcd7 100644
--- a/cdist/conf/type/__consul_template/parameter/boolean
+++ b/cdist/conf/type/__consul_template/parameter/boolean
@@ -1,5 +1,2 @@
ssl
ssl-no-verify
-syslog
-vault-ssl
-vault-ssl-no-verify
diff --git a/cdist/conf/type/__consul_template/parameter/default/log-level b/cdist/conf/type/__consul_template/parameter/default/log-level
deleted file mode 100644
index 1ef71804..00000000
--- a/cdist/conf/type/__consul_template/parameter/default/log-level
+++ /dev/null
@@ -1 +0,0 @@
-warn
diff --git a/cdist/conf/type/__consul_template/parameter/default/syslog-facility b/cdist/conf/type/__consul_template/parameter/default/syslog-facility
deleted file mode 100644
index f32df182..00000000
--- a/cdist/conf/type/__consul_template/parameter/default/syslog-facility
+++ /dev/null
@@ -1 +0,0 @@
-LOCAL0
diff --git a/cdist/conf/type/__consul_template/parameter/default/version b/cdist/conf/type/__consul_template/parameter/default/version
index a5510516..ef5e4454 100644
--- a/cdist/conf/type/__consul_template/parameter/default/version
+++ b/cdist/conf/type/__consul_template/parameter/default/version
@@ -1 +1 @@
-0.15.0
+0.6.5
diff --git a/cdist/conf/type/__consul_template/parameter/optional b/cdist/conf/type/__consul_template/parameter/optional
index 8bc528ac..2848edb9 100644
--- a/cdist/conf/type/__consul_template/parameter/optional
+++ b/cdist/conf/type/__consul_template/parameter/optional
@@ -1,18 +1,9 @@
-auth-username
-auth-password
+auth
batch-size
consul
-log-level
max-stale
retry
state
-ssl-cert
-ssl-ca-cert
-syslog-facility
token
-vault-address
-vault-token
-vault-ssl-cert
-vault-ssl-ca-cert
version
wait
diff --git a/cdist/conf/type/__consul_template/todo b/cdist/conf/type/__consul_template/todo
new file mode 100644
index 00000000..a3786501
--- /dev/null
+++ b/cdist/conf/type/__consul_template/todo
@@ -0,0 +1,2 @@
+- add support for latest version 0.7.0
+ - config file format has changed
diff --git a/cdist/conf/type/__consul_template_template/man.rst b/cdist/conf/type/__consul_template_template/man.rst
deleted file mode 100644
index b2e3820b..00000000
--- a/cdist/conf/type/__consul_template_template/man.rst
+++ /dev/null
@@ -1,84 +0,0 @@
-cdist-type__consul_template_template(7)
-=======================================
-
-NAME
-----
-cdist-type__consul_template_template - Manage consul-template templates
-
-
-DESCRIPTION
------------
-Generate and deploy template definitions for a consul-template.
-See https://github.com/hashicorp/consul-template#examples for documentation.
-Templates are written in the Go template format.
-Either the --source or the --source-file parameter must be given.
-
-
-REQUIRED PARAMETERS
--------------------
-destination
- the destination where the generated file should go.
-
-
-OPTIONAL PARAMETERS
--------------------
-command
- an optional command to run after rendering the template to its destination.
-
-source
- path to the template source. Conflicts --source-file.
-
-source-file
- path to a local file which is uploaded using the __file type and configured
- as the source.
- If source is '-' (dash), take what was written to stdin as the file content.
- Conflicts --source.
-
-state
- if this template is 'present' or 'absent'. Defaults to 'present'.
-
-wait
- The `minimum(:maximum)` time to wait before rendering a new template to
- disk and triggering a command, separated by a colon (`:`). If the optional
- maximum value is omitted, it is assumed to be 4x the required minimum value.
- This is a numeric time with a unit suffix ("5s"). There is no default value.
- The wait value for a template takes precedence over any globally-configured
- wait.
-
-
-EXAMPLES
---------
-
-.. code-block:: sh
-
- # configure template on the target
- __consul_template_template nginx \
- --source /etc/my-consul-templates/nginx.ctmpl \
- --destination /etc/nginx/nginx.conf \
- --command 'service nginx restart'
-
-
- # upload a local file to the target and configure it
- __consul_template_template nginx \
- --wait '2s:6s' \
- --source-file "$__manifest/files/nginx.ctmpl" \
- --destination /etc/nginx/nginx.conf \
- --command 'service nginx restart'
-
-
-SEE ALSO
---------
-:strong:`cdist-type__consul_template`\ (7), :strong:`cdist-type__consul_template_config`\ (7)
-
-
-AUTHORS
--------
-Steven Armstrong
-
-
-COPYING
--------
-Copyright \(C) 2015-2016 Steven Armstrong. You can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
diff --git a/cdist/conf/type/__consul_template_template/man.text b/cdist/conf/type/__consul_template_template/man.text
new file mode 100644
index 00000000..159a63fb
--- /dev/null
+++ b/cdist/conf/type/__consul_template_template/man.text
@@ -0,0 +1,69 @@
+cdist-type__consul_template_template(7)
+=======================================
+Steven Armstrong
+
+
+NAME
+----
+cdist-type__consul_template_template - manage consul-template templates
+
+
+DESCRIPTION
+-----------
+Generate and deploy template definitions for a consul-template.
+See https://github.com/hashicorp/consul-template#examples for documentation.
+Templates are written in the Go template format.
+Either the --source or the --source-file parameter must be given.
+
+
+REQUIRED PARAMETERS
+-------------------
+destination::
+ the destination where the generated file should go.
+
+
+OPTIONAL PARAMETERS
+-------------------
+command::
+ an optional command to run after rendering the template to its destination.
+source::
+ path to the template source. Conflicts --source-file.
+source-file::
+ path to a local file which is uploaded using the __file type and configured
+ as the source.
+ If source is '-' (dash), take what was written to stdin as the file content.
+ Conflicts --source.
+state::
+ if this template is 'present' or 'absent'. Defaults to 'present'.
+
+
+EXAMPLES
+--------
+
+--------------------------------------------------------------------------------
+# configure template on the target
+__consul_template_template nginx \
+ --source /etc/my-consul-templates/nginx.ctmpl \
+ --destination /etc/nginx/nginx.conf \
+ --command 'service nginx restart'
+
+
+# upload a local file to the target and configure it
+__consul_template_template nginx \
+ --source-file "$__manifest/files/nginx.ctmpl" \
+ --destination /etc/nginx/nginx.conf \
+ --command 'service nginx restart'
+--------------------------------------------------------------------------------
+
+
+SEE ALSO
+--------
+- cdist-type(7)
+- cdist-type__consul_template(7)
+- cdist-type__consul_template_config(7)
+
+
+COPYING
+-------
+Copyright \(C) 2015 Steven Armstrong. Free use of this software is
+granted under the terms of the GNU General Public License version 3 (GPLv3).
diff --git a/cdist/conf/type/__consul_template_template/manifest b/cdist/conf/type/__consul_template_template/manifest
index 1eae1fad..c997a2c8 100755
--- a/cdist/conf/type/__consul_template_template/manifest
+++ b/cdist/conf/type/__consul_template_template/manifest
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/sh
#
# 2015 Steven Armstrong (steven-cdist at armstrong.cc)
#
@@ -26,40 +26,36 @@ template_dir="/etc/consul-template/template"
require=""
# Sanity checks
-if [ -f "$__object/parameter/source" ] && [ -f "$__object/parameter/source-file" ]; then
+if [ -f "$__object/parameter/source" -a -f "$__object/parameter/source-file" ]; then
echo "Use either --source OR --source-file, but not both." >&2
exit 1
fi
-if [ ! -f "$__object/parameter/source" ] && [ ! -f "$__object/parameter/source-file" ]; then
+if [ ! -f "$__object/parameter/source" -a ! -f "$__object/parameter/source-file" ]; then
echo "Either --source OR --source-file must be given." >&2
exit 1
fi
-if [ -f "$__object/parameter/source-file" ]; then
- destination="${template_dir}/${name}"
- require="__file${destination}"
-fi
-
# Generate hcl config file
-{
+(
printf 'template {\n'
-cd "$__object/parameter/"
-for param in *; do
+for param in $(ls "$__object/parameter/"); do
case "$param" in
source-file)
source="$(cat "$__object/parameter/$param")"
if [ "$source" = "-" ]; then
source="$__object/stdin"
fi
+ destination="${template_dir}/${name}"
require="__directory${template_dir}" \
__file "$destination" \
--owner root --group root --mode 640 \
--source "$source" \
--state "$state"
+ export require="__file${destination}"
printf ' source = "%s"\n' "$destination"
;;
- source|destination|command|wait)
+ source|destination|command)
printf ' %s = "%s"\n' "$param" "$(cat "$__object/parameter/$param")"
;;
*)
@@ -69,7 +65,7 @@ for param in *; do
esac
done
printf '}\n'
-} | \
+) | \
require="$require __directory${conf_dir}" \
__config_file "${conf_dir}/${conf_file}" \
--owner root --group root --mode 640 \
diff --git a/cdist/conf/type/__consul_template_template/parameter/optional b/cdist/conf/type/__consul_template_template/parameter/optional
index 3e55fbb7..229f6c89 100644
--- a/cdist/conf/type/__consul_template_template/parameter/optional
+++ b/cdist/conf/type/__consul_template_template/parameter/optional
@@ -2,4 +2,3 @@ command
source
source-file
state
-wait
diff --git a/cdist/conf/type/__consul_watch_checks/explorer/conf-dir b/cdist/conf/type/__consul_watch_checks/explorer/conf-dir
deleted file mode 120000
index daa712c3..00000000
--- a/cdist/conf/type/__consul_watch_checks/explorer/conf-dir
+++ /dev/null
@@ -1 +0,0 @@
-../../__consul_service/explorer/conf-dir
\ No newline at end of file
diff --git a/cdist/conf/type/__consul_watch_checks/man.rst b/cdist/conf/type/__consul_watch_checks/man.text
similarity index 50%
rename from cdist/conf/type/__consul_watch_checks/man.rst
rename to cdist/conf/type/__consul_watch_checks/man.text
index a9a9f58d..75c42fc2 100644
--- a/cdist/conf/type/__consul_watch_checks/man.rst
+++ b/cdist/conf/type/__consul_watch_checks/man.text
@@ -1,9 +1,11 @@
cdist-type__consul_watch_checks(7)
==================================
+Steven Armstrong
+
NAME
----
-cdist-type__consul_watch_checks - Manages consul checks watches
+cdist-type__consul_watch_checks - manages consul checks watches
DESCRIPTION
@@ -14,60 +16,49 @@ See http://www.consul.io/docs/agent/watches.html for parameter documentation.
REQUIRED PARAMETERS
-------------------
-handler
+handler::
the handler to invoke when the data view updates
OPTIONAL PARAMETERS
-------------------
-datacenter
+datacenter::
can be provided to override the agent's default datacenter
-
-filter-service
+filter-service::
filter to a specific service. Conflicts with --filter-state.
-
-filter-state
+filter-state::
filter to a specific state. Conflicts with --filter-service.
-
-state
+state::
if this watch is 'present' or 'absent'. Defaults to 'present'.
-
-token
+token::
can be provided to override the agent's default ACL token
EXAMPLES
--------
-.. code-block:: sh
+--------------------------------------------------------------------------------
+__consul_watch_checks some-id \
+ --handler /usr/bin/my-handler.sh
- __consul_watch_checks some-id \
- --handler /usr/bin/my-handler.sh
+__consul_watch_checks some-id \
+ --filter-service consul \
+ --handler /usr/bin/my-handler.sh
- __consul_watch_checks some-id \
- --filter-service consul \
- --handler /usr/bin/my-handler.sh
-
- __consul_watch_checks some-id \
- --filter-state passing \
- --handler /usr/bin/my-handler.sh
+__consul_watch_checks some-id \
+ --filter-state passing \
+ --handler /usr/bin/my-handler.sh
+--------------------------------------------------------------------------------
SEE ALSO
--------
-:strong:`cdist-type__consul_agent`\ (7)
-
-consul documentation at: .
-
-
-AUTHORS
--------
-Steven Armstrong
+- cdist-type(7)
+- cdist-type__consul_agent(7)
+- http://www.consul.io/docs/agent/watches.html
COPYING
-------
-Copyright \(C) 2015 Steven Armstrong. You can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
+Copyright \(C) 2015 Steven Armstrong. Free use of this software is
+granted under the terms of the GNU General Public License version 3 (GPLv3).
diff --git a/cdist/conf/type/__consul_watch_checks/manifest b/cdist/conf/type/__consul_watch_checks/manifest
index 4976b25a..c05ae9eb 100755
--- a/cdist/conf/type/__consul_watch_checks/manifest
+++ b/cdist/conf/type/__consul_watch_checks/manifest
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/sh
#
# 2015 Steven Armstrong (steven-cdist at armstrong.cc)
#
@@ -20,12 +20,12 @@
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")"
# Sanity checks
-if [ -f "$__object/parameter/filter-service" ] && [ -f "$__object/parameter/filter-state" ]; then
+if [ -f "$__object/parameter/filter-service" -a -f "$__object/parameter/filter-state" ]; then
echo "Use either --filter-service or --filter-state but not both." >&2
exit 1
fi
@@ -35,8 +35,7 @@ fi
echo "{"
printf ' "watches": [{\n'
printf ' "type": "%s"\n' "$watch_type"
-cd "$__object/parameter/"
-for param in *; do
+for param in $(ls "$__object/parameter/"); do
case "$param" in
state) continue ;;
filter-*)
diff --git a/cdist/conf/type/__consul_watch_event/explorer/conf-dir b/cdist/conf/type/__consul_watch_event/explorer/conf-dir
deleted file mode 120000
index daa712c3..00000000
--- a/cdist/conf/type/__consul_watch_event/explorer/conf-dir
+++ /dev/null
@@ -1 +0,0 @@
-../../__consul_service/explorer/conf-dir
\ No newline at end of file
diff --git a/cdist/conf/type/__consul_watch_event/man.rst b/cdist/conf/type/__consul_watch_event/man.text
similarity index 52%
rename from cdist/conf/type/__consul_watch_event/man.rst
rename to cdist/conf/type/__consul_watch_event/man.text
index 6fe60d40..3b393241 100644
--- a/cdist/conf/type/__consul_watch_event/man.rst
+++ b/cdist/conf/type/__consul_watch_event/man.text
@@ -1,9 +1,11 @@
cdist-type__consul_watch_event(7)
=================================
+Steven Armstrong
+
NAME
----
-cdist-type__consul_watch_event - Manages consul event watches
+cdist-type__consul_watch_event - manages consul event watches
DESCRIPTION
@@ -14,53 +16,43 @@ See http://www.consul.io/docs/agent/watches.html for parameter documentation.
REQUIRED PARAMETERS
-------------------
-handler
+handler::
the handler to invoke when the data view updates
OPTIONAL PARAMETERS
-------------------
-datacenter
+datacenter::
can be provided to override the agent's default datacenter
-
-name
+name::
restrict the watch to only events with the given name
-
-state
+state::
if this watch is 'present' or 'absent'. Defaults to 'present'.
-
-token
+token::
can be provided to override the agent's default ACL token
EXAMPLES
--------
-.. code-block:: sh
+--------------------------------------------------------------------------------
+__consul_watch_event some-id \
+ --handler /usr/bin/my-handler.sh
- __consul_watch_event some-id \
- --handler /usr/bin/my-handler.sh
-
- __consul_watch_event some-id \
- --name web-deploy \
- --handler /usr/bin/my-handler.sh
+__consul_watch_event some-id \
+ --name web-deploy \
+ --handler /usr/bin/my-handler.sh
+--------------------------------------------------------------------------------
SEE ALSO
--------
-:strong:`cdist-type__consul_agent`\ (7)
-
-consul documentation at: .
-
-
-AUTHORS
--------
-Steven Armstrong
+- cdist-type(7)
+- cdist-type__consul_agent(7)
+- http://www.consul.io/docs/agent/watches.html
COPYING
-------
-Copyright \(C) 2015 Steven Armstrong. You can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
+Copyright \(C) 2015 Steven Armstrong. Free use of this software is
+granted under the terms of the GNU General Public License version 3 (GPLv3).
diff --git a/cdist/conf/type/__consul_watch_event/manifest b/cdist/conf/type/__consul_watch_event/manifest
index b17680c1..4e36a10d 100755
--- a/cdist/conf/type/__consul_watch_event/manifest
+++ b/cdist/conf/type/__consul_watch_event/manifest
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/sh
#
# 2015 Steven Armstrong (steven-cdist at armstrong.cc)
#
@@ -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")"
@@ -29,8 +29,7 @@ state="$(cat "$__object/parameter/state")"
echo "{"
printf ' "watches": [{\n'
printf ' "type": "%s"\n' "$watch_type"
-cd "$__object/parameter/"
-for param in *; do
+for param in $(ls "$__object/parameter/"); do
case "$param" in
state) continue ;;
*)
diff --git a/cdist/conf/type/__consul_watch_key/explorer/conf-dir b/cdist/conf/type/__consul_watch_key/explorer/conf-dir
deleted file mode 120000
index daa712c3..00000000
--- a/cdist/conf/type/__consul_watch_key/explorer/conf-dir
+++ /dev/null
@@ -1 +0,0 @@
-../../__consul_service/explorer/conf-dir
\ No newline at end of file
diff --git a/cdist/conf/type/__consul_watch_key/man.rst b/cdist/conf/type/__consul_watch_key/man.text
similarity index 54%
rename from cdist/conf/type/__consul_watch_key/man.rst
rename to cdist/conf/type/__consul_watch_key/man.text
index a12f8425..5d8381cb 100644
--- a/cdist/conf/type/__consul_watch_key/man.rst
+++ b/cdist/conf/type/__consul_watch_key/man.text
@@ -1,9 +1,11 @@
cdist-type__consul_watch_key(7)
===============================
+Steven Armstrong
+
NAME
----
-cdist-type__consul_watch_key - Manages consul key watches
+cdist-type__consul_watch_key - manages consul key watches
DESCRIPTION
@@ -14,50 +16,40 @@ See http://www.consul.io/docs/agent/watches.html for parameter documentation.
REQUIRED PARAMETERS
-------------------
-handler
+handler::
the handler to invoke when the data view updates
-
-key
+key::
the key to watch for changes
OPTIONAL PARAMETERS
-------------------
-datacenter
+datacenter::
can be provided to override the agent's default datacenter
-
-state
+state::
if this watch is 'present' or 'absent'. Defaults to 'present'.
-
-token
+token::
can be provided to override the agent's default ACL token
EXAMPLES
--------
-.. code-block:: sh
-
- __consul_watch_key some-id \
- --key foo/bar/baz \
- --handler /usr/bin/my-key-handler.sh
+--------------------------------------------------------------------------------
+__consul_watch_key some-id \
+ --key foo/bar/baz \
+ --handler /usr/bin/my-key-handler.sh
+--------------------------------------------------------------------------------
SEE ALSO
--------
-:strong:`cdist-type__consul_agent`\ (7)
-
-consul documentation at: .
-
-
-AUTHORS
--------
-Steven Armstrong
+- cdist-type(7)
+- cdist-type__consul_agent(7)
+- http://www.consul.io/docs/agent/watches.html
COPYING
-------
-Copyright \(C) 2015 Steven Armstrong. You can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
+Copyright \(C) 2015 Steven Armstrong. Free use of this software is
+granted under the terms of the GNU General Public License version 3 (GPLv3).
diff --git a/cdist/conf/type/__consul_watch_key/manifest b/cdist/conf/type/__consul_watch_key/manifest
index b17680c1..4e36a10d 100755
--- a/cdist/conf/type/__consul_watch_key/manifest
+++ b/cdist/conf/type/__consul_watch_key/manifest
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/sh
#
# 2015 Steven Armstrong (steven-cdist at armstrong.cc)
#
@@ -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")"
@@ -29,8 +29,7 @@ state="$(cat "$__object/parameter/state")"
echo "{"
printf ' "watches": [{\n'
printf ' "type": "%s"\n' "$watch_type"
-cd "$__object/parameter/"
-for param in *; do
+for param in $(ls "$__object/parameter/"); do
case "$param" in
state) continue ;;
*)
diff --git a/cdist/conf/type/__consul_watch_keyprefix/explorer/conf-dir b/cdist/conf/type/__consul_watch_keyprefix/explorer/conf-dir
deleted file mode 120000
index daa712c3..00000000
--- a/cdist/conf/type/__consul_watch_keyprefix/explorer/conf-dir
+++ /dev/null
@@ -1 +0,0 @@
-../../__consul_service/explorer/conf-dir
\ No newline at end of file
diff --git a/cdist/conf/type/__consul_watch_keyprefix/man.rst b/cdist/conf/type/__consul_watch_keyprefix/man.text
similarity index 55%
rename from cdist/conf/type/__consul_watch_keyprefix/man.rst
rename to cdist/conf/type/__consul_watch_keyprefix/man.text
index c600323c..e2f05de2 100644
--- a/cdist/conf/type/__consul_watch_keyprefix/man.rst
+++ b/cdist/conf/type/__consul_watch_keyprefix/man.text
@@ -1,9 +1,11 @@
cdist-type__consul_watch_keyprefix(7)
=====================================
+Steven Armstrong
+
NAME
----
-cdist-type__consul_watch_keyprefix - Manages consul keyprefix watches
+cdist-type__consul_watch_keyprefix - manages consul keyprefix watches
DESCRIPTION
@@ -14,50 +16,40 @@ See http://www.consul.io/docs/agent/watches.html for parameter documentation.
REQUIRED PARAMETERS
-------------------
-handler
+handler::
the handler to invoke when the data view updates
-
-prefix
+prefix::
the prefix of keys to watch for changes
OPTIONAL PARAMETERS
-------------------
-datacenter
+datacenter::
can be provided to override the agent's default datacenter
-
-state
+state::
if this watch is 'present' or 'absent'. Defaults to 'present'.
-
-token
+token::
can be provided to override the agent's default ACL token
EXAMPLES
--------
-.. code-block:: sh
-
- __consul_watch_keyprefix some-id \
- --prefix foo/ \
- --handler /usr/bin/my-prefix-handler.sh
+--------------------------------------------------------------------------------
+__consul_watch_keyprefix some-id \
+ --prefix foo/ \
+ --handler /usr/bin/my-prefix-handler.sh
+--------------------------------------------------------------------------------
SEE ALSO
--------
-:strong:`cdist-type__consul_agent`\ (7)
-
-consul documentation at: .
-
-
-AUTHORS
--------
-Steven Armstrong
+- cdist-type(7)
+- cdist-type__consul_agent(7)
+- http://www.consul.io/docs/agent/watches.html
COPYING
-------
-Copyright \(C) 2015 Steven Armstrong. You can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
+Copyright \(C) 2015 Steven Armstrong. Free use of this software is
+granted under the terms of the GNU General Public License version 3 (GPLv3).
diff --git a/cdist/conf/type/__consul_watch_keyprefix/manifest b/cdist/conf/type/__consul_watch_keyprefix/manifest
index b17680c1..4e36a10d 100755
--- a/cdist/conf/type/__consul_watch_keyprefix/manifest
+++ b/cdist/conf/type/__consul_watch_keyprefix/manifest
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/sh
#
# 2015 Steven Armstrong (steven-cdist at armstrong.cc)
#
@@ -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")"
@@ -29,8 +29,7 @@ state="$(cat "$__object/parameter/state")"
echo "{"
printf ' "watches": [{\n'
printf ' "type": "%s"\n' "$watch_type"
-cd "$__object/parameter/"
-for param in *; do
+for param in $(ls "$__object/parameter/"); do
case "$param" in
state) continue ;;
*)
diff --git a/cdist/conf/type/__consul_watch_nodes/explorer/conf-dir b/cdist/conf/type/__consul_watch_nodes/explorer/conf-dir
deleted file mode 120000
index daa712c3..00000000
--- a/cdist/conf/type/__consul_watch_nodes/explorer/conf-dir
+++ /dev/null
@@ -1 +0,0 @@
-../../__consul_service/explorer/conf-dir
\ No newline at end of file
diff --git a/cdist/conf/type/__consul_watch_nodes/man.rst b/cdist/conf/type/__consul_watch_nodes/man.text
similarity index 54%
rename from cdist/conf/type/__consul_watch_nodes/man.rst
rename to cdist/conf/type/__consul_watch_nodes/man.text
index d886a586..70b83e92 100644
--- a/cdist/conf/type/__consul_watch_nodes/man.rst
+++ b/cdist/conf/type/__consul_watch_nodes/man.text
@@ -1,9 +1,11 @@
cdist-type__consul_watch_nodes(7)
=================================
+Steven Armstrong
+
NAME
----
-cdist-type__consul_watch_nodes - Manages consul nodes watches
+cdist-type__consul_watch_nodes - manages consul nodes watches
DESCRIPTION
@@ -14,46 +16,37 @@ See http://www.consul.io/docs/agent/watches.html for parameter documentation.
REQUIRED PARAMETERS
-------------------
-handler
+handler::
the handler to invoke when the data view updates
OPTIONAL PARAMETERS
-------------------
-datacenter
+datacenter::
can be provided to override the agent's default datacenter
-
-state
+state::
if this watch is 'present' or 'absent'. Defaults to 'present'.
-
-token
+token::
can be provided to override the agent's default ACL token
EXAMPLES
--------
-.. code-block:: sh
-
- __consul_watch_nodes some-id \
- --handler /usr/bin/my-key-handler.sh
+--------------------------------------------------------------------------------
+__consul_watch_nodes some-id \
+ --handler /usr/bin/my-key-handler.sh
+--------------------------------------------------------------------------------
SEE ALSO
--------
-:strong:`cdist-type__consul_agent`\ (7)
-
-consul documentation at: .
-
-
-AUTHORS
--------
-Steven Armstrong
+- cdist-type(7)
+- cdist-type__consul_agent(7)
+- http://www.consul.io/docs/agent/watches.html
COPYING
-------
-Copyright \(C) 2015 Steven Armstrong. You can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
+Copyright \(C) 2015 Steven Armstrong. Free use of this software is
+granted under the terms of the GNU General Public License version 3 (GPLv3).
diff --git a/cdist/conf/type/__consul_watch_nodes/manifest b/cdist/conf/type/__consul_watch_nodes/manifest
index b17680c1..4e36a10d 100755
--- a/cdist/conf/type/__consul_watch_nodes/manifest
+++ b/cdist/conf/type/__consul_watch_nodes/manifest
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/sh
#
# 2015 Steven Armstrong (steven-cdist at armstrong.cc)
#
@@ -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")"
@@ -29,8 +29,7 @@ state="$(cat "$__object/parameter/state")"
echo "{"
printf ' "watches": [{\n'
printf ' "type": "%s"\n' "$watch_type"
-cd "$__object/parameter/"
-for param in *; do
+for param in $(ls "$__object/parameter/"); do
case "$param" in
state) continue ;;
*)
diff --git a/cdist/conf/type/__consul_watch_service/explorer/conf-dir b/cdist/conf/type/__consul_watch_service/explorer/conf-dir
deleted file mode 120000
index daa712c3..00000000
--- a/cdist/conf/type/__consul_watch_service/explorer/conf-dir
+++ /dev/null
@@ -1 +0,0 @@
-../../__consul_service/explorer/conf-dir
\ No newline at end of file
diff --git a/cdist/conf/type/__consul_watch_service/man.rst b/cdist/conf/type/__consul_watch_service/man.rst
deleted file mode 100644
index 37cabcc9..00000000
--- a/cdist/conf/type/__consul_watch_service/man.rst
+++ /dev/null
@@ -1,83 +0,0 @@
-cdist-type__consul_watch_service(7)
-===================================
-
-NAME
-----
-cdist-type__consul_watch_service - Manages consul service watches
-
-
-DESCRIPTION
------------
-Generate and deploy watch definitions of type 'service' for a consul agent.
-See http://www.consul.io/docs/agent/watches.html for parameter documentation.
-
-
-REQUIRED PARAMETERS
--------------------
-handler
- the handler to invoke when the data view updates
-
-service
- the service to watch for changes
-
-
-OPTIONAL PARAMETERS
--------------------
-datacenter
- can be provided to override the agent's default datacenter
-
-state
- if this watch is 'present' or 'absent'. Defaults to 'present'.
-
-token
- can be provided to override the agent's default ACL token
-
-tag
- filter by tag
-
-
-BOOLEAN PARAMETERS
-------------------
-passingonly
- specifies if only hosts passing all checks are displayed
-
-
-EXAMPLES
---------
-
-.. code-block:: sh
-
- __consul_watch_service some-id \
- --service consul \
- --handler /usr/bin/my-handler.sh
-
- __consul_watch_service some-id \
- --service redis \
- --tag production \
- --handler /usr/bin/my-handler.sh
-
- __consul_watch_service some-id \
- --service redis \
- --tag production \
- --passingonly \
- --handler /usr/bin/my-handler.sh
-
-
-SEE ALSO
---------
-:strong:`cdist-type__consul_agent`\ (7)
-
-consul documentation at: .
-
-
-AUTHORS
--------
-Steven Armstrong
-
-
-COPYING
--------
-Copyright \(C) 2015 Steven Armstrong. You can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
diff --git a/cdist/conf/type/__consul_watch_service/man.text b/cdist/conf/type/__consul_watch_service/man.text
new file mode 100644
index 00000000..c7731a97
--- /dev/null
+++ b/cdist/conf/type/__consul_watch_service/man.text
@@ -0,0 +1,74 @@
+cdist-type__consul_watch_service(7)
+===================================
+Steven Armstrong
+
+
+NAME
+----
+cdist-type__consul_watch_service - manages consul service watches
+
+
+DESCRIPTION
+-----------
+Generate and deploy watch definitions of type 'service' for a consul agent.
+See http://www.consul.io/docs/agent/watches.html for parameter documentation.
+
+
+REQUIRED PARAMETERS
+-------------------
+handler::
+ the handler to invoke when the data view updates
+service::
+ the service to watch for changes
+
+
+OPTIONAL PARAMETERS
+-------------------
+datacenter::
+ can be provided to override the agent's default datacenter
+state::
+ if this watch is 'present' or 'absent'. Defaults to 'present'.
+token::
+ can be provided to override the agent's default ACL token
+tag::
+ filter by tag
+
+
+BOOLEAN PARAMETERS
+------------------
+passingonly::
+ specifies if only hosts passing all checks are displayed
+
+
+EXAMPLES
+--------
+
+--------------------------------------------------------------------------------
+__consul_watch_service some-id \
+ --service consul \
+ --handler /usr/bin/my-handler.sh
+
+__consul_watch_service some-id \
+ --service redis \
+ --tag production \
+ --handler /usr/bin/my-handler.sh
+
+__consul_watch_service some-id \
+ --service redis \
+ --tag production \
+ --passingonly \
+ --handler /usr/bin/my-handler.sh
+--------------------------------------------------------------------------------
+
+
+SEE ALSO
+--------
+- cdist-type(7)
+- cdist-type__consul_agent(7)
+- http://www.consul.io/docs/agent/watches.html
+
+
+COPYING
+-------
+Copyright \(C) 2015 Steven Armstrong. Free use of this software is
+granted under the terms of the GNU General Public License version 3 (GPLv3).
diff --git a/cdist/conf/type/__consul_watch_service/manifest b/cdist/conf/type/__consul_watch_service/manifest
index e8d18328..6011e288 100755
--- a/cdist/conf/type/__consul_watch_service/manifest
+++ b/cdist/conf/type/__consul_watch_service/manifest
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/sh
#
# 2015 Steven Armstrong (steven-cdist at armstrong.cc)
#
@@ -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")"
@@ -29,8 +29,7 @@ state="$(cat "$__object/parameter/state")"
echo "{"
printf ' "watches": [{\n'
printf ' "type": "%s"\n' "$watch_type"
-cd "$__object/parameter/"
-for param in *; do
+for param in $(ls "$__object/parameter/"); do
case "$param" in
state) continue ;;
passingonly)
diff --git a/cdist/conf/type/__consul_watch_services/explorer/conf-dir b/cdist/conf/type/__consul_watch_services/explorer/conf-dir
deleted file mode 120000
index daa712c3..00000000
--- a/cdist/conf/type/__consul_watch_services/explorer/conf-dir
+++ /dev/null
@@ -1 +0,0 @@
-../../__consul_service/explorer/conf-dir
\ No newline at end of file
diff --git a/cdist/conf/type/__consul_watch_services/man.rst b/cdist/conf/type/__consul_watch_services/man.text
similarity index 54%
rename from cdist/conf/type/__consul_watch_services/man.rst
rename to cdist/conf/type/__consul_watch_services/man.text
index cea5f901..bc489493 100644
--- a/cdist/conf/type/__consul_watch_services/man.rst
+++ b/cdist/conf/type/__consul_watch_services/man.text
@@ -1,9 +1,11 @@
cdist-type__consul_watch_services(7)
====================================
+Steven Armstrong
+
NAME
----
-cdist-type__consul_watch_services - Manages consul services watches
+cdist-type__consul_watch_services - manages consul services watches
DESCRIPTION
@@ -14,46 +16,37 @@ See http://www.consul.io/docs/agent/watches.html for parameter documentation.
REQUIRED PARAMETERS
-------------------
-handler
+handler::
the handler to invoke when the data view updates
OPTIONAL PARAMETERS
-------------------
-datacenter
+datacenter::
can be provided to override the agent's default datacenter
-
-state
+state::
if this watch is 'present' or 'absent'. Defaults to 'present'.
-
-token
+token::
can be provided to override the agent's default ACL token
EXAMPLES
--------
-.. code-block:: sh
-
- __consul_watch_services some-id \
- --handler /usr/bin/my-key-handler.sh
+--------------------------------------------------------------------------------
+__consul_watch_services some-id \
+ --handler /usr/bin/my-key-handler.sh
+--------------------------------------------------------------------------------
SEE ALSO
--------
-:strong:`cdist-type__consul_agent`\ (7)
-
-consul documentation at: .
-
-
-AUTHORS
--------
-Steven Armstrong
+- cdist-type(7)
+- cdist-type__consul_agent(7)
+- http://www.consul.io/docs/agent/watches.html
COPYING
-------
-Copyright \(C) 2015 Steven Armstrong. You can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
+Copyright \(C) 2015 Steven Armstrong. Free use of this software is
+granted under the terms of the GNU General Public License version 3 (GPLv3).
diff --git a/cdist/conf/type/__consul_watch_services/manifest b/cdist/conf/type/__consul_watch_services/manifest
index b17680c1..4e36a10d 100755
--- a/cdist/conf/type/__consul_watch_services/manifest
+++ b/cdist/conf/type/__consul_watch_services/manifest
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/sh
#
# 2015 Steven Armstrong (steven-cdist at armstrong.cc)
#
@@ -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")"
@@ -29,8 +29,7 @@ state="$(cat "$__object/parameter/state")"
echo "{"
printf ' "watches": [{\n'
printf ' "type": "%s"\n' "$watch_type"
-cd "$__object/parameter/"
-for param in *; do
+for param in $(ls "$__object/parameter/"); do
case "$param" in
state) continue ;;
*)
diff --git a/cdist/conf/type/__cron/explorer/entry b/cdist/conf/type/__cron/explorer/entry
index 801861a3..c3bf02d2 100644
--- a/cdist/conf/type/__cron/explorer/entry
+++ b/cdist/conf/type/__cron/explorer/entry
@@ -22,9 +22,4 @@
name="$__object_name"
user="$(cat "$__object/parameter/user")"
-if [ -f "$__object/parameter/raw_command" ]; then
- command="$(cat "$__object/parameter/command")"
- crontab -u "$user" -l 2>/dev/null | grep "^$command\$" || true
-else
- crontab -u "$user" -l 2>/dev/null | grep "# $name\$" || true
-fi
+crontab -u $user -l 2>/dev/null | grep "# $name\$" || true
diff --git a/cdist/conf/type/__cron/gencode-remote b/cdist/conf/type/__cron/gencode-remote
index 9debbc47..77a63b9b 100755
--- a/cdist/conf/type/__cron/gencode-remote
+++ b/cdist/conf/type/__cron/gencode-remote
@@ -1,9 +1,8 @@
-#!/bin/sh -e
+#!/bin/sh
#
# 2011 Steven Armstrong (steven-cdist at armstrong.cc)
# 2013 Nico Schottelius (nico-cdist at schottelius.org)
# 2013 Thomas Oettli (otho at sfs.biz)
-# 2017 Daniel Heule (hda at sfs.biz)
#
# This file is part of cdist.
#
@@ -27,32 +26,29 @@ command="$(cat "$__object/parameter/command")"
if [ -f "$__object/parameter/raw" ]; then
raw="$(cat "$__object/parameter/raw")"
- entry="$raw $command # $name"
+ entry="$raw $command"
elif [ -f "$__object/parameter/raw_command" ]; then
entry="$command"
else
- minute="$(cat "$__object/parameter/minute")"
- hour="$(cat "$__object/parameter/hour")"
- day_of_month="$(cat "$__object/parameter/day_of_month")"
- month="$(cat "$__object/parameter/month")"
- day_of_week="$(cat "$__object/parameter/day_of_week")"
- entry="$minute $hour $day_of_month $month $day_of_week $command # $name"
+ minute="$(cat "$__object/parameter/minute" 2>/dev/null || echo "*")"
+ hour="$(cat "$__object/parameter/hour" 2>/dev/null || echo "*")"
+ day_of_month="$(cat "$__object/parameter/day_of_month" 2>/dev/null || echo "*")"
+ month="$(cat "$__object/parameter/month" 2>/dev/null || echo "*")"
+ day_of_week="$(cat "$__object/parameter/day_of_week" 2>/dev/null || echo "*")"
+ entry="$minute $hour $day_of_month $month $day_of_week $command"
fi
+entry="$entry # $name"
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
+if diff -q "$__object/files/entry" "$__object/explorer/entry" >/dev/null; then
+ state_is=present
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
@@ -62,7 +58,7 @@ state_should="$(cat "$__object/parameter/state")"
# These are the old markers
prefix="#cdist:__cron/$__object_id"
suffix="#/cdist:__cron/$__object_id"
-filter='^# DO NOT EDIT THIS FILE|^# \(.* installed on |^# \(Cron version V|^# \(Cronie version .\..\)$'
+filter="^# DO NOT EDIT THIS FILE|^# \(.* installed on |^# \(Cron version V"
cat << DONE
crontab -u $user -l 2>/dev/null | grep -v -E "$filter" | awk -v prefix="$prefix" -v suffix="$suffix" '
{
@@ -89,12 +85,7 @@ case "$state_should" in
echo ") | crontab -u $user -"
;;
absent)
- if [ -f "$__object/parameter/raw_command" ]; then
- echo "( crontab -u $user -l 2>/dev/null | grep -v -E \"$filter\" 2>/dev/null || true ) | \\"
- echo "grep -v \"^$entry\\$\" | crontab -u $user -"
- else
- echo "( crontab -u $user -l 2>/dev/null | grep -v -E \"$filter\" 2>/dev/null || true ) | \\"
- echo "grep -v \"# $name\\$\" | crontab -u $user -"
- fi
+ echo "( crontab -u $user -l 2>/dev/null | grep -v -E \"$filter\" 2>/dev/null || true ) | \\"
+ echo "grep -v \"# $name\\$\" | crontab -u $user -"
;;
esac
diff --git a/cdist/conf/type/__cron/man.rst b/cdist/conf/type/__cron/man.rst
deleted file mode 100644
index e39bfb5c..00000000
--- a/cdist/conf/type/__cron/man.rst
+++ /dev/null
@@ -1,89 +0,0 @@
-cdist-type__cron(7)
-===================
-
-NAME
-----
-cdist-type__cron - Installs and manages cron jobs
-
-
-DESCRIPTION
------------
-This cdist type allows you to manage entries in a users crontab.
-
-
-REQUIRED PARAMETERS
--------------------
-user
- The user who's crontab is edited
-command
- The command to run.
-
-
-OPTIONAL PARAMETERS
--------------------
-**NOTE**: All time-related parameters (``--minute``, ``--hour``, ``--day_of_month``
-``--month`` and ``--day_of_week``) defaults to ``*``, which means to execute it
-**always**. If you set ``--hour 0`` to execute the cronjob only at midnight, it
-will execute **every** minute in the first hour of the morning all days.
-
-state
- Either present or absent. Defaults to present.
-minute
- See crontab(5). Defaults to *
-hour
- See crontab(5). Defaults to *
-day_of_month
- See crontab(5). Defaults to *
-month
- See crontab(5). Defaults to *
-day_of_week
- See crontab(5). Defaults to *
-raw
- Take whatever the user has given instead of time and date fields.
- If given, all other time and date fields are ignored.
- Can for example be used to specify cron EXTENSIONS like reboot, yearly etc.
- See crontab(5) for the extensions if any that your cron implementation
- implements.
-raw_command
- Take whatever the user has given in the command and ignore everything else.
- If given, the command will be added to crontab.
- Can for example be used to define variables like SHELL or MAILTO.
-
-
-EXAMPLES
---------
-
-.. code-block:: sh
-
- # run Monday to Saturday at 23:15
- __cron some-id --user root --command "/path/to/script" \
- --hour 23 --minute 15 --day_of_week 1-6
-
- # run on reboot
- __cron some-id --user root --command "/path/to/script" \
- --raw @reboot
-
- # remove cronjob
- __cron some-id --user root --command "/path/to/script" --state absent
-
- # define default shell
- __cron some-id --user root --raw_command --command "SHELL=/bin/bash" \
- --state present
-
-
-SEE ALSO
---------
-:strong:`crontab`\ (5)
-
-
-AUTHORS
--------
-Steven Armstrong
-
-
-COPYING
--------
-Copyright \(C) 2011-2013 Steven Armstrong. You can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
diff --git a/cdist/conf/type/__cron/man.text b/cdist/conf/type/__cron/man.text
new file mode 100644
index 00000000..f4e80a08
--- /dev/null
+++ b/cdist/conf/type/__cron/man.text
@@ -0,0 +1,80 @@
+cdist-type__cron(7)
+===================
+Steven Armstrong
+
+
+NAME
+----
+cdist-type__cron - installs and manages cron jobs
+
+
+DESCRIPTION
+-----------
+This cdist type allows you to manage entries in a users crontab.
+
+
+REQUIRED PARAMETERS
+-------------------
+user::
+ The user who's crontab is edited
+command::
+ The command to run.
+
+
+OPTIONAL PARAMETERS
+-------------------
+state::
+ Either present or absent. Defaults to present.
+minute::
+ See crontab(5). Defaults to *
+hour::
+ See crontab(5). Defaults to *
+day_of_month::
+ See crontab(5). Defaults to *
+month::
+ See crontab(5). Defaults to *
+day_of_week::
+ See crontab(5). Defaults to *
+raw::
+ Take whatever the user has given instead of time and date fields.
+ If given, all other time and date fields are ignored.
+ Can for example be used to specify cron EXTENSIONS like reboot, yearly etc.
+ See crontab(5) for the extensions if any that your cron implementation
+ implements.
+raw_command::
+ Take whatever the user has given in the commmand and ignore everything else.
+ If given, the command will be added to crontab.
+ Can for example be used to define variables like SHELL or MAILTO.
+
+
+EXAMPLES
+--------
+
+--------------------------------------------------------------------------------
+# run Monday to Saturday at 23:15
+__cron some-id --user root --command "/path/to/script" \
+ --hour 23 --minute 15 --day_of_week 1-6
+
+# run on reboot
+__cron some-id --user root --command "/path/to/script" \
+ --raw @reboot
+
+# remove cronjob
+__cron some-id --user root --command "/path/to/script" --state absent
+
+# define default shell
+__cron some-id --user root --raw_command --command "SHELL=/bin/bash" \
+ --state present
+--------------------------------------------------------------------------------
+
+
+SEE ALSO
+--------
+- cdist-type(7)
+- crontab(5)
+
+
+COPYING
+-------
+Copyright \(C) 2011-2013 Steven Armstrong. Free use of this software is
+granted under the terms of the GNU General Public License version 3 (GPLv3).
diff --git a/cdist/conf/type/__cron/manifest b/cdist/conf/type/__cron/manifest
old mode 100755
new mode 100644
index e7b51863..9992df25
--- a/cdist/conf/type/__cron/manifest
+++ b/cdist/conf/type/__cron/manifest
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/sh
#
# 2013 Thomas Oettli (otho at sfs.biz)
#
@@ -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
diff --git a/cdist/conf/type/__cron/nonparallel b/cdist/conf/type/__cron/nonparallel
deleted file mode 100644
index e69de29b..00000000
diff --git a/cdist/conf/type/__cron/parameter/default/day_of_month b/cdist/conf/type/__cron/parameter/default/day_of_month
deleted file mode 100644
index 72e8ffc0..00000000
--- a/cdist/conf/type/__cron/parameter/default/day_of_month
+++ /dev/null
@@ -1 +0,0 @@
-*
diff --git a/cdist/conf/type/__cron/parameter/default/day_of_week b/cdist/conf/type/__cron/parameter/default/day_of_week
deleted file mode 100644
index 72e8ffc0..00000000
--- a/cdist/conf/type/__cron/parameter/default/day_of_week
+++ /dev/null
@@ -1 +0,0 @@
-*
diff --git a/cdist/conf/type/__cron/parameter/default/hour b/cdist/conf/type/__cron/parameter/default/hour
deleted file mode 100644
index 72e8ffc0..00000000
--- a/cdist/conf/type/__cron/parameter/default/hour
+++ /dev/null
@@ -1 +0,0 @@
-*
diff --git a/cdist/conf/type/__cron/parameter/default/minute b/cdist/conf/type/__cron/parameter/default/minute
deleted file mode 100644
index 72e8ffc0..00000000
--- a/cdist/conf/type/__cron/parameter/default/minute
+++ /dev/null
@@ -1 +0,0 @@
-*
diff --git a/cdist/conf/type/__cron/parameter/default/month b/cdist/conf/type/__cron/parameter/default/month
deleted file mode 100644
index 72e8ffc0..00000000
--- a/cdist/conf/type/__cron/parameter/default/month
+++ /dev/null
@@ -1 +0,0 @@
-*
diff --git a/cdist/conf/type/__cron/parameter/default/state b/cdist/conf/type/__cron/parameter/default/state
deleted file mode 100644
index e7f6134f..00000000
--- a/cdist/conf/type/__cron/parameter/default/state
+++ /dev/null
@@ -1 +0,0 @@
-present
diff --git a/cdist/conf/type/__daemontools/files/init.d-svscan b/cdist/conf/type/__daemontools/files/init.d-svscan
deleted file mode 100644
index 996eb4e8..00000000
--- a/cdist/conf/type/__daemontools/files/init.d-svscan
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/bash
-### BEGIN INIT INFO
-# Provides: svscan
-# Required-Start:
-# Required-Stop:
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-# Short-Description: svscan
-# Description: djb svscan
-### END INIT INFO
-# from https://gist.githubusercontent.com/pacojp/5766990/raw/2ed009ab19515afc9e58291b636d673c5ca864b3/init.d.svscan
-# written by Adam McKenna
-# edited by Kamila Součková
-
-export PATH=$PATH:/usr/local/bin
-
-l=/var/log/svscan
-
-if [ ! -d $l ]; then
- mkdir $l
- chown daemon $l
-fi
-
-case "$1" in
- start)
- printf "Starting daemontools: "
- if ! pidof svscan > /dev/null 2>&1; then
- printf "svscan "
- env - PATH="$PATH" svscan /service 2>&1 | setuidgid daemon multilog t /var/log/svscan &
- echo "."
- else
- echo "already running."
- fi
- ;;
- stop)
- printf "Stopping daemontools: "
- pids="$(pidof svscan)"
- if [ -n "${pids}" ]
- then
- printf "svscan"
- while [ -n "${pids}" ]
- do
- # shellcheck disable=SC2086
- kill ${pids}
- printf "."
- pids="$(pidof svscan)"
- done
- fi
- printf " services"
- for i in /service/*; do
- svc -dx "$i"
- printf "."
- done
- printf " logging "
- for i in /service/*/log; do
- svc -dx "$i"
- printf "."
- done
- echo ""
- ;;
- restart|force-reload)
- $0 stop
- $0 start
- ;;
- *)
- echo 'Usage: /etc/init.d/svscan {start|stop|restart|force-reload}'
- exit 1
-esac
diff --git a/cdist/conf/type/__daemontools/man.rst b/cdist/conf/type/__daemontools/man.rst
deleted file mode 100644
index bc1b4d33..00000000
--- a/cdist/conf/type/__daemontools/man.rst
+++ /dev/null
@@ -1,54 +0,0 @@
-cdist-type__daemontools(7)
-==========================
-
-NAME
-----
-cdist-type__daemontools - Install daemontools
-
-
-DESCRIPTION
------------
-Install djb daemontools and (optionally) an init script.
-
-
-REQUIRED PARAMETERS
--------------------
-None.
-
-
-OPTIONAL PARAMETERS
--------------------
-from-package
- Package to install. Must be compatible with the original daemontools. Example: daemontools-encore. Default: daemontools.
-
-servicedir
- Directory to scan for services. Default: `/service`
-
-
-BOOLEAN PARAMETERS
-------------------
-install-init-script
- Add an init script and set it to start on boot.
-
-
-EXAMPLES
---------
-
-.. code-block:: sh
-
- __daemontools --from-package daemontools-encore # if you prefer
-
-SEE ALSO
---------
-:strong:`cdist-type__daemontools_service`\ (7)
-
-AUTHORS
--------
-Kamila Součková
-
-COPYING
--------
-Copyright \(C) 2017 Kamila Součková. 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.
diff --git a/cdist/conf/type/__daemontools/manifest b/cdist/conf/type/__daemontools/manifest
deleted file mode 100755
index b04c7e07..00000000
--- a/cdist/conf/type/__daemontools/manifest
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/sh -e
-
-pkg=$(cat "$__object/parameter/from-package")
-servicedir=$(cat "$__object/parameter/servicedir")
-
-__package "$pkg"
-__directory "$servicedir" --mode 700
-
-os=$(cat "$__global/explorer/os")
-init=$(cat "$__global/explorer/init")
-
-require=""
-case $os in
- freebsd)
- # TODO change to __start_on_boot once it supports freebsd
- __config_file /etc/rc.conf.d/svscan --source - <<-EOT
- svscan_enable="YES"
- svscan_servicedir="$servicedir"
- EOT
- require="$require __package/$pkg __directory/$servicedir __config_file/etc/rc.conf.d/svscan" \
- __process svscan --name ".*/svscan $servicedir" --start 'service svscan start'
- ;;
- *)
- case $init in
- init)
- if [ -f "$__object/parameter/install-init-script" ]; then
- __config_file /etc/init.d/svscan --mode 755 --source "$__type/files/init.d-svscan"
- REQUIREEXTRA="__config_file/etc/init.d/svscan"
- fi
- require="$require $REQUIREEXTRA" __start_on_boot svscan
- require="$require __package/$pkg __directory/$servicedir __start_on_boot/svscan" \
- __process svscan --name ".*/svscan $servicedir" --start 'service svscan start'
- ;;
- *)
- echo "Your init system ($init) is not supported by this type. Submit a patch at github.com/ungleich/cdist!"
- exit 1
- ;;
- esac
- ;;
-esac
diff --git a/cdist/conf/type/__daemontools/parameter/boolean b/cdist/conf/type/__daemontools/parameter/boolean
deleted file mode 100644
index 99a1cefd..00000000
--- a/cdist/conf/type/__daemontools/parameter/boolean
+++ /dev/null
@@ -1 +0,0 @@
-install-init-script
diff --git a/cdist/conf/type/__daemontools/parameter/default/from-package b/cdist/conf/type/__daemontools/parameter/default/from-package
deleted file mode 100644
index 598dd40a..00000000
--- a/cdist/conf/type/__daemontools/parameter/default/from-package
+++ /dev/null
@@ -1 +0,0 @@
-daemontools
diff --git a/cdist/conf/type/__daemontools/parameter/default/servicedir b/cdist/conf/type/__daemontools/parameter/default/servicedir
deleted file mode 100644
index b74e27f6..00000000
--- a/cdist/conf/type/__daemontools/parameter/default/servicedir
+++ /dev/null
@@ -1 +0,0 @@
-/service
diff --git a/cdist/conf/type/__daemontools/parameter/optional b/cdist/conf/type/__daemontools/parameter/optional
deleted file mode 100644
index 22c0805d..00000000
--- a/cdist/conf/type/__daemontools/parameter/optional
+++ /dev/null
@@ -1,2 +0,0 @@
-from-package
-servicedir
diff --git a/cdist/conf/type/__daemontools/singleton b/cdist/conf/type/__daemontools/singleton
deleted file mode 100644
index e69de29b..00000000
diff --git a/cdist/conf/type/__daemontools_service/explorer/svc b/cdist/conf/type/__daemontools_service/explorer/svc
deleted file mode 100755
index 9ba462f2..00000000
--- a/cdist/conf/type/__daemontools_service/explorer/svc
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-command -v svc || true
diff --git a/cdist/conf/type/__daemontools_service/man.rst b/cdist/conf/type/__daemontools_service/man.rst
deleted file mode 100644
index ec1d20ff..00000000
--- a/cdist/conf/type/__daemontools_service/man.rst
+++ /dev/null
@@ -1,72 +0,0 @@
-cdist-type__daemontools_service(7)
-==================================
-
-NAME
-----
-cdist-type__daemontools_service - Create a daemontools-compatible service dir.
-
-
-DESCRIPTION
------------
-Create a directory structure compatible with daemontools-like service management.
-
-Note that svc must be present on the target system.
-
-The object ID will be used as the service name.
-
-REQUIRED PARAMETERS
--------------------
-None.
-
-OPTIONAL PARAMETERS
--------------------
-run
- Command to run. exec-ing and stderr redirection will be added. One of run, run-file must be specified.
-
- Example: `my-program`
-
-run-file
- File to save as /run. One of run, run-file must be specified.
-
- Example:
-
-.. code-block:: sh
-
- #!/bin/sh
- exec 2>&1
- exec my_program
-
-
-log-run
- Command to run for log consumption. Default: `multilog t ./main`
-
-servicedir
- Directory to install into. Default: `/service`
-
-BOOLEAN PARAMETERS
-------------------
-None.
-
-EXAMPLES
---------
-
-.. code-block:: sh
-
- require="__daemontools" __daemontools_service prometheus --run "setuidgid prometheus $GOBIN/prometheus $FLAGS"
-
-
-SEE ALSO
---------
-:strong:`cdist-type__daemontools`\ (7)
-
-
-AUTHORS
--------
-Kamila Součková
-
-COPYING
--------
-Copyright \(C) 2017 Kamila Součková. 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.
diff --git a/cdist/conf/type/__daemontools_service/manifest b/cdist/conf/type/__daemontools_service/manifest
deleted file mode 100755
index 78bae285..00000000
--- a/cdist/conf/type/__daemontools_service/manifest
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/sh -e
-
-RUN_PREFIX="#!/bin/sh
-exec 2>&1
-exec " # mind the space :D
-
-name=$__object_id
-servicedir=$(cat "$__object/parameter/servicedir")
-run=$(cat "$__object/parameter/run")
-runfile=$(cat "$__object/parameter/run-file")
-logrun=$(cat "$__object/parameter/log-run")
-
-svc=$(cat "$__type/explorer/svc")
-
-if [ -z "$svc" ]; then
- echo "svc not found! Install daemontools first: see __daemontools"
- exit 1
-fi
-
-badusage() {
- echo "__daemontools_service/$__object_id: exactly one of --run, --run-file must be set" >&2
- exit 1
-}
-
-[ -z "$run$runfile" ] && badusage
-[ -n "$run" ] && [ -n "$runfile" ] && badusage
-
-__directory "$servicedir/$name/log/main" --parents
-
-echo "$RUN_PREFIX$run" | require="__directory/$servicedir/$name/log/main" __config_file "$servicedir/$name/run" \
- --onchange "svc -t '$servicedir/$name' 2>/dev/null" \
- --mode 755 \
- --source "${runfile:--}"
-
-echo "$RUN_PREFIX$logrun" | require="__directory/$servicedir/$name/log/main" __config_file "$servicedir/$name/log/run" \
- --onchange "svc -t '$servicedir/$name/log' 2>/dev/null" \
- --mode 755 \
- --source "-"
diff --git a/cdist/conf/type/__daemontools_service/parameter/default/log-run b/cdist/conf/type/__daemontools_service/parameter/default/log-run
deleted file mode 100644
index 80d57a74..00000000
--- a/cdist/conf/type/__daemontools_service/parameter/default/log-run
+++ /dev/null
@@ -1 +0,0 @@
-multilog t ./main
diff --git a/cdist/conf/type/__daemontools_service/parameter/default/run b/cdist/conf/type/__daemontools_service/parameter/default/run
deleted file mode 100644
index e69de29b..00000000
diff --git a/cdist/conf/type/__daemontools_service/parameter/default/run-file b/cdist/conf/type/__daemontools_service/parameter/default/run-file
deleted file mode 100644
index e69de29b..00000000
diff --git a/cdist/conf/type/__daemontools_service/parameter/default/servicedir b/cdist/conf/type/__daemontools_service/parameter/default/servicedir
deleted file mode 100644
index b74e27f6..00000000
--- a/cdist/conf/type/__daemontools_service/parameter/default/servicedir
+++ /dev/null
@@ -1 +0,0 @@
-/service
diff --git a/cdist/conf/type/__daemontools_service/parameter/optional b/cdist/conf/type/__daemontools_service/parameter/optional
deleted file mode 100644
index 7e54985f..00000000
--- a/cdist/conf/type/__daemontools_service/parameter/optional
+++ /dev/null
@@ -1,4 +0,0 @@
-log-run
-run
-run-file
-servicedir
diff --git a/cdist/conf/type/__debconf_set_selections/explorer/state b/cdist/conf/type/__debconf_set_selections/explorer/state
deleted file mode 100644
index f8a3f6c8..00000000
--- a/cdist/conf/type/__debconf_set_selections/explorer/state
+++ /dev/null
@@ -1,142 +0,0 @@
-#!/bin/sh -e
-#
-# 2021 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 .
-#
-# Determine current debconf selections' state.
-# Prints one of:
-# present: all selections are already set as they should.
-# different: one or more of the selections have a different value.
-# absent: one or more of the selections are not (currently) defined.
-#
-
-test -x /usr/bin/perl || {
- # cannot find perl (no perl ~ no debconf)
- echo 'absent'
- exit 0
-}
-
-linesfile="${__object:?}/parameter/line"
-test -s "${linesfile}" || {
- if test -s "${__object:?}/parameter/file"
- then
- echo absent
- else
- echo present
- fi
- exit 0
-}
-
-# assert __type_explorer is set (because it is used by the Perl script)
-: "${__type_explorer:?}"
-
-/usr/bin/perl -- - "${linesfile}" <<'EOF'
-use strict;
-use warnings "all";
-
-use Fcntl qw(:DEFAULT :flock);
-
-use Debconf::Db;
-use Debconf::Question;
-
-# Extract @known... arrays from debconf-set-selections
-# These values are required to distinguish flags and values in the given lines.
-# DC: I couldn't think of a more ugly solution to the problem…
-my @knownflags;
-my @knowntypes;
-my $debconf_set_selections = '/usr/bin/debconf-set-selections';
-if (-e $debconf_set_selections) {
- my $sed_known = 's/^my \(@known\(flags\|types\) = qw([a-z ]*);\).*$/\1/p';
- eval `sed -n '$sed_known' '$debconf_set_selections'`;
-}
-
-sub mungeline ($) {
- my $line = shift;
- chomp $line;
- $line =~ s/\r$//;
- return $line;
-}
-
-sub fatal { printf STDERR @_; exit 1; }
-
-my $state = 'present';
-
-sub state {
- my $new = shift;
- if ($state eq 'present'
- or ($state eq 'different' and $new eq 'absent')) {
- $state = $new;
- }
-}
-
-
-# Load Debconf DB but manually lock on the state explorer script,
-# because Debconf aborts immediately if executed concurrently.
-# This is not really an ideal solution because the Debconf DB could be locked by
-# another process (e.g. apt-get), but no way to achieve this could be found.
-# If you know how to, please provide a patch.
-my $lockfile = "%ENV{'__type_explorer'}/state";
-if (open my $lock_fh, '+<', $lockfile) {
- flock $lock_fh, LOCK_EX or die "Cannot lock $lockfile";
-}
-{
- Debconf::Db->load(readonly => 'true');
-}
-
-
-while (<>) {
- # Read and process lines (taken from debconf-set-selections)
- $_ = mungeline($_);
- while (/\\$/ && ! eof) {
- s/\\$//;
- $_ .= mungeline(<>);
- }
- next if /^\s*$/ || /^\s*\#/;
-
- my ($owner, $label, $type, $content) = /^\s*(\S+)\s+(\S+)\s+(\S+)(?:\s(.*))?/
- or fatal "invalid line: %s\n", $_;
- $content = '' unless defined $content;
-
-
- # Compare is and should state
- my $q = Debconf::Question->get($label);
-
- unless (defined $q) {
- # probably a preseed
- state 'absent';
- next;
- }
-
- if (grep { $_ eq $q->type } @knownflags) {
- # This line wants to set a flag, presumably.
- if ($q->flag($q->type) ne $content) {
- state 'different';
- }
- } else {
- # Otherwise, it's probably a value…
- if ($q->value ne $content) {
- state 'different';
- }
-
- unless (grep { $_ eq $owner } (split /, /, $q->owners)) {
- state 'different';
- }
- }
-}
-
-printf "%s\n", $state;
-EOF
diff --git a/cdist/conf/type/__debconf_set_selections/gencode-remote b/cdist/conf/type/__debconf_set_selections/gencode-remote
index 9ba28f09..bb719c46 100755
--- a/cdist/conf/type/__debconf_set_selections/gencode-remote
+++ b/cdist/conf/type/__debconf_set_selections/gencode-remote
@@ -1,7 +1,6 @@
-#!/bin/sh -e
+#!/bin/sh
#
# 2011-2014 Nico Schottelius (nico-cdist at schottelius.org)
-# 2021 Dennis Camera (dennis.camera at ssrq-sds-fds.ch)
#
# This file is part of cdist.
#
@@ -18,37 +17,16 @@
# You should have received a copy of the GNU General Public License
# along with cdist. If not, see .
#
+#
+# Setup selections
+#
-if test -f "${__object:?}/parameter/line"
-then
- filename="${__object:?}/parameter/line"
-elif test -s "${__object:?}/parameter/file"
-then
- filename=$(cat "${__object:?}/parameter/file")
- if test "${filename}" = '-'
- then
- filename="${__object:?}/stdin"
- fi
-else
- printf 'Neither --line nor --file set.\n' >&2
- exit 1
+filename="$(cat "$__object/parameter/file")"
+
+if [ "$filename" = "-" ]; then
+ filename="$__object/stdin"
fi
-# setting no lines makes no sense
-test -s "${filename}" || exit 0
-
-state_is=$(cat "${__object:?}/explorer/state")
-
-if test "${state_is}" != 'present'
-then
- cat <<-CODE
- debconf-set-selections <<'EOF'
- $(cat "${filename}")
- EOF
- CODE
-
- awk '
- {
- printf "set %s %s %s %s\n", $1, $2, $3, $4
- }' "${filename}" >>"${__messages_out:?}"
-fi
+echo "debconf-set-selections << __file-eof"
+cat "$filename"
+echo "__file-eof"
diff --git a/cdist/conf/type/__debconf_set_selections/man.rst b/cdist/conf/type/__debconf_set_selections/man.rst
deleted file mode 100644
index fd0040ae..00000000
--- a/cdist/conf/type/__debconf_set_selections/man.rst
+++ /dev/null
@@ -1,70 +0,0 @@
-cdist-type__debconf_set_selections(7)
-=====================================
-
-NAME
-----
-cdist-type__debconf_set_selections - Setup debconf selections
-
-
-DESCRIPTION
------------
-On Debian and alike systems :strong:`debconf-set-selections`\ (1) can be used
-to setup configuration parameters.
-
-
-REQUIRED PARAMETERS
--------------------
-cf. ``--line``.
-
-
-OPTIONAL PARAMETERS
--------------------
-file
- Use the given filename as input for :strong:`debconf-set-selections`\ (1)
- If filename is ``-``, read from stdin.
-
- **This parameter is deprecated, because it doesn't work with state detection.**
-line
- A line in :strong:`debconf-set-selections`\ (1) compatible format.
- This parameter can be used multiple times to set multiple options.
-
- (This parameter is actually required, but marked optional because the
- deprecated ``--file`` is still accepted.)
-
-
-BOOLEAN PARAMETERS
-------------------
-None.
-
-
-EXAMPLES
---------
-
-.. code-block:: sh
-
- # Setup gitolite's gituser
- __debconf_set_selections nslcd --line 'gitolite gitolite/gituser string git'
-
- # Setup configuration for nslcd from a file.
- # NB: Multiple lines can be passed to --line, although this can be considered a hack.
- __debconf_set_selections nslcd --line "$(cat "${__files:?}/preseed/nslcd.debconf")"
-
-
-SEE ALSO
---------
-- :strong:`cdist-type__update_alternatives`\ (7)
-- :strong:`debconf-set-selections`\ (1)
-
-
-AUTHORS
--------
-| Nico Schottelius
-| Dennis Camera
-
-
-COPYING
--------
-Copyright \(C) 2011-2014 Nico Schottelius, 2021 Dennis Camera.
-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.
diff --git a/cdist/conf/type/__debconf_set_selections/man.text b/cdist/conf/type/__debconf_set_selections/man.text
new file mode 100644
index 00000000..e36ebaa3
--- /dev/null
+++ b/cdist/conf/type/__debconf_set_selections/man.text
@@ -0,0 +1,50 @@
+cdist-type__debconf_set_selections(7)
+=====================================
+Nico Schottelius
+
+
+NAME
+----
+cdist-type__debconf_set_selections - Setup debconf selections
+
+
+DESCRIPTION
+-----------
+On Debian and alike systems debconf-set-selections(1) can be used
+to setup configuration parameters.
+
+
+REQUIRED PARAMETERS
+-------------------
+file::
+ Use the given filename as input for debconf-set-selections(1)
+ If filename is "-", read from stdin.
+
+
+EXAMPLES
+--------
+
+--------------------------------------------------------------------------------
+# Setup configuration for nslcd
+__debconf_set_selections nslcd --file /path/to/file
+
+# Setup configuration for nslcd from another type
+__debconf_set_selections nslcd --file "$__type/files/preseed/nslcd"
+
+__debconf_set_selections nslcd --file - << eof
+gitolite gitolite/gituser string git
+eof
+--------------------------------------------------------------------------------
+
+
+SEE ALSO
+--------
+- cdist-type(7)
+- cdist-type__update_alternatives(7)
+- debconf-set-selections(1)
+
+
+COPYING
+-------
+Copyright \(C) 2011-2014 Nico Schottelius. Free use of this software is
+granted under the terms of the GNU General Public License version 3 (GPLv3).
diff --git a/cdist/conf/type/__debconf_set_selections/manifest b/cdist/conf/type/__debconf_set_selections/manifest
deleted file mode 100755
index 0f4fb2e2..00000000
--- a/cdist/conf/type/__debconf_set_selections/manifest
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh -e
-#
-# 2021 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 .
-#
-
-__package_apt debconf
diff --git a/cdist/conf/type/__debconf_set_selections/nonparallel b/cdist/conf/type/__debconf_set_selections/nonparallel
deleted file mode 100644
index e69de29b..00000000
diff --git a/cdist/conf/type/__debconf_set_selections/parameter/deprecated/file b/cdist/conf/type/__debconf_set_selections/parameter/deprecated/file
deleted file mode 100644
index 09db545a..00000000
--- a/cdist/conf/type/__debconf_set_selections/parameter/deprecated/file
+++ /dev/null
@@ -1 +0,0 @@
-'file' has been deprecated in favour of 'line' in order to provide idempotency.
diff --git a/cdist/conf/type/__debconf_set_selections/parameter/optional_multiple b/cdist/conf/type/__debconf_set_selections/parameter/optional_multiple
deleted file mode 100644
index a999a0c2..00000000
--- a/cdist/conf/type/__debconf_set_selections/parameter/optional_multiple
+++ /dev/null
@@ -1 +0,0 @@
-line
diff --git a/cdist/conf/type/__debconf_set_selections/parameter/optional b/cdist/conf/type/__debconf_set_selections/parameter/required
similarity index 100%
rename from cdist/conf/type/__debconf_set_selections/parameter/optional
rename to cdist/conf/type/__debconf_set_selections/parameter/required
diff --git a/cdist/conf/type/__directory/explorer/stat b/cdist/conf/type/__directory/explorer/stat
index f817cb02..077aa43b 100755
--- a/cdist/conf/type/__directory/explorer/stat
+++ b/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,51 +20,31 @@
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 gid="$gid" '$3 == gid { print $1; f=1 } END { if (!f) print "UNKNOWN" }' /etc/group)
-
- mode_text=$(echo "$ls_line" | awk '{ print $1 }')
- mode=$(echo "$mode_text" | awk '{for(i=8;i>=0;--i){c=substr($1,10-i,1);k+=((c~/[rwxst]/)*2^i);if(!(i%3))k+=(tolower(c)~/[lst]/)*2^(9+i/3)}printf("%04o",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
-command -v stat >/dev/null 2>&1 || {
- fallback
- exit
-}
-
-case $("$__explorer/os")
-in
- freebsd|netbsd|openbsd|macosx)
- stat -f 'type: %HT
+os=$("$__explorer/os")
+case "$os" in
+ "freebsd"|"openbsd")
+ # FIXME: should be something like this based on man page, but can not test
+ stat -f "type: %ST
owner: %Du %Su
group: %Dg %Sg
-mode: %Mp%03Lp %Sp
-' "$destination" | awk '/^type/ { print tolower($0); next } { print }'
- ;;
+mode: %Op %Sp
+" "$destination"
+ ;;
+ "macosx")
+ stat -f "type: %HT
+ owner: %Du %Su
+ group: %Dg %Sg
+ mode: %Lp %Sp
+ " "$destination"
+ ;;
*)
- # NOTE: Do not use --printf here as it is not supported by BusyBox stat.
- # NOTE: BusyBox's stat might not support the "-c" option, in which case
- # we fall through to the shell fallback.
- stat -c 'type: %F
+ stat --printf="type: %F
owner: %u %U
group: %g %G
-mode: %04a %A' "$destination" 2>/dev/null || fallback
- ;;
+mode: %a %A
+" "$destination"
+ ;;
esac
diff --git a/cdist/conf/type/__directory/gencode-remote b/cdist/conf/type/__directory/gencode-remote
index d9c00b56..aba618ac 100755
--- a/cdist/conf/type/__directory/gencode-remote
+++ b/cdist/conf/type/__directory/gencode-remote
@@ -1,9 +1,8 @@
-#!/bin/sh -e
+#!/bin/sh
#
# 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")
-type=$(cat "$__object/explorer/type")
+state_should="$(cat "$__object/parameter/state")"
+type="$(cat "$__object/explorer/type")"
stat_file="$__object/explorer/stat"
# variable to keep track if we have to set directory attributes
@@ -58,36 +57,32 @@ get_current_value() {
}
set_group() {
- echo "chgrp $recursive '$1' '$destination'"
- echo "chgrp $recursive '$1'" >> "$__messages_out"
+ echo chgrp $recursive \"$1\" \"$destination\"
+ echo chgrp $recursive $1 >> "$__messages_out"
}
set_owner() {
- echo "chown $recursive '$1' '$destination'"
- echo "chown $recursive '$1'" >> "$__messages_out"
+ echo chown $recursive \"$1\" \"$destination\"
+ echo chown $recursive $1 >> "$__messages_out"
}
set_mode() {
- echo "chmod $recursive '$1' '$destination'"
- echo "chmod $recursive '$1'" >> "$__messages_out"
+ echo chmod $recursive \"$1\" \"$destination\"
+ echo chmod $recursive $1 >> "$__messages_out"
}
case "$state_should" in
- present|exists)
+ present)
if [ "$type" != "directory" ]; then
set_attributes=1
if [ "$type" != "none" ]; then
# our destination is not a directory, remove whatever is there
# and then create our directory and set all attributes
- echo "rm -f '$destination'"
+ echo rm -f "\"$destination\""
echo "remove non directory" >> "$__messages_out"
fi
- echo "mkdir $mkdiropt '$destination'"
+ echo "mkdir $mkdiropt \"$destination\""
echo "create" >> "$__messages_out"
- 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
@@ -97,11 +92,9 @@ case "$state_should" in
value_should="$(cat "$__object/parameter/$attribute")"
value_is="$(get_current_value "$attribute" "$value_should")"
- # format mode in four digits => same as stat returns
+ # change 0xxx format to xxx format => same as stat returns
if [ "$attribute" = mode ]; then
- # Convert to four-digit octal number (printf interprets
- # strings with leading 0s as octal!)
- value_should=$(printf '%04o' "0${value_should}")
+ value_should="$(echo $value_should | sed 's/^0\(...\)/\1/')"
fi
if [ "$set_attributes" = 1 ] || [ "$value_should" != "$value_is" ]; then
@@ -110,29 +103,9 @@ 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'"
+ echo rm -rf \"$destination\"
echo remove >> "$__messages_out"
fi
;;
diff --git a/cdist/conf/type/__directory/man.rst b/cdist/conf/type/__directory/man.rst
deleted file mode 100644
index 7755334c..00000000
--- a/cdist/conf/type/__directory/man.rst
+++ /dev/null
@@ -1,112 +0,0 @@
-cdist-type__directory(7)
-========================
-
-NAME
-----
-cdist-type__directory - Manage a directory
-
-
-DESCRIPTION
------------
-This cdist type allows you to create or remove directories on the target.
-
-
-REQUIRED PARAMETERS
--------------------
-None.
-
-
-OPTIONAL PARAMETERS
--------------------
-state
- 'present', 'absent', 'exists' or 'pre-exists', defaults to 'present' where:
-
- 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.
-
-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
- Changed group membership
-chown
- Changed owner
-chmod
- 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
- __directory /tmp/foobar
-
- # Remove a directory
- __directory /tmp/foobar --state absent
-
- # Ensure /etc exists correctly
- __directory /etc --owner root --group root --mode 0755
-
- # Create nfs service directory, including parents
- __directory /home/services/nfs --parents
-
- # Change permissions recursively
- __directory /home/services --recursive --owner root --group root
-
- # Setup a temp directory
- __directory /local --mode 1777
-
- # Take it all
- __directory /home/services/kvm --recursive --parents \
- --owner root --group root --mode 0755 --state present
-
-
-AUTHORS
--------
-Nico Schottelius
-
-
-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.
diff --git a/cdist/conf/type/__directory/man.text b/cdist/conf/type/__directory/man.text
new file mode 100644
index 00000000..a0bf8062
--- /dev/null
+++ b/cdist/conf/type/__directory/man.text
@@ -0,0 +1,102 @@
+cdist-type__directory(7)
+========================
+Nico Schottelius
+
+
+NAME
+----
+cdist-type__directory - Manage a directory
+
+
+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 ::
+ Changed group membership
+chown ::
+ Changed owner
+chmod ::
+ Changed mode
+create::
+ Empty directory was created
+remove::
+ Directory exists, but state is absent, directory will be removed by generated code.
+remove non directory::
+ Someting other than a directory with the same name exists and was removed prior to create.
+
+
+EXAMPLES
+--------
+
+--------------------------------------------------------------------------------
+# A silly example
+__directory /tmp/foobar
+
+# Remove a directory
+__directory /tmp/foobar --state absent
+
+# Ensure /etc exists correctly
+__directory /etc --owner root --group root --mode 0755
+
+# Create nfs service directory, including parents
+__directory /home/services/nfs --parents
+
+# Change permissions recursively
+__directory /home/services --recursive --owner root --group root
+
+# Setup a temp directory
+__directory /local --mode 1777
+
+# Take it all
+__directory /home/services/kvm --recursive --parents \
+ --owner root --group root --mode 0755 --state present
+
+--------------------------------------------------------------------------------
+
+
+SEE ALSO
+--------
+- cdist-type(7)
+
+
+COPYING
+-------
+Copyright \(C) 2011 Nico Schottelius. Free use of this software is
+granted under the terms of the GNU General Public License version 3 (GPLv3).
diff --git a/cdist/conf/type/__docker/man.rst b/cdist/conf/type/__docker/man.rst
deleted file mode 100644
index 718543a8..00000000
--- a/cdist/conf/type/__docker/man.rst
+++ /dev/null
@@ -1,55 +0,0 @@
-cdist-type__docker(7)
-=====================
-
-NAME
-----
-cdist-type__docker - install Docker CE
-
-
-DESCRIPTION
------------
-Installs latest Docker Community Edition package.
-
-
-REQUIRED PARAMETERS
--------------------
-None.
-
-
-OPTIONAL PARAMETERS
--------------------
-state
- 'present' or 'absent', defaults to 'present'
-version
- The specific version to install. Defaults to the special value 'latest',
- meaning the version the package manager will install by default.
-
-
-BOOLEAN PARAMETERS
-------------------
-None.
-
-
-EXAMPLES
---------
-
-.. code-block:: sh
-
- # Install docker
- __docker
-
- # Remove docker
- __docker --state absent
-
- # Install specific version
- __docker --state present --version 18.03.0.ce
-
-AUTHORS
--------
-Steven Armstrong
-
-
-COPYING
--------
-Copyright \(C) 2016 Steven Armstrong. Free use of this software is
-granted under the terms of the GNU General Public License version 3 (GPLv3).
diff --git a/cdist/conf/type/__docker/manifest b/cdist/conf/type/__docker/manifest
deleted file mode 100755
index 6a57d85a..00000000
--- a/cdist/conf/type/__docker/manifest
+++ /dev/null
@@ -1,109 +0,0 @@
-#!/bin/sh -e
-#
-# 2016 Steven Armstrong (steven-cdist at armstrong.cc)
-#
-# This file is part of cdist.
-#
-# cdist is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# cdist is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with cdist. If not, see .
-#
-
-
-os=$(cat "$__global/explorer/os")
-state=$(cat "$__object/parameter/state")
-version=$(cat "$__object/parameter/version")
-
-case "$os" in
- centos)
- # shellcheck source=/dev/null
- if (. "$__global/explorer/os_release" && [ "${VERSION_ID}" = "7" ]); then
- __yum_repo docker-ce-stable \
- --name 'Docker CE Stable' \
- --baseurl "https://download.docker.com/linux/centos/7/\$basearch/stable" \
- --enabled \
- --gpgcheck 1 \
- --gpgkey 'https://download.docker.com/linux/centos/gpg' \
- --state "${state}"
- if [ "$version" != "latest" ]; then
- require="__yum_repo/docker-ce-stable" __package docker-ce --version "${version}" --state "${state}"
- else
- require="__yum_repo/docker-ce-stable" __package docker-ce --state "${state}"
- fi
- else
- echo "CentOS version 7 is required!" >&2
- exit 1
- fi
- ;;
- ubuntu|debian)
- if [ "${state}" = "present" ]; then
- __package apt-transport-https
- __package ca-certificates
- __package gnupg2
- fi
- __apt_key_uri docker --name "Docker Release (CE deb) " \
- --uri "https://download.docker.com/linux/${os}/gpg" --state "${state}"
-
- require="__apt_key_uri/docker" __apt_source docker \
- --uri "https://download.docker.com/linux/${os}" \
- --distribution "$(cat "$__global/explorer/lsb_codename")" \
- --state "${state}" \
- --component "stable"
- if [ "$version" != "latest" ]; then
- require="__apt_source/docker" __package docker-ce --version "${version}" --state "${state}"
- else
- require="__apt_source/docker" __package docker-ce --state "${state}"
- fi
- ;;
- 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) " \
- --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
- exit 1
- ;;
-esac
diff --git a/cdist/conf/type/__docker/parameter/default/state b/cdist/conf/type/__docker/parameter/default/state
deleted file mode 100644
index e7f6134f..00000000
--- a/cdist/conf/type/__docker/parameter/default/state
+++ /dev/null
@@ -1 +0,0 @@
-present
diff --git a/cdist/conf/type/__docker/parameter/default/version b/cdist/conf/type/__docker/parameter/default/version
deleted file mode 100644
index a0f9a4b4..00000000
--- a/cdist/conf/type/__docker/parameter/default/version
+++ /dev/null
@@ -1 +0,0 @@
-latest
diff --git a/cdist/conf/type/__docker/parameter/optional b/cdist/conf/type/__docker/parameter/optional
deleted file mode 100644
index 4d595ed7..00000000
--- a/cdist/conf/type/__docker/parameter/optional
+++ /dev/null
@@ -1,2 +0,0 @@
-state
-version
diff --git a/cdist/conf/type/__docker/singleton b/cdist/conf/type/__docker/singleton
deleted file mode 100644
index e69de29b..00000000
diff --git a/cdist/conf/type/__docker_compose/gencode-remote b/cdist/conf/type/__docker_compose/gencode-remote
deleted file mode 100755
index 77fc2fdf..00000000
--- a/cdist/conf/type/__docker_compose/gencode-remote
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh -e
-#
-# 2016 Dominique Roux (dominique.roux at ungleich.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 .
-#
-
-# Variables
-version="$(cat "$__object/parameter/version")"
-state="$(cat "$__object/parameter/state")"
-
-if [ "${state}" = "present" ]; then
- # Download docker-compose file
- #shellcheck disable=SC2016
- echo 'curl -L "https://github.com/docker/compose/releases/download/'"${version}"'/docker-compose-$(uname -s)-$(uname -m)" -o /tmp/docker-compose'
- echo 'mv /tmp/docker-compose /usr/local/bin/docker-compose'
- # Change permissions
- echo 'chmod +x /usr/local/bin/docker-compose'
-fi
diff --git a/cdist/conf/type/__docker_compose/man.rst b/cdist/conf/type/__docker_compose/man.rst
deleted file mode 100644
index 7386e737..00000000
--- a/cdist/conf/type/__docker_compose/man.rst
+++ /dev/null
@@ -1,58 +0,0 @@
-cdist-type__docker_compose(7)
-=============================
-
-NAME
-----
-cdist-type__docker_compose - install docker-compose
-
-
-DESCRIPTION
------------
-Installs docker-compose package.
-State 'absent' will not remove docker binary itself,
-only docker-compose binary will be removed
-
-
-REQUIRED PARAMETERS
--------------------
-None.
-
-
-OPTIONAL PARAMETERS
--------------------
-version
- Define docker_compose version, defaults to "1.9.0"
-
-state
- 'present' or 'absent', defaults to 'present'
-
-
-BOOLEAN PARAMETERS
-------------------
-None.
-
-
-EXAMPLES
---------
-
-.. code-block:: sh
-
- # Install docker-compose
- __docker_compose
-
- # Install version 1.9.0-rc4
- __docker_compose --version 1.9.0-rc4
-
- # Remove docker-compose
- __docker_compose --state absent
-
-
-AUTHORS
--------
-Dominique Roux
-
-
-COPYING
--------
-Copyright \(C) 2016 Dominique Roux. Free use of this software is
-granted under the terms of the GNU General Public License version 3 or later (GPLv3+).
diff --git a/cdist/conf/type/__docker_compose/manifest b/cdist/conf/type/__docker_compose/manifest
deleted file mode 100755
index f7de3a76..00000000
--- a/cdist/conf/type/__docker_compose/manifest
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh -e
-#
-# 2016 Dominique Roux (dominique.roux at ungleich.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 .
-#
-#
-
-state="$(cat "$__object/parameter/state")"
-
-# Needed packages
-if [ "${state}" = "present" ]; then
- __docker
- __package curl
-elif [ "${state}" = "absent" ]; then
- __file /usr/local/bin/docker-compose --state absent
-else
- echo "Unknown state: ${state}" >&2
- exit 1
-fi
diff --git a/cdist/conf/type/__docker_compose/parameter/default/state b/cdist/conf/type/__docker_compose/parameter/default/state
deleted file mode 100644
index e7f6134f..00000000
--- a/cdist/conf/type/__docker_compose/parameter/default/state
+++ /dev/null
@@ -1 +0,0 @@
-present
diff --git a/cdist/conf/type/__docker_compose/parameter/default/version b/cdist/conf/type/__docker_compose/parameter/default/version
deleted file mode 100644
index 850e7424..00000000
--- a/cdist/conf/type/__docker_compose/parameter/default/version
+++ /dev/null
@@ -1 +0,0 @@
-1.14.0
diff --git a/cdist/conf/type/__docker_compose/parameter/optional b/cdist/conf/type/__docker_compose/parameter/optional
deleted file mode 100644
index 4d595ed7..00000000
--- a/cdist/conf/type/__docker_compose/parameter/optional
+++ /dev/null
@@ -1,2 +0,0 @@
-state
-version
diff --git a/cdist/conf/type/__docker_compose/singleton b/cdist/conf/type/__docker_compose/singleton
deleted file mode 100644
index e69de29b..00000000
diff --git a/cdist/conf/type/__docker_config/explorer/config-data b/cdist/conf/type/__docker_config/explorer/config-data
deleted file mode 100755
index b4bb0e11..00000000
--- a/cdist/conf/type/__docker_config/explorer/config-data
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh -e
-#
-# 2018 Ľubomír Kučera
-#
-# 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 .
-#
-
-docker config inspect "${__object_id:?}" --format '{{json .Spec.Data}}' \
- 2>/dev/null | tr -d '"' | base64 -d
diff --git a/cdist/conf/type/__docker_config/explorer/config-exists b/cdist/conf/type/__docker_config/explorer/config-exists
deleted file mode 100755
index 58c207d4..00000000
--- a/cdist/conf/type/__docker_config/explorer/config-exists
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh -e
-#
-# 2018 Ľubomír Kučera
-#
-# 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 .
-#
-
-if docker config ls | grep -q " ${__object_id:?} "; then
- echo yes
-else
- echo no
-fi
diff --git a/cdist/conf/type/__docker_config/gencode-remote b/cdist/conf/type/__docker_config/gencode-remote
deleted file mode 100755
index 65497b7e..00000000
--- a/cdist/conf/type/__docker_config/gencode-remote
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/bin/sh -e
-#
-# 2018 Ľubomír Kučera
-#
-# 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 .
-#
-
-config="${__object_id:?}"
-config_exists=$(cat "${__object:?}/explorer/config-exists")
-state=$(cat "${__object:?}/parameter/state")
-
-case "${state}" in
- absent)
- if [ "${config_exists}" != "yes" ]; then
- exit 0
- fi
-
- echo "docker config rm \"${config}\""
- ;;
- present)
- source=$(cat "${__object}/parameter/source")
-
- if [ -z "${source}" ]; then
- exit 0
- fi
-
- if [ "${source}" = "-" ]; then
- source="${__object}/stdin"
- fi
-
- if [ "${config_exists}" = "yes" ]; then
- if cmp -s "${source}" "${__object}/explorer/config-data"; then
- exit 0
- else
- echo "docker config rm \"${config}\""
- fi
- fi
-
- cat <<-EOF
- source_file="\$(mktemp cdist.XXXXXXXXXX)"
-
- base64 -d > "\${source_file}" << eof
- $(base64 "${source}")
- eof
-
- docker config create "${config}" "\${source_file}"
-
- rm "\${source_file}"
- EOF
- ;;
- *)
- echo "Unsupported state: ${state}" >&2
-
- exit 1
- ;;
-esac
diff --git a/cdist/conf/type/__docker_config/man.rst b/cdist/conf/type/__docker_config/man.rst
deleted file mode 100644
index 7c74c8af..00000000
--- a/cdist/conf/type/__docker_config/man.rst
+++ /dev/null
@@ -1,55 +0,0 @@
-cdist-type__docker_config(7)
-============================
-
-NAME
-----
-
-cdist-type__docker_config - Manage Docker configs
-
-DESCRIPTION
------------
-
-This type manages Docker configs.
-
-OPTIONAL PARAMETERS
--------------------
-
-source
- Path to the source file. If it is '-' (dash), read standard input.
-
-state
- 'present' or 'absent', defaults to 'present' where:
-
- present
- if the config does not exist, it is created
- absent
- the config is removed
-
-CAVEATS
--------
-
-Since Docker configs cannot be updated once created, this type tries removing
-and recreating the config if it changes. If the config is used by a service at
-the time of removing, then this type will fail.
-
-EXAMPLES
---------
-
-.. code-block:: sh
-
- # Creates "foo" config from "bar" source file
- __docker_config foo --source bar
-
-
-AUTHORS
--------
-
-Ľubomír Kučera
-
-COPYING
--------
-
-Copyright \(C) 2018 Ľubomír Kučera. 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.
diff --git a/cdist/conf/type/__docker_config/parameter/default/source b/cdist/conf/type/__docker_config/parameter/default/source
deleted file mode 100644
index e69de29b..00000000
diff --git a/cdist/conf/type/__docker_config/parameter/default/state b/cdist/conf/type/__docker_config/parameter/default/state
deleted file mode 100644
index e7f6134f..00000000
--- a/cdist/conf/type/__docker_config/parameter/default/state
+++ /dev/null
@@ -1 +0,0 @@
-present
diff --git a/cdist/conf/type/__docker_config/parameter/optional b/cdist/conf/type/__docker_config/parameter/optional
deleted file mode 100644
index d77f3048..00000000
--- a/cdist/conf/type/__docker_config/parameter/optional
+++ /dev/null
@@ -1,2 +0,0 @@
-source
-state
diff --git a/cdist/conf/type/__docker_secret/explorer/secret-exists b/cdist/conf/type/__docker_secret/explorer/secret-exists
deleted file mode 100755
index 1405f8bc..00000000
--- a/cdist/conf/type/__docker_secret/explorer/secret-exists
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh -e
-#
-# 2018 Ľubomír Kučera
-#
-# 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 .
-#
-
-if docker secret ls | grep -q " ${__object_id:?} "; then
- echo yes
-else
- echo no
-fi
diff --git a/cdist/conf/type/__docker_secret/gencode-remote b/cdist/conf/type/__docker_secret/gencode-remote
deleted file mode 100755
index c75e91d9..00000000
--- a/cdist/conf/type/__docker_secret/gencode-remote
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/bin/sh -e
-#
-# 2018 Ľubomír Kučera
-#
-# 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 .
-#
-
-secret="${__object_id:?}"
-secret_exists=$(cat "${__object:?}/explorer/secret-exists")
-state=$(cat "${__object:?}/parameter/state")
-
-case "${state}" in
- absent)
- if [ "${secret_exists}" != "yes" ]; then
- exit 0
- fi
-
- echo "docker secret rm ${secret}"
- ;;
- present)
- if [ "${secret_exists}" = "yes" ]; then
- exit 0
- fi
-
- source=$(cat "${__object}/parameter/source")
-
- if [ -z "${source}" ]; then
- exit 0
- fi
-
- if [ "${source}" = "-" ]; then
- source="${__object}/stdin"
- fi
-
- cat <<-EOF
- source_file="\$(mktemp cdist.XXXXXXXXXX)"
-
- base64 -d > "\${source_file}" << eof
- $(base64 "${source}")
- eof
-
- docker secret create "${secret}" "\${source_file}"
-
- rm "\${source_file}"
- EOF
- ;;
- *)
- echo "Unsupported state: ${state}" >&2
-
- exit 1
- ;;
-esac
diff --git a/cdist/conf/type/__docker_secret/man.rst b/cdist/conf/type/__docker_secret/man.rst
deleted file mode 100644
index 7fe69623..00000000
--- a/cdist/conf/type/__docker_secret/man.rst
+++ /dev/null
@@ -1,54 +0,0 @@
-cdist-type__docker_secret(7)
-============================
-
-NAME
-----
-
-cdist-type__docker_secret - Manage Docker secrets
-
-DESCRIPTION
------------
-
-This type manages Docker secrets.
-
-OPTIONAL PARAMETERS
--------------------
-
-source
- Path to the source file. If it is '-' (dash), read standard input.
-
-state
- 'present' or 'absent', defaults to 'present' where:
-
- present
- if the secret does not exist, it is created
- absent
- the secret is removed
-
-CAVEATS
--------
-
-Since Docker secrets cannot be updated once created, this type takes no action
-if the specified secret already exists.
-
-EXAMPLES
---------
-
-.. code-block:: sh
-
- # Creates "foo" secret from "bar" source file
- __docker_secret foo --source bar
-
-
-AUTHORS
--------
-
-Ľubomír Kučera
-
-COPYING
--------
-
-Copyright \(C) 2018 Ľubomír Kučera. 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.
diff --git a/cdist/conf/type/__docker_secret/parameter/default/source b/cdist/conf/type/__docker_secret/parameter/default/source
deleted file mode 100644
index e69de29b..00000000
diff --git a/cdist/conf/type/__docker_secret/parameter/default/state b/cdist/conf/type/__docker_secret/parameter/default/state
deleted file mode 100644
index e7f6134f..00000000
--- a/cdist/conf/type/__docker_secret/parameter/default/state
+++ /dev/null
@@ -1 +0,0 @@
-present
diff --git a/cdist/conf/type/__docker_secret/parameter/optional b/cdist/conf/type/__docker_secret/parameter/optional
deleted file mode 100644
index d77f3048..00000000
--- a/cdist/conf/type/__docker_secret/parameter/optional
+++ /dev/null
@@ -1,2 +0,0 @@
-source
-state
diff --git a/cdist/conf/type/__docker_stack/explorer/stack-exists b/cdist/conf/type/__docker_stack/explorer/stack-exists
deleted file mode 100755
index 4f511821..00000000
--- a/cdist/conf/type/__docker_stack/explorer/stack-exists
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh -e
-#
-# 2018 Ľubomír Kučera
-#
-# 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 .
-#
-
-if docker stack ls | grep -q "^${__object_id:?} "; then
- echo 1
-else
- echo 0
-fi
diff --git a/cdist/conf/type/__docker_stack/gencode-remote b/cdist/conf/type/__docker_stack/gencode-remote
deleted file mode 100755
index 586271d0..00000000
--- a/cdist/conf/type/__docker_stack/gencode-remote
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/bin/sh -e
-#
-# 2018 Ľubomír Kučera
-#
-# 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 .
-#
-
-stack="${__object_id:?}"
-state=$(cat "${__object:?}/parameter/state")
-
-case "${state}" in
- absent)
- stack_exists=$(cat "${__object:?}/explorer/stack-exists")
-
- if [ "${stack_exists}" -ne 1 ]; then
- exit 0
- fi
-
- echo "docker stack rm ${stack}"
- ;;
- present)
- compose_file=$(cat "${__object}/parameter/compose-file")
-
- if [ -z "${compose_file}" ]; then
- exit 0
- fi
-
- if [ "${compose_file}" = "-" ]; then
- compose_file="${__object}/stdin"
- fi
-
- cat <<-EOF
- compose_file="\$(mktemp cdist.XXXXXXXXXX)"
-
- base64 -d > "\${compose_file}" << eof
- $(base64 "${compose_file}")
- eof
-
- docker stack deploy --compose-file "\${compose_file}" \
- --prune --with-registry-auth ${stack}
-
- rm "\${compose_file}"
- EOF
- ;;
- *)
- echo "Unsupported state: ${state}" >&2
-
- exit 1
- ;;
-esac
diff --git a/cdist/conf/type/__docker_stack/man.rst b/cdist/conf/type/__docker_stack/man.rst
deleted file mode 100644
index d0597c25..00000000
--- a/cdist/conf/type/__docker_stack/man.rst
+++ /dev/null
@@ -1,54 +0,0 @@
-cdist-type__docker_stack(7)
-===========================
-
-NAME
-----
-
-cdist-type__docker_stack - Manage Docker stacks
-
-DESCRIPTION
------------
-
-This type manages service stacks.
-
-.. note::
- Since there is no easy way to tell whether a stack needs to be updated,
- `docker stack deploy` is being run every time this type is invoked.
- However, it does not mean this type is not idempotent. If Docker does not
- detect changes, the existing stack will not be updated.
-
-OPTIONAL PARAMETERS
--------------------
-
-compose-file
- Path to the compose file. If it is '-' (dash), read standard input.
-
-state
- 'present' or 'absent', defaults to 'present' where:
-
- present
- the stack is deployed
- absent
- the stack is removed
-
-EXAMPLES
---------
-
-.. code-block:: sh
-
- # Deploys 'foo' stack defined in 'docker-compose.yml' compose file
- __docker_stack foo --compose-file docker-compose.yml
-
-
-AUTHORS
--------
-
-Ľubomír Kučera
-
-COPYING
--------
-
-Copyright \(C) 2018 Ľubomír Kučera. 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.
diff --git a/cdist/conf/type/__docker_stack/parameter/default/compose-file b/cdist/conf/type/__docker_stack/parameter/default/compose-file
deleted file mode 100644
index e69de29b..00000000
diff --git a/cdist/conf/type/__docker_stack/parameter/default/state b/cdist/conf/type/__docker_stack/parameter/default/state
deleted file mode 100644
index e7f6134f..00000000
--- a/cdist/conf/type/__docker_stack/parameter/default/state
+++ /dev/null
@@ -1 +0,0 @@
-present
diff --git a/cdist/conf/type/__docker_stack/parameter/optional b/cdist/conf/type/__docker_stack/parameter/optional
deleted file mode 100644
index b3457bd3..00000000
--- a/cdist/conf/type/__docker_stack/parameter/optional
+++ /dev/null
@@ -1,2 +0,0 @@
-compose-file
-state
diff --git a/cdist/conf/type/__docker_swarm/explorer/swarm-state b/cdist/conf/type/__docker_swarm/explorer/swarm-state
deleted file mode 100755
index 2c9fd598..00000000
--- a/cdist/conf/type/__docker_swarm/explorer/swarm-state
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh -e
-#
-# 2018 Ľubomír Kučera
-#
-# 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 .
-#
-
-docker info 2>/dev/null | grep '^ *Swarm: ' | awk '{print $2}'
diff --git a/cdist/conf/type/__docker_swarm/gencode-remote b/cdist/conf/type/__docker_swarm/gencode-remote
deleted file mode 100755
index 4b199a02..00000000
--- a/cdist/conf/type/__docker_swarm/gencode-remote
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/sh -e
-#
-# 2018 Ľubomír Kučera
-#
-# 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 .
-#
-
-state=$(cat "${__object:?}/parameter/state")
-swarm_state="$(cat "${__object}/explorer/swarm-state")"
-
-if [ -z "${swarm_state}" ]; then
- echo "Unable to determine Swarm state. Is compatible version of Docker installed?" >&2
-
- exit 1
-fi
-
-case "${state}" in
- absent)
- if [ "${swarm_state}" = "active" ]; then
- echo "docker swarm leave --force"
- fi
- ;;
- present)
- if [ "${swarm_state}" = "inactive" ]; then
- echo "docker swarm init"
- fi
- ;;
- *)
- echo "Unsupported state: ${state}" >&2
-
- exit 1
- ;;
-esac
diff --git a/cdist/conf/type/__docker_swarm/man.rst b/cdist/conf/type/__docker_swarm/man.rst
deleted file mode 100644
index 4dc408f0..00000000
--- a/cdist/conf/type/__docker_swarm/man.rst
+++ /dev/null
@@ -1,49 +0,0 @@
-cdist-type__docker_swarm(7)
-===========================
-
-NAME
-----
-
-cdist-type__docker_swarm - Manage Swarm
-
-DESCRIPTION
------------
-
-This type can initialize Docker swarm mode. For more information about swarm
-mode, see `Swarm mode overview `_.
-
-OPTIONAL PARAMETERS
--------------------
-
-state
- 'present' or 'absent', defaults to 'present' where:
-
- present
- Swarm is initialized
- absent
- Swarm is left
-
-EXAMPLES
---------
-
-.. code-block:: sh
-
- # Initializes a swarm
- __docker_swarm
-
- # Leaves a swarm
- __docker_swarm --state absent
-
-
-AUTHORS
--------
-
-Ľubomír Kučera
-
-COPYING
--------
-
-Copyright \(C) 2018 Ľubomír Kučera. 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.
diff --git a/cdist/conf/type/__docker_swarm/parameter/default/state b/cdist/conf/type/__docker_swarm/parameter/default/state
deleted file mode 100644
index e7f6134f..00000000
--- a/cdist/conf/type/__docker_swarm/parameter/default/state
+++ /dev/null
@@ -1 +0,0 @@
-present
diff --git a/cdist/conf/type/__docker_swarm/parameter/optional b/cdist/conf/type/__docker_swarm/parameter/optional
deleted file mode 100644
index ff72b5c7..00000000
--- a/cdist/conf/type/__docker_swarm/parameter/optional
+++ /dev/null
@@ -1 +0,0 @@
-state
diff --git a/cdist/conf/type/__docker_swarm/singleton b/cdist/conf/type/__docker_swarm/singleton
deleted file mode 100644
index e69de29b..00000000
diff --git a/cdist/conf/type/__dog_vdi/gencode-remote b/cdist/conf/type/__dog_vdi/gencode-remote
old mode 100755
new mode 100644
index 9d49506c..56e4108a
--- a/cdist/conf/type/__dog_vdi/gencode-remote
+++ b/cdist/conf/type/__dog_vdi/gencode-remote
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/sh
#
# 2014 Nico Schottelius (nico-cdist at schottelius.org)
#
diff --git a/cdist/conf/type/__dog_vdi/man.rst b/cdist/conf/type/__dog_vdi/man.rst
deleted file mode 100644
index 4be1920d..00000000
--- a/cdist/conf/type/__dog_vdi/man.rst
+++ /dev/null
@@ -1,59 +0,0 @@
-cdist-type__dog_vdi(7)
-======================
-
-NAME
-----
-cdist-type__dog_vdi - Manage Sheepdog VM images
-
-
-DESCRIPTION
------------
-The dog program is used to create images for sheepdog
-to be used in qemu.
-
-
-OPTIONAL PARAMETERS
--------------------
-state
- Either "present" or "absent", defaults to "present"
-size
- Size of the image in "dog vdi" compatible units.
-
- Required if state is "present".
-
-
-
-EXAMPLES
---------
-
-.. code-block:: sh
-
- # Create a 50G size image
- __dog_vdi nico-privat.sky.ungleich.ch --size 50G
-
- # Create a 50G size image (more explicit)
- __dog_vdi nico-privat.sky.ungleich.ch --size 50G --state present
-
- # Remove image
- __dog_vdi nico-privat.sky.ungleich.ch --state absent
-
- # Remove image - keeping --size is ok
- __dog_vdi nico-privat.sky.ungleich.ch --size 50G --state absent
-
-
-SEE ALSO
---------
-:strong:`qemu`\ (1), :strong:`dog`\ (8)
-
-
-AUTHORS
--------
-Nico Schottelius
-
-
-COPYING
--------
-Copyright \(C) 2014 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.
diff --git a/cdist/conf/type/__dog_vdi/man.text b/cdist/conf/type/__dog_vdi/man.text
new file mode 100644
index 00000000..e3453ba7
--- /dev/null
+++ b/cdist/conf/type/__dog_vdi/man.text
@@ -0,0 +1,56 @@
+cdist-type__dog_vdi(7)
+======================
+Nico Schottelius
+
+
+NAME
+----
+cdist-type__dog_vdi - Manage Sheepdog VM images
+
+
+DESCRIPTION
+-----------
+The dog program is used to create images for sheepdog
+to be used in qemu.
+
+
+OPTIONAL PARAMETERS
+-------------------
+state::
+ Either "present" or "absent", defaults to "present"
+size::
+ Size of the image in "dog vdi" compatible units.
+
+ Required if state is "present".
+
+
+
+EXAMPLES
+--------
+
+--------------------------------------------------------------------------------
+# Create a 50G size image
+__dog_vdi nico-privat.sky.ungleich.ch --size 50G
+
+# Create a 50G size image (more explicit)
+__dog_vdi nico-privat.sky.ungleich.ch --size 50G --state present
+
+# Remove image
+__dog_vdi nico-privat.sky.ungleich.ch --state absent
+
+# Remove image - keeping --size is ok
+__dog_vdi nico-privat.sky.ungleich.ch --size 50G --state absent
+--------------------------------------------------------------------------------
+
+
+SEE ALSO
+--------
+- cdist-type(7)
+- dog(8)
+- qemu(1)
+
+
+COPYING
+-------
+Copyright \(C) 2014 Nico Schottelius. Free use of this software is
+granted under the terms of the GNU General Public License version 3 (GPLv3).
diff --git a/cdist/conf/type/__dog_vdi/manifest b/cdist/conf/type/__dog_vdi/manifest
old mode 100755
new mode 100644
index 869bdede..be327a3a
--- a/cdist/conf/type/__dog_vdi/manifest
+++ b/cdist/conf/type/__dog_vdi/manifest
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/sh
#
# 2014 Nico Schottelius (nico-cdist at schottelius.org)
#
diff --git a/cdist/conf/type/__dot_file/explorer/home b/cdist/conf/type/__dot_file/explorer/home
deleted file mode 100755
index 08d941bf..00000000
--- a/cdist/conf/type/__dot_file/explorer/home
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2016 Dmitry Bogatov
-
-# Author: Dmitry Bogatov
-
-# 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 .
-set -eu
-
-user="$(cat "${__object}/parameter/user")"
-
-if command -v getent >/dev/null 2>&1; then
- line=$(getent passwd "${user}")
-else
- line=$(grep "^${user}:" /etc/passwd)
-fi
-printf '%s' "$line" | cut -d: -f6
diff --git a/cdist/conf/type/__dot_file/explorer/primary_group b/cdist/conf/type/__dot_file/explorer/primary_group
deleted file mode 100755
index 30b303ac..00000000
--- a/cdist/conf/type/__dot_file/explorer/primary_group
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2016 Dmitry Bogatov
-
-# Author: Dmitry Bogatov
-
-# 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 .
-set -eu
-
-user="$(cat "${__object}/parameter/user")"
-id -gn "${user}"
diff --git a/cdist/conf/type/__dot_file/man.rst b/cdist/conf/type/__dot_file/man.rst
deleted file mode 100644
index c8f36712..00000000
--- a/cdist/conf/type/__dot_file/man.rst
+++ /dev/null
@@ -1,89 +0,0 @@
-cdist-type__dot_file(7)
-========================
-
-NAME
-----
-
-cdist-type__dot_file - install file under user's home directory
-
-DESCRIPTION
------------
-
-This type installs a file (=\ *__object_id*) under user's home directory,
-providing a way to install per-user configuration files. File owner
-and group is deduced from user, for who file is installed.
-
-Unlike regular __file type, you do not need make any assumptions,
-where user's home directory is.
-
-REQUIRED PARAMETERS
--------------------
-
-user
- User, for who file is installed
-
-OPTIONAL PARAMETERS
--------------------
-
-dirmode
- forwarded to :strong:`__directory` type as mode
-
-mode
- forwarded to :strong:`__file` type
-
-state
- forwarded to :strong:`__file` type
-
-source
- forwarded to :strong:`__file` type
-
-file
- forwarded to :strong:`__file` type
- This can be used if multiple users need to have a dotfile updated,
- which will result in duplicate object id errors. When using the
- file parameter the object id can be some unique value.
-
-MESSAGES
---------
-
-This type inherits all messages from :strong:`file` type, and do not add
-any new.
-
-EXAMPLES
---------
-
-.. code-block:: sh
-
- # Install .forward file for user 'alice'. Since state is 'present',
- # user is not meant to edit this file, all changes will be overridden.
- # It is good idea to put warning about it in file itself.
- __dot_file .forward --user alice --source "$__files/forward"
-
- # Install .muttrc for user 'bob', if not already present. User can safely
- # edit it, his changes will not be overwritten.
- __dot_file .muttrc --user bob --source "$__files/recommended_mutt_config" --state exists
-
-
- # Install default xmonad config for user 'eve'. Parent directory is created automatically.
- __dot_file .xmonad/xmonad.hs --user eve --state exists --source "$__files/xmonad.hs"
-
- # install .vimrc for root and some users
- for user in root userx usery userz; do
- __dot_file "${user}_dot_vimrc" \
- --user $user \
- --file .vimrc \
- --state exists \
- --source "$__files/$user/.vimrc"
- done
-
-SEE ALSO
---------
-
-**cdist-type__file**\ (7)
-
-COPYING
--------
-
-Copyright (C) 2015 Dmitry Bogatov. Free use of this software is granted
-under the terms of the GNU General Public License version 3 or later
-(GPLv3+).
diff --git a/cdist/conf/type/__dot_file/manifest b/cdist/conf/type/__dot_file/manifest
deleted file mode 100755
index a38ed943..00000000
--- a/cdist/conf/type/__dot_file/manifest
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/bin/sh -e
-#
-# Copyright (C) 2016 Bogatov Dmitry
-#
-# 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 .
-set -eu
-
-user="$(cat "${__object}/parameter/user")"
-home="$(cat "${__object}/explorer/home")"
-primary_group="$(cat "${__object}/explorer/primary_group")"
-dirmode="$(cat "${__object}/parameter/dirmode")"
-if [ -f "${__object}/parameter/file" ]; then
- file="$(cat "${__object}/parameter/file")"
-else
- file="${__object_id}"
-fi
-
-
-# Create parent directory. Type __directory has flag 'parents', but it
-# will leave us with root-owned directory in user home, which is not
-# acceptable. So we create parent directories one-by-one. XXX: maybe
-# it should be fixed in '__directory'?
-set --
-subpath=${file}
-while subpath="$(dirname "${subpath}")" ; do
- [ "${subpath}" = . ] && break
- set -- "${subpath}" "$@"
-done
-unset subpath
-
-export CDIST_ORDER_DEPENDENCY
-for dir ; do
- __directory "${home}/${dir}" \
- --group "${primary_group}" \
- --mode "${dirmode}" \
- --owner "${user}"
-done
-
-# These parameters are forwarded to __file type. 'mode' is always
-# present, since it have been given default.
-
-set --
-for p in state mode source ; do
- if [ -f "${__object}/parameter/${p}" ] ; then
- value="$(cat "${__object}/parameter/${p}")"
- set -- "$@" "--${p}" "${value}"
- unset value
- fi
-done
-
-# If source is `-' we can't just forward it, since stdin is already
-# captured by __dot_file. So, we replace '-' with "$__object/stdin".
-#
-# It means that it is possible for __file to receive --source
-# parameter twice, but, since latest wins, it is okay.
-source="$(cat "${__object}/parameter/source")"
-if [ "${source}" = "-" ] ; then
- set -- "$@" --source "${__object}/stdin"
-fi
-unset source
-
-__file "${home}/${file}" --owner "$user" --group "$primary_group" "$@"
diff --git a/cdist/conf/type/__dot_file/parameter/default/dirmode b/cdist/conf/type/__dot_file/parameter/default/dirmode
deleted file mode 100644
index e9745d1f..00000000
--- a/cdist/conf/type/__dot_file/parameter/default/dirmode
+++ /dev/null
@@ -1 +0,0 @@
-0700
diff --git a/cdist/conf/type/__dot_file/parameter/default/mode b/cdist/conf/type/__dot_file/parameter/default/mode
deleted file mode 100644
index e9f960cf..00000000
--- a/cdist/conf/type/__dot_file/parameter/default/mode
+++ /dev/null
@@ -1 +0,0 @@
-600
diff --git a/cdist/conf/type/__dot_file/parameter/optional b/cdist/conf/type/__dot_file/parameter/optional
deleted file mode 100644
index 9f7f83fb..00000000
--- a/cdist/conf/type/__dot_file/parameter/optional
+++ /dev/null
@@ -1,4 +0,0 @@
-state
-mode
-source
-dirmode
diff --git a/cdist/conf/type/__dot_file/parameter/required b/cdist/conf/type/__dot_file/parameter/required
deleted file mode 100644
index 4eb8387f..00000000
--- a/cdist/conf/type/__dot_file/parameter/required
+++ /dev/null
@@ -1 +0,0 @@
-user
diff --git a/cdist/conf/type/__download/explorer/remote_cmd_get b/cdist/conf/type/__download/explorer/remote_cmd_get
deleted file mode 100755
index 9f1cd59c..00000000
--- a/cdist/conf/type/__download/explorer/remote_cmd_get
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh -e
-
-if [ -f "$__object/parameter/cmd-get" ]
-then
- cat "$__object/parameter/cmd-get"
-elif
- command -v curl > /dev/null
-then
- echo "curl -sSL -o - '%s'"
-elif
- command -v fetch > /dev/null
-then
- echo "fetch -o - '%s'"
-else
- echo "wget -O - '%s'"
-fi
diff --git a/cdist/conf/type/__download/explorer/remote_cmd_sum b/cdist/conf/type/__download/explorer/remote_cmd_sum
deleted file mode 100755
index 84df663c..00000000
--- a/cdist/conf/type/__download/explorer/remote_cmd_sum
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/bin/sh -e
-
-if [ ! -f "$__object/parameter/sum" ]
-then
- exit 0
-fi
-
-if [ -f "$__object/parameter/cmd-sum" ]
-then
- cat "$__object/parameter/cmd-sum"
- exit 0
-fi
-
-sum_should="$( cat "$__object/parameter/sum" )"
-
-if echo "$sum_should" | grep -Fq ':'
-then
- sum_hash="$( echo "$sum_should" | cut -d : -f 1 )"
-else
- if echo "$sum_should" | grep -Eq '^[0-9]+\s[0-9]+$'
- then
- sum_hash='cksum'
- elif
- echo "$sum_should" | grep -Eiq '^[a-f0-9]{32}$'
- then
- sum_hash='md5'
- elif
- echo "$sum_should" | grep -Eiq '^[a-f0-9]{40}$'
- then
- sum_hash='sha1'
- elif
- echo "$sum_should" | grep -Eiq '^[a-f0-9]{64}$'
- then
- sum_hash='sha256'
- else
- echo 'hash format detection failed' >&2
- exit 1
- fi
-fi
-
-os="$( "$__explorer/os" )"
-
-case "$sum_hash" in
- cksum)
- echo "cksum %s | awk '{print \$1\" \"\$2}'"
- ;;
- md5)
- case "$os" in
- freebsd)
- echo "md5 -q %s"
- ;;
- *)
- echo "md5sum %s | awk '{print \$1}'"
- ;;
- esac
- ;;
- sha1)
- case "$os" in
- freebsd)
- echo "sha1 -q %s"
- ;;
- *)
- echo "sha1sum %s | awk '{print \$1}'"
- ;;
- esac
- ;;
- sha256)
- case "$os" in
- freebsd)
- echo "sha256 -q %s"
- ;;
- *)
- echo "sha256sum %s | awk '{print \$1}'"
- ;;
- esac
- ;;
- *)
- # we arrive here only if --sum is given with unknown format prefix
- echo "unknown hash format: $sum_hash" >&2
- exit 1
- ;;
-esac
diff --git a/cdist/conf/type/__download/explorer/state b/cdist/conf/type/__download/explorer/state
deleted file mode 100755
index 8c5d5ce1..00000000
--- a/cdist/conf/type/__download/explorer/state
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh -e
-
-if [ -f "$__object/parameter/destination" ]
-then
- dst="$( cat "$__object/parameter/destination" )"
-else
- dst="/$__object_id"
-fi
-
-if [ ! -f "$dst" ]
-then
- echo 'absent'
- exit 0
-fi
-
-if [ ! -f "$__object/parameter/sum" ]
-then
- echo 'present'
- exit 0
-fi
-
-sum_should="$( cat "$__object/parameter/sum" )"
-
-if echo "$sum_should" | grep -Fq ':'
-then
- sum_should="$( echo "$sum_should" | cut -d : -f 2 )"
-fi
-
-sum_cmd="$( "$__type_explorer/remote_cmd_sum" )"
-
-# shellcheck disable=SC2059
-sum_is="$( eval "$( printf "$sum_cmd" "'$dst'" )" )"
-
-if [ -z "$sum_is" ]
-then
- echo 'existing destination checksum failed' >&2
- exit 1
-fi
-
-if [ "$sum_is" = "$sum_should" ]
-then
- echo 'present'
-else
- echo 'mismatch'
-fi
diff --git a/cdist/conf/type/__download/gencode-local b/cdist/conf/type/__download/gencode-local
deleted file mode 100755
index d1b0d0d5..00000000
--- a/cdist/conf/type/__download/gencode-local
+++ /dev/null
@@ -1,155 +0,0 @@
-#!/bin/sh -e
-
-download="$( cat "$__object/parameter/download" )"
-
-state_is="$( cat "$__object/explorer/state" )"
-
-if [ "$download" != 'local' ] || [ "$state_is" = 'present' ]
-then
- exit 0
-fi
-
-url="$( cat "$__object/parameter/url" )"
-
-if [ -f "$__object/parameter/destination" ]
-then
- dst="$( cat "$__object/parameter/destination" )"
-else
- dst="/$__object_id"
-fi
-
-if [ -f "$__object/parameter/cmd-get" ]
-then
- cmd="$( cat "$__object/parameter/cmd-get" )"
-
-elif command -v curl > /dev/null
-then
- cmd="curl -sSL -o - '%s'"
-
-elif command -v fetch > /dev/null
-then
- cmd="fetch -o - '%s'"
-
-elif command -v wget > /dev/null
-then
- cmd="wget -O - '%s'"
-
-else
- echo 'local download failed, no usable utility' >&2
- exit 1
-fi
-
-echo "download_tmp=\"\$( mktemp )\""
-
-# shellcheck disable=SC2059
-printf "$cmd > \"\$download_tmp\"\n" "$url"
-
-if [ -f "$__object/parameter/sum" ]
-then
- sum_should="$( cat "$__object/parameter/sum" )"
-
- if [ -f "$__object/parameter/cmd-sum" ]
- then
- local_cmd_sum="$( cat "$__object/parameter/cmd-sum" )"
- else
- if echo "$sum_should" | grep -Fq ':'
- then
- sum_hash="$( echo "$sum_should" | cut -d : -f 1 )"
-
- sum_should="$( echo "$sum_should" | cut -d : -f 2 )"
- else
- if echo "$sum_should" | grep -Eq '^[0-9]+\s[0-9]+$'
- then
- sum_hash='cksum'
- elif
- echo "$sum_should" | grep -Eiq '^[a-f0-9]{32}$'
- then
- sum_hash='md5'
- elif
- echo "$sum_should" | grep -Eiq '^[a-f0-9]{40}$'
- then
- sum_hash='sha1'
- elif
- echo "$sum_should" | grep -Eiq '^[a-f0-9]{64}$'
- then
- sum_hash='sha256'
- else
- echo 'hash format detection failed' >&2
- exit 1
- fi
- fi
-
- case "$sum_hash" in
- cksum)
- local_cmd_sum="cksum %s | awk '{print \$1\" \"\$2}'"
- ;;
- md5)
- if command -v md5 > /dev/null
- then
- local_cmd_sum="md5 -q %s"
- elif
- command -v md5sum > /dev/null
- then
- local_cmd_sum="md5sum %s | awk '{print \$1}'"
- fi
- ;;
- sha1)
- if command -v sha1 > /dev/null
- then
- local_cmd_sum="sha1 -q %s"
- elif
- command -v sha1sum > /dev/null
- then
- local_cmd_sum="sha1sum %s | awk '{print \$1}'"
- fi
- ;;
- sha256)
- if command -v sha256 > /dev/null
- then
- local_cmd_sum="sha256 -q %s"
- elif
- command -v sha256sum > /dev/null
- then
- local_cmd_sum="sha256sum %s | awk '{print \$1}'"
- fi
- ;;
- *)
- # we arrive here only if --sum is given with unknown format prefix
- echo "unknown hash format: $sum_hash" >&2
- exit 1
- ;;
- esac
-
- if [ -z "$local_cmd_sum" ]
- then
- echo 'local checksum verification failed, no usable utility' >&2
- exit 1
- fi
- fi
-
- # shellcheck disable=SC2059
- echo "sum_is=\"\$( $( printf "$local_cmd_sum" "\"\$download_tmp\"" ) )\""
-
- echo "if [ \"\$sum_is\" != '$sum_should' ]; then"
-
- echo "echo 'local download checksum mismatch' >&2"
-
- echo "rm -f \"\$download_tmp\""
-
- echo 'exit 1; fi'
-fi
-
-if echo "$__target_host" | grep -Eq '^[0-9a-fA-F:]+$'
-then
- target_host="[$__target_host]"
-else
- target_host="$__target_host"
-fi
-
-# shellcheck disable=SC2016
-printf '%s "$download_tmp" %s:%s\n' \
- "$__remote_copy" \
- "$target_host" \
- "$dst"
-
-echo "rm -f \"\$download_tmp\""
diff --git a/cdist/conf/type/__download/gencode-remote b/cdist/conf/type/__download/gencode-remote
deleted file mode 100755
index e49bcec3..00000000
--- a/cdist/conf/type/__download/gencode-remote
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/bin/sh -e
-
-download="$( cat "$__object/parameter/download" )"
-
-state_is="$( cat "$__object/explorer/state" )"
-
-if [ "$download" = 'remote' ] && [ "$state_is" != 'present' ]
-then
- cmd_get="$( cat "$__object/explorer/remote_cmd_get" )"
-
- url="$( cat "$__object/parameter/url" )"
-
- if [ -f "$__object/parameter/destination" ]
- then
- dst="$( cat "$__object/parameter/destination" )"
- else
- dst="/$__object_id"
- fi
-
- echo "download_tmp=\"\$( mktemp )\""
-
- # shellcheck disable=SC2059
- printf "$cmd_get > \"\$download_tmp\"\n" "$url"
-
- if [ -f "$__object/parameter/sum" ]
- then
- sum_should="$( cat "$__object/parameter/sum" )"
-
- if [ -f "$__object/parameter/cmd-sum" ]
- then
- remote_cmd_sum="$( cat "$__object/parameter/cmd-sum" )"
- else
- remote_cmd_sum="$( cat "$__object/explorer/remote_cmd_sum" )"
-
- if echo "$sum_should" | grep -Fq ':'
- then
- sum_should="$( echo "$sum_should" | cut -d : -f 2 )"
- fi
- fi
-
- # shellcheck disable=SC2059
- echo "sum_is=\"\$( $( printf "$remote_cmd_sum" "\"\$download_tmp\"" ) )\""
-
- echo "if [ \"\$sum_is\" != '$sum_should' ]; then"
-
- echo "echo 'remote download checksum mismatch' >&2"
-
- echo "rm -f \"\$download_tmp\""
-
- echo 'exit 1; fi'
- fi
-
- echo "mv \"\$download_tmp\" '$dst'"
-fi
-
-if [ -f "$__object/parameter/onchange" ] && [ "$state_is" != "present" ]
-then
- cat "$__object/parameter/onchange"
-fi
diff --git a/cdist/conf/type/__download/man.rst b/cdist/conf/type/__download/man.rst
deleted file mode 100644
index c16510a9..00000000
--- a/cdist/conf/type/__download/man.rst
+++ /dev/null
@@ -1,101 +0,0 @@
-cdist-type__download(7)
-=======================
-
-NAME
-----
-cdist-type__download - Download a file
-
-
-DESCRIPTION
------------
-By default type will try to use ``curl``, ``fetch`` or ``wget``.
-If download happens in target (see ``--download``) then type will
-fallback to (and install) ``wget``.
-
-If download happens in local machine, then environment variables like
-``{http,https,ftp}_proxy`` etc can be used on cdist execution
-(``http_proxy=foo cdist config ...``).
-
-To change downloaded file's owner, group or permissions, use ``require='__download/path/to/file' __file ...``.
-
-
-REQUIRED PARAMETERS
--------------------
-url
- File's URL.
-
-
-OPTIONAL PARAMETERS
--------------------
-destination
- Downloaded file's destination in target. If unset, ``$__object_id`` is used.
-
-sum
- Supported formats: ``cksum`` output without file name, MD5, SHA1 and SHA256.
-
- Type tries to detect hash format with regexes, but prefixes
- ``cksum:``, ``md5:``, ``sha1:`` and ``sha256:`` are also supported.
-
- Checksum have two purposes - state check and post-download verification.
- In state check, if destination checksum mismatches, then content of URL
- will be downloaded to temporary file. If downloaded temporary file's
- checksum matches, then it will be moved to destination (overwritten).
-
- For local downloads it is expected that usable utilities for checksum
- calculation exist in the system.
-
-download
- If ``local`` (default), then file is downloaded to local storage and copied
- to target host. If ``remote``, then download happens in target.
-
- For local downloads it is expected that usable utilities for downloading
- exist in the system. Type will try to use ``curl``, ``fetch`` or ``wget``.
-
-cmd-get
- Command used for downloading.
- Command must output to ``stdout``.
- Parameter will be used for ``printf`` and must include only one
- format specification ``%s`` which will become URL.
- For example: ``wget -O - '%s'``.
-
-cmd-sum
- Command used for checksum calculation.
- Command output and ``--sum`` parameter must match.
- Parameter will be used for ``printf`` and must include only one
- format specification ``%s`` which will become destination.
- For example: ``md5sum '%s' | awk '{print $1}'``.
-
-onchange
- Execute this command after download.
-
-
-EXAMPLES
---------
-
-.. code-block:: sh
-
- __directory /opt/cpma
-
- require='__directory/opt/cpma' \
- __download /opt/cpma/cnq3.zip \
- --url https://cdn.playmorepromode.com/files/cnq3/cnq3-1.51.zip \
- --sum 46da3021ca9eace277115ec9106c5b46
-
- require='__download/opt/cpma/cnq3.zip' \
- __unpack /opt/cpma/cnq3.zip \
- --backup-destination \
- --preserve-archive \
- --destination /opt/cpma/server
-
-
-AUTHORS
--------
-Ander Punnar
-
-
-COPYING
--------
-Copyright \(C) 2021 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.
diff --git a/cdist/conf/type/__download/manifest b/cdist/conf/type/__download/manifest
deleted file mode 100755
index 3d4c498b..00000000
--- a/cdist/conf/type/__download/manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh -e
-
-if grep -Eq '^wget' "$__object/explorer/remote_cmd_get"
-then
- __package wget
-fi
diff --git a/cdist/conf/type/__download/parameter/default/download b/cdist/conf/type/__download/parameter/default/download
deleted file mode 100644
index 40830374..00000000
--- a/cdist/conf/type/__download/parameter/default/download
+++ /dev/null
@@ -1 +0,0 @@
-local
diff --git a/cdist/conf/type/__download/parameter/optional b/cdist/conf/type/__download/parameter/optional
deleted file mode 100644
index e809ef78..00000000
--- a/cdist/conf/type/__download/parameter/optional
+++ /dev/null
@@ -1,6 +0,0 @@
-cmd-get
-cmd-sum
-destination
-download
-onchange
-sum
diff --git a/cdist/conf/type/__download/parameter/required b/cdist/conf/type/__download/parameter/required
deleted file mode 100644
index 96cdd3b9..00000000
--- a/cdist/conf/type/__download/parameter/required
+++ /dev/null
@@ -1 +0,0 @@
-url
diff --git a/cdist/conf/type/__dpkg_architecture/explorer/architecture b/cdist/conf/type/__dpkg_architecture/explorer/architecture
deleted file mode 100755
index 03e7e386..00000000
--- a/cdist/conf/type/__dpkg_architecture/explorer/architecture
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh -e
-# __dpkg_architecture/explorer/architecture
-#
-# 2020 Matthias Stecher
-#
-# 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 .
-#
-
-# Get the main architecture of this machine
-
-
-# print or die in the gencode-remote
-dpkg --print-architecture || true
diff --git a/cdist/conf/type/__dpkg_architecture/explorer/foreign-architectures b/cdist/conf/type/__dpkg_architecture/explorer/foreign-architectures
deleted file mode 100755
index a150d307..00000000
--- a/cdist/conf/type/__dpkg_architecture/explorer/foreign-architectures
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh -e
-# __dpkg_architecture/explorer/foreign-architectures
-#
-# 2020 Matthias Stecher
-#
-# 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 .
-#
-
-# Print all additional architectures
-
-
-# print or die in the gencode-remote
-dpkg --print-foreign-architectures || true
diff --git a/cdist/conf/type/__dpkg_architecture/gencode-remote b/cdist/conf/type/__dpkg_architecture/gencode-remote
deleted file mode 100755
index 47fb24e7..00000000
--- a/cdist/conf/type/__dpkg_architecture/gencode-remote
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/bin/sh -e
-# __dpkg_architecture/gencode-remote
-#
-# 2020 Matthias Stecher
-#
-# 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 .
-#
-
-
-# Get parameter and explorer
-state_should="$(cat "$__object/parameter/state")"
-arch_wanted="$__object_id"
-main_arch="$(cat "$__object/explorer/architecture")"
-
-# Exit here if dpkg do not work (empty explorer)
-if [ -z "$main_arch" ]; then
- echo "dpkg is not available or unable to detect a architecture!" >&2
- exit 1
-fi
-
-
-# Check if requested architecture is the main one
-if [ "$arch_wanted" = "$main_arch" ]; then
- # higher than present; we can not remove it
- state_is="present"
- caution="yes"
-
-# Check if the architecture not already used
-elif grep -qFx "$arch_wanted" "$__object/explorer/foreign-architectures"; then
- state_is="present"
-
-# arch does not exist
-else
- state_is="absent"
-fi
-
-
-# Check what to do
-if [ "$state_is" != "$state_should" ]; then
- case "$state_should" in
- present)
- # print add code
- printf "dpkg --add-architecture '%s'\n" "$arch_wanted"
- # updating the index to make the new architecture available
- echo "apt update"
-
- echo added >> "$__messages_out"
- ;;
-
- absent)
- if [ "$caution" ]; then
- printf "can not remove the main arch '%s' of the system!\n" "$main_arch" >&2
- exit 1
- fi
-
- # removing all existing packages for the architecture
- printf "apt purge '.*:%s'\n" "$arch_wanted"
- # print remove code
- printf "dpkg --remove-architecture '%s'\n" "$arch_wanted"
-
- echo removed >> "$__messages_out"
- ;;
-
- *)
- printf "state '%s' is unknown!\n" "$state_should" >&2
- exit 1
- ;;
- esac
-fi
diff --git a/cdist/conf/type/__dpkg_architecture/man.rst b/cdist/conf/type/__dpkg_architecture/man.rst
deleted file mode 100644
index fa196229..00000000
--- a/cdist/conf/type/__dpkg_architecture/man.rst
+++ /dev/null
@@ -1,103 +0,0 @@
-cdist-type__dpkg_architecture(7)
-================================
-
-NAME
-----
-cdist-type__dpkg_architecture - Handles foreign architectures on debian-like
-systems managed by `dpkg`
-
-
-DESCRIPTION
------------
-This type handles foreign architectures on systems managed by
-:strong:`dpkg`\ (1). The object id is the name of the architecture accepted by
-`dpkg`, which should be added or removed.
-
-If the architecture is not setup on the system, it adds a new architecture as a
-new foreign architecture in `dpkg`. Then, it updates the apt package index to
-make packages from the new architecture available.
-
-If the architecture should be removed, it will remove it if it is not the base
-architecture on where the system was installed on. Before it, it will purge
-every package based on the "to be removed" architecture via `apt` to be able to
-remove the selected architecture.
-
-
-REQUIRED PARAMETERS
--------------------
-None.
-
-
-OPTIONAL PARAMETERS
--------------------
-state
- ``present`` or ``absent``. Defaults to ``present``.
-
-
-MESSAGES
---------
-added
- Added the specified architecture
-
-removed
- Removed the specified architecture
-
-
-ABORTS
-------
-Aborts in the following cases:
-
-If :strong:`dpkg`\ (1) is not available. It will abort with a proper error
-message.
-
-If the architecture is the same as the base architecture the system is build
-upon it (returned by ``dpkg --print-architecture``) and it should be removed.
-
-It will fail if it can not execute :strong:`apt`\ (8). It is assumed that it is
-already installed.
-
-
-EXAMPLES
---------
-
-.. code-block:: sh
-
- # add i386 (32 bit) architecture
- __dpkg_architecture i386
-
- # remove it again :)
- __dpkg_architecture i386 --state absent
-
-
-SEE ALSO
---------
-`Multiarch on Debian systems `_
-
-`How to setup multiarch on Debian `_
-
-:strong:`dpkg`\ (1)
-:strong:`cdist-type__package_dpkg`\ (7)
-:strong:`cdist-type__package_apt`\ (7)
-
-Useful commands:
-
-.. code-block:: sh
-
- # base architecture installed on this system
- dpkg --print-architecture
-
- # extra architectures added
- dpkg --print-foreign-architectures
-
-
-AUTHORS
--------
-Matthias Stecher
-
-
-COPYING
--------
-Copyright \(C) 2020 Matthias Stecher. You can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-ublished by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
diff --git a/cdist/conf/type/__dpkg_architecture/nonparallel b/cdist/conf/type/__dpkg_architecture/nonparallel
deleted file mode 100644
index e69de29b..00000000
diff --git a/cdist/conf/type/__dpkg_architecture/parameter/default/state b/cdist/conf/type/__dpkg_architecture/parameter/default/state
deleted file mode 100644
index e7f6134f..00000000
--- a/cdist/conf/type/__dpkg_architecture/parameter/default/state
+++ /dev/null
@@ -1 +0,0 @@
-present
diff --git a/cdist/conf/type/__dpkg_architecture/parameter/optional b/cdist/conf/type/__dpkg_architecture/parameter/optional
deleted file mode 100644
index ff72b5c7..00000000
--- a/cdist/conf/type/__dpkg_architecture/parameter/optional
+++ /dev/null
@@ -1 +0,0 @@
-state
diff --git a/cdist/conf/type/__file/explorer/stat b/cdist/conf/type/__file/explorer/stat
index 29b3c8a3..00e34cca 100755
--- a/cdist/conf/type/__file/explorer/stat
+++ b/cdist/conf/type/__file/explorer/stat
@@ -1,8 +1,6 @@
#!/bin/sh
#
# 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,63 +20,37 @@
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 gid="$gid" '$3 == gid { print $1; f=1 } END { if (!f) print "UNKNOWN" }' /etc/group)
-
- mode_text=$(echo "$ls_line" | awk '{ print $1 }')
- mode=$(echo "$mode_text" | awk '{for(i=8;i>=0;--i){c=substr($1,10-i,1);k+=((c~/[rwxst]/)*2^i);if(!(i%3))k+=(tolower(c)~/[lst]/)*2^(9+i/3)}printf("%04o",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
-
-command -v stat >/dev/null 2>&1 || {
- fallback
- exit
-}
-
-
-case $("$__explorer/os")
-in
- freebsd|netbsd|openbsd|macosx)
- stat -f 'type: %HT
+os=$("$__explorer/os")
+case "$os" in
+ "freebsd"|"openbsd")
+ # FIXME: should be something like this based on man page, but can not test
+ stat -f "type: %ST
owner: %Du %Su
group: %Dg %Sg
-mode: %Mp%03Lp %Sp
+mode: %Op %Sp
size: %Dz
links: %Dl
-' "$destination" | awk '/^type/ { print tolower($0); next } { print }'
- ;;
+" "$destination"
+ ;;
+ "macosx")
+ stat -f "type: %HT
+owner: %Du %Su
+group: %Dg %Sg
+mode: %Lp %Sp
+size: %Dz
+links: %Dl
+" "$destination"
+ ;;
*)
- # NOTE: Do not use --printf here as it is not supported by BusyBox stat.
- # NOTE: BusyBox's stat might not support the "-c" option, in which case
- # we fall through to the shell fallback.
- stat -c 'type: %F
+ stat --printf="type: %F
owner: %u %U
group: %g %G
-mode: %04a %A
+mode: %a %A
size: %s
-links: %h' "$destination" 2>/dev/null || fallback
- ;;
+links: %h
+" "$destination"
+ ;;
esac
diff --git a/cdist/conf/type/__file/gencode-local b/cdist/conf/type/__file/gencode-local
index 5a303308..ed7482cb 100755
--- a/cdist/conf/type/__file/gencode-local
+++ b/cdist/conf/type/__file/gencode-local
@@ -1,7 +1,7 @@
-#!/bin/sh -e
+#!/bin/sh
#
# 2011-2012 Nico Schottelius (nico-cdist at schottelius.org)
-# 2013-2022 Steven Armstrong (steven-cdist armstrong.cc)
+# 2013 Steven Armstrong (steven-cdist armstrong.cc)
#
# This file is part of cdist.
#
@@ -23,43 +23,14 @@ destination="/$__object_id"
state_should="$(cat "$__object/parameter/state")"
type="$(cat "$__object/explorer/type")"
-[ "$state_should" = "exists" ] && [ "$type" = "file" ] && exit 0 # nothing to do
-
-if [ "$state_should" = "pre-exists" ]; then
- if [ -f "$__object/parameter/source" ]; then
- echo "--source cannot be used with --state pre-exists"
- exit 1
- fi
-
- case $type in
- file)
- # nothing to do
- exit 0
- ;;
- none)
- printf 'File "%s" does not exist\n' "$destination" >&2
- exit 1
- ;;
- 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
+[ "$state_should" = "exists" -a "$type" = "file" ] && exit 0 # nothing to do
upload_file=
create_file=
-if [ "$state_should" = "present" ] || [ "$state_should" = "exists" ]; then
+if [ "$state_should" = "present" -o "$state_should" = "exists" ]; then
if [ ! -f "$__object/parameter/source" ]; then
- remote_stat="$(cat "$__object/explorer/stat")"
- if [ -z "$remote_stat" ]; then
- create_file=1
- echo create >> "$__messages_out"
- fi
+ create_file=1
+ echo create >> "$__messages_out"
else
source="$(cat "$__object/parameter/source")"
if [ "$source" = "-" ]; then
@@ -72,7 +43,6 @@ if [ "$state_should" = "present" ] || [ "$state_should" = "exists" ]; then
if [ "$type" != "file" ]; then
# destination is not a regular file, upload source to replace it
upload_file=1
- echo upload >> "$__messages_out"
else
local_cksum="$(cksum < "$source")"
remote_cksum="$(cat "$__object/explorer/cksum")"
@@ -83,45 +53,26 @@ if [ "$state_should" = "present" ] || [ "$state_should" = "exists" ]; then
fi
fi
fi
- if [ "$create_file" ] || [ "$upload_file" ]; then
+ if [ "$create_file" -o "$upload_file" ]; then
# tell gencode-remote that we created or uploaded a file and that it must
# set all attributes no matter what the explorer retreived
mkdir "$__object/files"
touch "$__object/files/set-attributes"
- if [ "$create_file" ]; then
- # When creating an empty file we create it locally and then
- # upload it so that permissions can be set before moving the file
- # into place.
- source="$__object/files/empty"
- touch "$source"
- fi
-
# upload file to temp location
- upload_destination="${destination}.cdist.${__cdist_object_marker}.$$"
- # Yes, we are aware that this is a race condition.
- # However:
- # a) cdist usually writes to directories that are not user writable
- # (probably > 99.9%)
- # b) if they are user owned, the user / attacker always wins
- # (probably < 0.1%)
- # c) the only case which we could improve are tmp directories and we
- # don't think managing tmp directories with cdist is a typical case
- # ("the rest %)"
-
- # Tell gencode-remote to where we uploaded the file so it can move
- # it to its final destination.
- echo "$upload_destination" > "$__object/files/upload-destination"
-
- # IPv6 fix
- if echo "${__target_host}" | grep -q -E '^[0-9a-fA-F:]+$'
- then
- my_target_host="[${__target_host}]"
- else
- my_target_host="${__target_host}"
- fi
+ tempfile_template="${destination}.cdist.XXXXXXXXXX"
cat << DONE
-$__remote_copy "$source" "${my_target_host}:${upload_destination}"
+destination_upload="\$($__remote_exec $__target_host "mktemp $tempfile_template")"
+DONE
+ if [ "$upload_file" ]; then
+ echo upload >> "$__messages_out"
+ cat << DONE
+$__remote_copy "$source" "${__target_host}:\$destination_upload"
+DONE
+ fi
+# move uploaded file into place
+cat << DONE
+$__remote_exec $__target_host "rm -rf \"$destination\"; mv \"\$destination_upload\" \"$destination\""
DONE
fi
fi
diff --git a/cdist/conf/type/__file/gencode-remote b/cdist/conf/type/__file/gencode-remote
index 1a9ff69c..dcf3857b 100755
--- a/cdist/conf/type/__file/gencode-remote
+++ b/cdist/conf/type/__file/gencode-remote
@@ -1,7 +1,7 @@
-#!/bin/sh -e
+#!/bin/sh
#
# 2011-2013 Nico Schottelius (nico-cdist at schottelius.org)
-# 2013-2022 Steven Armstrong (steven-cdist armstrong.cc)
+# 2013 Steven Armstrong (steven-cdist armstrong.cc)
#
# This file is part of cdist.
#
@@ -23,7 +23,7 @@ destination="/$__object_id"
state_should="$(cat "$__object/parameter/state")"
type="$(cat "$__object/explorer/type")"
stat_file="$__object/explorer/stat"
-fire_onchange=''
+
get_current_value() {
if [ -s "$stat_file" ]; then
@@ -43,82 +43,52 @@ get_current_value() {
}
set_group() {
- echo "chgrp '$1' '$destination'"
- echo "chgrp '$1'" >> "$__messages_out"
- fire_onchange=1
+ echo chgrp \"$1\" \"$destination\"
+ echo chgrp $1 >> "$__messages_out"
}
set_owner() {
- echo "chown '$1' '$destination'"
- echo "chown '$1'" >> "$__messages_out"
- fire_onchange=1
+ echo chown \"$1\" \"$destination\"
+ echo chown $1 >> "$__messages_out"
}
set_mode() {
- echo "chmod '$1' '$destination'"
- echo "chmod '$1'" >> "$__messages_out"
- fire_onchange=1
+ echo chmod \"$1\" \"$destination\"
+ echo chmod $1 >> "$__messages_out"
}
+set_attributes=
case "$state_should" in
present|exists)
- if [ -f "$__object/files/upload-destination" ]; then
- final_destination="$destination"
- # We change the 'global' $destination variable here so we can
- # change attributes of the new/uploaded file before moving it
- # to it's final destination.
- destination="$(cat "$__object/files/upload-destination")"
- fi
- # 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
- if [ -f "$__object/parameter/$attribute" ]; then
- value_should="$(cat "$__object/parameter/$attribute")"
+ # 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
+ if [ -f "$__object/parameter/$attribute" ]; then
+ value_should="$(cat "$__object/parameter/$attribute")"
- # format mode in four digits => same as stat returns
- if [ "$attribute" = mode ]; then
- # Convert to four-digit octal number (printf interprets
- # strings with leading 0s as octal!)
- value_should=$(printf '%04o' "0${value_should}")
- fi
-
- value_is="$(get_current_value "$attribute" "$value_should")"
- if [ -f "$__object/files/set-attributes" ] || [ "$value_should" != "$value_is" ]; then
- "set_$attribute" "$value_should"
- fi
+ # change 0xxx format to xxx format => same as stat returns
+ if [ "$attribute" = mode ]; then
+ value_should="$(echo $value_should | sed 's/^0\(...\)/\1/')"
+ fi
+
+ value_is="$(get_current_value "$attribute" "$value_should")"
+ if [ -f "$__object/files/set-attributes" -o "$value_should" != "$value_is" ]; then
+ "set_$attribute" "$value_should"
fi
- done
- if [ -f "$__object/files/upload-destination" ]; then
- # move uploaded file into place
- printf 'rm -rf "%s"\n' "$final_destination"
- printf 'mv "%s" "%s"\n' "$destination" "$final_destination"
- fi
- if [ -f "$__object/files/set-attributes" ]; then
- # set-attributes is created if file is created or uploaded in gencode-local
- fire_onchange=1
fi
+ done
+
;;
absent)
if [ "$type" = "file" ]; then
- echo "rm -f '$destination'"
+ echo rm -f \"$destination\"
echo remove >> "$__messages_out"
- fire_onchange=1
fi
;;
- pre-exists)
- :
- ;;
-
*)
echo "Unknown state: $state_should" >&2
exit 1
;;
esac
-
-if [ -f "$__object/parameter/onchange" ]; then
- if [ -n "$fire_onchange" ]; then
- cat "$__object/parameter/onchange"
- fi
-fi
diff --git a/cdist/conf/type/__file/man.rst b/cdist/conf/type/__file/man.rst
deleted file mode 100644
index 2f3b9e69..00000000
--- a/cdist/conf/type/__file/man.rst
+++ /dev/null
@@ -1,124 +0,0 @@
-cdist-type__file(7)
-===================
-
-NAME
-----
-cdist-type__file - Manage files.
-
-
-DESCRIPTION
------------
-This cdist type allows you to create files, remove files and set file
-attributes on the target.
-
-If the file already exists on the target, then if it is a:
-
-regular file, and state is:
- present
- replace it with the source file if they are not equal
- exists
- do nothing
-symlink
- replace it with the source file
-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.
-
-
-REQUIRED PARAMETERS
--------------------
-None.
-
-OPTIONAL PARAMETERS
--------------------
-state
- 'present', 'absent', 'exists' or 'pre-exists', defaults to 'present' where:
-
- present
- the file is exactly the one from source
- absent
- 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. Defaults to ``root``.
-
-mode
- Unix permissions, suitable for chmod. Defaults to a very secure ``0600``.
-
-owner
- User to chown to. Defaults to ``root``.
-
-source
- If supplied, copy this file from the host running cdist to the target.
- 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
- Changed group membership
-chown
- Changed owner
-chmod
- Changed mode
-create
- Empty file was created (no --source specified)
-remove
- File exists, but state is absent, file will be removed by generated code.
-upload
- File was uploaded
-
-
-EXAMPLES
---------
-
-.. code-block:: sh
-
- # Create /etc/cdist-configured as an empty file
- __file /etc/cdist-configured
- # The same thing
- __file /etc/cdist-configured --state present
- # Use __file from another type
- __file /etc/issue --source "$__type/files/archlinux" --state present
- # Delete existing file
- __file /etc/cdist-configured --state absent
- # Supply some more settings
- __file /etc/shadow --source "$__type/files/shadow" \
- --owner root --group shadow --mode 0640 \
- --state present
- # Provide a default file, but let the user change it
- __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
- __file /etc/somefile --state pre-exists
- # Take file content from stdin
- __file /tmp/whatever --owner root --group root --mode 644 --source - << DONE
- Here goes the content for /tmp/whatever
- DONE
-
-
-AUTHORS
--------
-Nico Schottelius
-
-
-COPYING
--------
-Copyright \(C) 2011-2013 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.
diff --git a/cdist/conf/type/__file/man.text b/cdist/conf/type/__file/man.text
new file mode 100644
index 00000000..a582b27b
--- /dev/null
+++ b/cdist/conf/type/__file/man.text
@@ -0,0 +1,109 @@
+cdist-type__file(7)
+===================
+Nico Schottelius
+
+
+NAME
+----
+cdist-type__file - Manage files
+
+
+DESCRIPTION
+-----------
+This cdist type allows you to create files, remove files and set file
+attributes on the target.
+
+If the file already exists on the target, then if it is a:
+- regular file, and state is:
+ present: replace it with the source file if they are not equal
+ exists: do nothing
+- symlink: replace it with the source file
+- directory: replace it with the source file
+
+In any case, make sure that the file attributes are as specified.
+
+
+REQUIRED PARAMETERS
+-------------------
+None.
+
+OPTIONAL PARAMETERS
+-------------------
+state::
+ 'present', 'absent' or 'exists', defaults to 'present'
+ where:
+ present: the file is exactly the one from source
+ absent: the file does not exist
+ exists: the file from source but only if it doesn't already exist
+
+group::
+ Group to chgrp to.
+
+mode::
+ Unix permissions, suitable for chmod.
+
+owner::
+ User to chown to.
+
+source::
+ If supplied, copy this file from the host running cdist to the target.
+ 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.
+
+MESSAGES
+--------
+chgrp ::
+ Changed group membership
+chown ::
+ Changed owner
+chmod ::
+ Changed mode
+create::
+ Empty file was created (no --source specified)
+remove::
+ File exists, but state is absent, file will be removed by generated code.
+upload::
+ File was uploaded
+
+
+EXAMPLES
+--------
+
+--------------------------------------------------------------------------------
+# Create /etc/cdist-configured as an empty file
+__file /etc/cdist-configured
+# The same thing
+__file /etc/cdist-configured --state present
+# Delete existing file
+__file /etc/cdist-configured --state absent
+
+# Use __file from another type
+__file /etc/issue --source "$__type/files/archlinux" --state present
+
+# Supply some more settings
+__file /etc/shadow --source "$__type/files/shadow" \
+ --owner root --group shadow --mode 0640 \
+ --state present
+
+# Provide a default file, but let the user change it
+__file /home/frodo/.bashrc --source "/etc/skel/.bashrc" \
+ --state exists \
+ --owner frodo --mode 0600
+
+# Take file content from stdin
+__file /tmp/whatever --owner root --group root --mode 644 --source - << DONE
+Here goes the content for /tmp/whatever
+DONE
+
+--------------------------------------------------------------------------------
+
+
+SEE ALSO
+--------
+- cdist-type(7)
+
+
+COPYING
+-------
+Copyright \(C) 2011-2013 Nico Schottelius. Free use of this software is
+granted under the terms of the GNU General Public License version 3 (GPLv3).
diff --git a/cdist/conf/type/__file/parameter/optional b/cdist/conf/type/__file/parameter/optional
index 9b98352c..c696d592 100644
--- a/cdist/conf/type/__file/parameter/optional
+++ b/cdist/conf/type/__file/parameter/optional
@@ -3,4 +3,3 @@ group
mode
owner
source
-onchange
diff --git a/cdist/conf/type/__filesystem/explorer/lsblk b/cdist/conf/type/__filesystem/explorer/lsblk
deleted file mode 100644
index d376c09f..00000000
--- a/cdist/conf/type/__filesystem/explorer/lsblk
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/sh
-#
-# 2016 - 2016 Daniel Heule (hda at sfs.biz)
-#
-# This file is part of cdist.
-#
-# cdist is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# cdist is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with cdist. If not, see .
-#
-
-os=$("${__explorer:?}/os")
-
-if [ -f "${__object:?}/parameter/device" ]; then
- blkdev="$(cat "$__object/parameter/device")"
-else
- blkdev="${__object_id:?}"
-fi
-
-case "$os" in
- alpine|centos|fedora|gentoo|redhat|suse|ubuntu)
- if [ ! -x "$(command -v lsblk)" ]; then
- echo "lsblk is required for __filesystem type" >&2
- exit 1
- else
- #echo -n $(lsblk -nd -P -o NAME,FSTYPE,LABEL,MOUNTPOINT "$blkdev" 2>/dev/null)
- lsblk -nd -P -o NAME,FSTYPE,LABEL,MOUNTPOINT "$blkdev" 2>/dev/null
- fi
- ;;
- *)
- echo "__filesystem type lacks implementation for os: $os" >&2
- exit 1
- ;;
-esac
diff --git a/cdist/conf/type/__filesystem/gencode-remote b/cdist/conf/type/__filesystem/gencode-remote
deleted file mode 100755
index 0bcdc13c..00000000
--- a/cdist/conf/type/__filesystem/gencode-remote
+++ /dev/null
@@ -1,102 +0,0 @@
-#!/bin/sh -e
-#
-# 2016 - 2016 Daniel Heule (hda at sfs.biz)
-#
-# This file is part of cdist.
-#
-# cdist is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# cdist is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with cdist. If not, see .
-#
-
-
-fstype="$(cat "$__object/parameter/fstype")"
-
-if [ -f "$__object/parameter/device" ]; then
- mydev="$(cat "$__object/parameter/device")"
-else
- mydev="$__object_id"
-fi
-
-label="$(cat "$__object/parameter/label")"
-mkfsoptions="$(cat "$__object/parameter/mkfsoptions")"
-
-
-if [ -f "$__object/parameter/force" ]; then
- # create filesystem even an other filesystem is on disk or the label is not correct, use with caution !
- forcefs="true"
-else
- forcefs="false"
-fi
-
-
-
-blkdev_devname="$(grep -P -o 'NAME="\K[^"]*' "$__object/explorer/lsblk")"
-blkdev_fstype="$(grep -P -o 'FSTYPE="\K[^"]*' "$__object/explorer/lsblk")"
-blkdev_label="$(grep -P -o 'LABEL="\K[^"]*' "$__object/explorer/lsblk")"
-blkdev_mountpoint="$(grep -P -o 'MOUNTPOINT="\K[^"]*' "$__object/explorer/lsblk")"
-
-if [ -z "$blkdev_devname" ]; then
- echo "Specified device $mydev not found on target system" >&2
- exit 1
-fi
-
-[ "$blkdev_label" = "$label" ] && [ "$blkdev_fstype" = "$fstype" ] && exit 0
-
-if [ -n "$blkdev_mountpoint" ]; then
- echo "Specified device $mydev is mounted on $blkdev_mountpoint, __filesystem does NOTHING with mountd devices" >&2
- exit 0
-fi
-
-if [ -n "$blkdev_fstype" ] && [ "$forcefs" != "true" ]; then
- if [ "$blkdev_label" != "$label" ]; then
- echo "Specified device $mydev has not the spezified label: $blkdev_label, but __filesystem does NOTHING in this case without the --force option" >&2
- exit 0
- fi
- if [ "$blkdev_fstype" != "$fstype" ]; then
- echo "Specified device $mydev has not the spezified filesystem: $blkdev_fstype, but __filesystem does NOTHING in this case without the --force option" >&2
- exit 0
- fi
-fi
-
-
-# ok, all conditions checked, we need to format the device, lets go
-opts="$mkfsoptions"
-if [ -n "$label" ]; then
- opts="$opts -L '$label'"
-fi
-
-case "$fstype" in
- ext2|ext3|ext4)
- if [ "$forcefs" = "true" ]; then
- opts="$opts -F"
- fi
- echo "mkfs.$fstype $opts /dev/$blkdev_devname"
- ;;
- btrfs)
- if [ "$forcefs" = "true" ]; then
- opts="$opts --force"
- fi
- echo "mkfs.btrfs $opts /dev/$blkdev_devname"
- ;;
- xfs)
- if [ "$forcefs" = "true" ]; then
- opts="$opts -f"
- fi
- echo "mkfs.xfs $opts /dev/$blkdev_devname"
- ;;
- *)
- echo "__filesystem type lacks implementation for filesystem: $fstype" >&2
- exit 1
- ;;
-esac
-echo "filesystem $fstype on $mydev : /dev/$blkdev_devname created" >> "$__messages_out"
diff --git a/cdist/conf/type/__filesystem/man.rst b/cdist/conf/type/__filesystem/man.rst
deleted file mode 100644
index 1c103ac9..00000000
--- a/cdist/conf/type/__filesystem/man.rst
+++ /dev/null
@@ -1,81 +0,0 @@
-cdist-type__filesystem(7)
-=========================
-
-NAME
-----
-cdist-type__filesystem - Create Filesystems.
-
-
-DESCRIPTION
------------
-This cdist type allows you to create filesystems on devices.
-
-If the device is mounted on target, it refuses to do anything.
-
-If the device has a filesystem other then the specified and/or
-the label is not correct, it only makes a new filesystem
-if you have specified --force option.
-
-
-REQUIRED PARAMETERS
--------------------
-fstype
- Filesystem type, for example 'ext3', 'btrfs' or 'xfs'.
-
-
-
-OPTIONAL PARAMETERS
--------------------
-device
- Blockdevice for filesystem, Defaults to object_id.
- On linux, it can be any lsblk accepted device notation.
-
- |
- | For example:
- | /dev/sdx
- | or /dev/disk/by-xxxx/xxx
- | or /dev/mapper/xxxx
-
-label
- Label which should be applied on the filesystem.
-
-mkfsoptions
- Additional options which are inserted to the mkfs.xxx call.
-
-
-BOOLEAN PARAMETERS
-------------------
-force
- Normally, this type does nothing if a filesystem is found
- on the target device. If you specify force, it's formatted
- if the filesystem type or label differs from parameters.
- Warning: This option can easily lead into data loss!
-
-MESSAGES
---------
-filesystem on \: created
- Filesystem was created on
-
-
-EXAMPLES
---------
-
-.. code-block:: sh
-
- # Ensures that device /dev/sdb is formatted with xfs
- __filesystem /dev/sdb --fstype xfs --label Testdisk1
- # The same thing with btrfs and disk spezified by pci path to disk 1:0 on vmware
- __filesystem dev_sdb --fstype btrfs --device /dev/disk/by-path/pci-0000:0b:00.0-scsi-0:0:0:0 --label Testdisk2
- # Make sure that a multipath san device has a filesystem ...
- __filesystem dev_sdb --fstype xfs --device /dev/mapper/360060e80432f560050202f22000023ff --label Testdisk3
-
-
-AUTHORS
--------
-Daniel Heule
-
-
-COPYING
--------
-Copyright \(C) 2016 Daniel Heule. Free use of this software is
-granted under the terms of the GNU General Public License version 3 or any later version (GPLv3+).
diff --git a/cdist/conf/type/__filesystem/parameter/boolean b/cdist/conf/type/__filesystem/parameter/boolean
deleted file mode 100644
index 14b33226..00000000
--- a/cdist/conf/type/__filesystem/parameter/boolean
+++ /dev/null
@@ -1 +0,0 @@
-force
diff --git a/cdist/conf/type/__filesystem/parameter/default/label b/cdist/conf/type/__filesystem/parameter/default/label
deleted file mode 100644
index e69de29b..00000000
diff --git a/cdist/conf/type/__filesystem/parameter/default/mkfsoptions b/cdist/conf/type/__filesystem/parameter/default/mkfsoptions
deleted file mode 100644
index e69de29b..00000000
diff --git a/cdist/conf/type/__filesystem/parameter/optional b/cdist/conf/type/__filesystem/parameter/optional
deleted file mode 100644
index 79dddc21..00000000
--- a/cdist/conf/type/__filesystem/parameter/optional
+++ /dev/null
@@ -1,3 +0,0 @@
-device
-label
-mkfsoptions
diff --git a/cdist/conf/type/__filesystem/parameter/required b/cdist/conf/type/__filesystem/parameter/required
deleted file mode 100644
index 98f8b69f..00000000
--- a/cdist/conf/type/__filesystem/parameter/required
+++ /dev/null
@@ -1 +0,0 @@
-fstype
diff --git a/cdist/conf/type/__firewalld_rule/explorer/rule b/cdist/conf/type/__firewalld_rule/explorer/rule
index 0234e5b6..e9e1ebeb 100644
--- a/cdist/conf/type/__firewalld_rule/explorer/rule
+++ b/cdist/conf/type/__firewalld_rule/explorer/rule
@@ -1,4 +1,3 @@
-#!/bin/sh
#
# 2015 Nico Schottelius (nico-cdist at schottelius.org)
#
@@ -25,7 +24,7 @@ chain="$(cat "$__object/parameter/chain")"
priority="$(cat "$__object/parameter/priority")"
rule="$(cat "$__object/parameter/rule")"
-if firewall-cmd --permanent --direct --query-rule "$protocol" "$table" "$chain" "$priority" "$rule" >/dev/null; then
+if firewall-cmd --permanent --direct --query-rule "$protocol" "$table" "$chain" "$priority" $rule >/dev/null; then
echo present
else
echo absent
diff --git a/cdist/conf/type/__firewalld_rule/gencode-remote b/cdist/conf/type/__firewalld_rule/gencode-remote
old mode 100755
new mode 100644
index bd6d13e5..e184f5b3
--- a/cdist/conf/type/__firewalld_rule/gencode-remote
+++ b/cdist/conf/type/__firewalld_rule/gencode-remote
@@ -1,4 +1,3 @@
-#!/bin/sh -e
#
# 2015 Nico Schottelius (nico-cdist at schottelius.org)
#
@@ -19,6 +18,7 @@
#
#
+name="$__object_id"
state_should="$(cat "$__object/parameter/state")"
state_is="$(cat "$__object/explorer/rule")"
@@ -32,13 +32,13 @@ rule="$(cat "$__object/parameter/rule")"
case "$state_should" in
present)
- echo "firewall-cmd --quiet --permanent --direct --add-rule '$protocol' '$table' '$chain' '$priority' $rule"
- echo "firewall-cmd --quiet --direct --add-rule '$protocol' '$table' '$chain' '$priority' $rule"
+ echo firewall-cmd --quiet --permanent --direct --add-rule \"$protocol\" \"$table\" \"$chain\" \"$priority\" $rule
+ echo firewall-cmd --quiet --direct --add-rule \"$protocol\" \"$table\" \"$chain\" \"$priority\" $rule
;;
absent)
- echo "firewall-cmd --quiet --permanent --direct --remove-rule '$protocol' '$table' '$chain' '$priority' $rule"
- echo "firewall-cmd --quiet --direct --remove-rule '$protocol' '$table' '$chain' '$priority' $rule"
+ echo firewall-cmd --quiet --permanent --direct --remove-rule \"$protocol\" \"$table\" \"$chain\" \"$priority\" $rule
+ echo firewall-cmd --quiet --direct --remove-rule \"$protocol\" \"$table\" \"$chain\" \"$priority\" $rule
;;
*)
echo "Unknown state $state_should" >&2
diff --git a/cdist/conf/type/__firewalld_rule/man.rst b/cdist/conf/type/__firewalld_rule/man.rst
deleted file mode 100644
index 5de5d15c..00000000
--- a/cdist/conf/type/__firewalld_rule/man.rst
+++ /dev/null
@@ -1,81 +0,0 @@
-cdist-type__firewalld_rule(7)
-=============================
-
-NAME
-----
-cdist-type__firewalld_rule - Configure firewalld rules
-
-
-DESCRIPTION
------------
-This cdist type allows you to manage rules in firewalld
-using the *direct* way (i.e. no zone support).
-
-
-REQUIRED PARAMETERS
--------------------
-rule
- The rule to apply. Essentially an firewalld command
- line without firewalld in front of it.
-protocol
- Either ipv4, ipv4 or eb. See firewall-cmd(1)
-table
- The table to use (like filter or nat). See firewall-cmd(1).
-chain
- The chain to use (like INPUT_direct or FORWARD_direct). See firewall-cmd(1).
-priority
- The priority to use (0 is topmost). See firewall-cmd(1).
-
-
-OPTIONAL PARAMETERS
--------------------
-state
- 'present' or 'absent', defaults to 'present'
-
-
-EXAMPLES
---------
-
-.. code-block:: sh
-
- # Allow access from entrance.place4.ungleich.ch
- __firewalld_rule entrance \
- --protocol ipv4 \
- --table filter \
- --chain INPUT_direct \
- --priority 0 \
- --rule '-s entrance.place4.ungleich.ch -j ACCEPT'
-
- # Allow forwarding of traffic from br0
- __firewalld_rule vm-forward --protocol ipv4 \
- --table filter \
- --chain FORWARD_direct \
- --priority 0 \
- --rule '-i br0 -j ACCEPT'
-
- # Ensure old rule is absent - warning, the rule part must stay the same!
- __firewalld_rule vm-forward
- --protocol ipv4 \
- --table filter \
- --chain FORWARD_direct \
- --priority 0 \
- --rule '-i br0 -j ACCEPT' \
- --state absent
-
-
-SEE ALSO
---------
-:strong:`cdist-type__iptables_rule`\ (7), :strong:`firewalld`\ (8)
-
-
-AUTHORS
--------
-Nico Schottelius
-
-
-COPYING
--------
-Copyright \(C) 2015 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.
diff --git a/cdist/conf/type/__firewalld_rule/man.text b/cdist/conf/type/__firewalld_rule/man.text
new file mode 100644
index 00000000..17296a25
--- /dev/null
+++ b/cdist/conf/type/__firewalld_rule/man.text
@@ -0,0 +1,78 @@
+cdist-type__firewalld_rule(7)
+=============================
+Nico Schottelius
+
+
+NAME
+----
+cdist-type__firewalld_rule - Configure firewalld rules
+
+
+DESCRIPTION
+-----------
+This cdist type allows you to manage rules in firewalld
+using the *direct* way (i.e. no zone support).
+
+
+REQUIRED PARAMETERS
+-------------------
+rule::
+ The rule to apply. Essentially an firewalld command
+ line without firewalld in front of it.
+protocol::
+ Either ipv4, ipv4 or eb. See firewall-cmd(1)
+table::
+ The table to use (like filter or nat). See firewall-cmd(1).
+chain::
+ The chain to use (like INPUT_direct or FORWARD_direct). See firewall-cmd(1).
+priority::
+ The priority to use (0 is topmost). See firewall-cmd(1).
+
+
+OPTIONAL PARAMETERS
+-------------------
+state::
+ 'present' or 'absent', defaults to 'present'
+
+
+EXAMPLES
+--------
+
+--------------------------------------------------------------------------------
+# Allow acces from entrance.place4.ungleich.ch
+__firewalld_rule entrance \
+ --protocol ipv4 \
+ --table filter \
+ --chain INPUT_direct \
+ --priority 0 \
+ --rule '-s entrance.place4.ungleich.ch -j ACCEPT'
+
+# Allow forwarding of traffic from br0
+__firewalld_rule vm-forward --protocol ipv4 \
+ --table filter \
+ --chain FORWARD_direct \
+ --priority 0 \
+ --rule '-i br0 -j ACCEPT'
+
+# Ensure old rule is absent - warning, the rule part must stay the same!
+__firewalld_rule vm-forward
+ --protocol ipv4 \
+ --table filter \
+ --chain FORWARD_direct \
+ --priority 0 \
+ --rule '-i br0 -j ACCEPT' \
+ --state absent
+--------------------------------------------------------------------------------
+
+
+SEE ALSO
+--------
+- cdist-type(7)
+- cdist-type__iptables_rule(7)
+- firewalld(8)
+
+
+COPYING
+-------
+Copyright \(C) 2015 Nico Schottelius. Free use of this software is
+granted under the terms of the GNU General Public License version 3 (GPLv3).
diff --git a/cdist/conf/type/__firewalld_rule/manifest b/cdist/conf/type/__firewalld_rule/manifest
old mode 100755
new mode 100644
index 71156329..5baf6da3
--- a/cdist/conf/type/__firewalld_rule/manifest
+++ b/cdist/conf/type/__firewalld_rule/manifest
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/sh
#
# 2015 David Hürlimann (david at ungleich.ch)
#
diff --git a/cdist/conf/type/__firewalld_start/gencode-remote b/cdist/conf/type/__firewalld_start/gencode-remote
deleted file mode 100755
index 3e767f68..00000000
--- a/cdist/conf/type/__firewalld_start/gencode-remote
+++ /dev/null
@@ -1,84 +0,0 @@
-#!/bin/sh -e
-#
-# 2016 Darko Poljak(darko.poljak at ungleich.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 .
-#
-#
-
-startstate="$(cat "$__object/parameter/startstate")"
-init=$(cat "$__global/explorer/init")
-
-os=$(cat "$__global/explorer/os")
-os_version=$(cat "$__global/explorer/os_version")
-name="firewalld"
-
-case "${startstate}" in
- present)
- cmd="start"
- ;;
- absent)
- cmd="stop"
- ;;
- *)
- echo "Unknown startstate: ${startstate}" >&2
- exit 1
- ;;
-esac
-
-if [ "$init" = 'systemd' ]; then
- # this handles ALL linux distros with systemd
- # e.g. archlinux, gentoo in some cases, new RHEL and SLES versions
- echo "systemctl \"$cmd\" \"$name\""
-else
- case "$os" in
- debian)
- case "$os_version" in
- [1-7]*)
- echo "service \"$name\" \"$cmd\""
- ;;
- 8*)
- echo "systemctl \"$cmd\" \"$name\""
- ;;
- *)
- echo "Unsupported version $os_version of $os" >&2
- exit 1
- ;;
- esac
- ;;
-
- gentoo)
- echo service \"$name\" \"$cmd\"
- ;;
-
- amazon|scientific|centos|fedora|owl|redhat|suse)
- echo service \"$name\" \"$cmd\"
- ;;
-
- openwrt)
- echo "/etc/init.d/\"$name\" \"$cmd\""
- ;;
-
- ubuntu)
- echo "service \"$name\" \"$cmd\""
- ;;
-
- *)
- echo "Unsupported os: $os" >&2
- exit 1
- ;;
- esac
-fi
diff --git a/cdist/conf/type/__firewalld_start/man.rst b/cdist/conf/type/__firewalld_start/man.rst
deleted file mode 100644
index 74199cd6..00000000
--- a/cdist/conf/type/__firewalld_start/man.rst
+++ /dev/null
@@ -1,53 +0,0 @@
-cdist-type__firewalld_start(7)
-==============================
-
-NAME
-----
-cdist-type__firewalld_start - start and enable firewalld
-
-
-DESCRIPTION
------------
-This cdist type allows you to start and enable firewalld.
-
-
-REQUIRED PARAMETERS
--------------------
-None
-
-OPTIONAL PARAMETERS
--------------------
-startstate
- 'present' or 'absent', start/stop firewalld. Default is 'present'.
-bootstate
- 'present' or 'absent', enable/disable firewalld on boot. Default is 'present'.
-
-
-EXAMPLES
---------
-
-.. code-block:: sh
-
- # start and enable firewalld
- __firewalld_start
-
- # only enable firewalld to start on boot
- __firewalld_start --startstate present --bootstate absent
-
-
-SEE ALSO
---------
-:strong:`firewalld`\ (8)
-
-
-AUTHORS
--------
-Darko Poljak
-
-
-COPYING
--------
-Copyright \(C) 2016 Darko Poljak. 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.
diff --git a/cdist/conf/type/__firewalld_start/manifest b/cdist/conf/type/__firewalld_start/manifest
deleted file mode 100755
index 98caaad9..00000000
--- a/cdist/conf/type/__firewalld_start/manifest
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh -e
-#
-# 2016 Darko Poljak (darko.poljak at ungleich.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 .
-
-bootstate="$(cat "$__object/parameter/bootstate")"
-
-__package firewalld
-require="__package/firewalld" __start_on_boot firewalld --state "${bootstate}"
diff --git a/cdist/conf/type/__firewalld_start/parameter/default/bootstate b/cdist/conf/type/__firewalld_start/parameter/default/bootstate
deleted file mode 100644
index e7f6134f..00000000
--- a/cdist/conf/type/__firewalld_start/parameter/default/bootstate
+++ /dev/null
@@ -1 +0,0 @@
-present
diff --git a/cdist/conf/type/__firewalld_start/parameter/default/startstate b/cdist/conf/type/__firewalld_start/parameter/default/startstate
deleted file mode 100644
index e7f6134f..00000000
--- a/cdist/conf/type/__firewalld_start/parameter/default/startstate
+++ /dev/null
@@ -1 +0,0 @@
-present
diff --git a/cdist/conf/type/__firewalld_start/parameter/optional b/cdist/conf/type/__firewalld_start/parameter/optional
deleted file mode 100644
index 934c7d0d..00000000
--- a/cdist/conf/type/__firewalld_start/parameter/optional
+++ /dev/null
@@ -1,2 +0,0 @@
-bootstate
-startstate
diff --git a/cdist/conf/type/__firewalld_start/singleton b/cdist/conf/type/__firewalld_start/singleton
deleted file mode 100644
index e69de29b..00000000
diff --git a/cdist/conf/type/__git/explorer/group b/cdist/conf/type/__git/explorer/group
index ab4396b1..1308c710 100644
--- a/cdist/conf/type/__git/explorer/group
+++ b/cdist/conf/type/__git/explorer/group
@@ -1,24 +1,5 @@
-#!/bin/sh -e
+#!/bin/sh
-destination="/${__object_id:?}/.git"
+destination="/$__object_id/.git"
-# shellcheck disable=SC2012
-group_gid=$(ls -ldn "${destination}" | awk '{ print $4 }')
-
-# NOTE: +1 because $((notanum)) prints 0.
-if test $((group_gid + 1)) -ge 0
-then
- group_should=$(cat "${__object:?}/parameter/group")
-
- if expr "${group_should}" : '[0-9]*$' >/dev/null
- then
- printf '%u\n' "${group_gid}"
- else
- if command -v getent > /dev/null
- then
- getent group "${group_gid}" | cut -d : -f 1
- else
- awk -F: -v gid="${group_gid}" '$3 == gid { print $1 }' /etc/group
- fi
- fi
-fi
+stat --print "%G" ${destination} 2>/dev/null || exit 0
diff --git a/cdist/conf/type/__git/explorer/owner b/cdist/conf/type/__git/explorer/owner
index 4a4d0d13..8c36b035 100644
--- a/cdist/conf/type/__git/explorer/owner
+++ b/cdist/conf/type/__git/explorer/owner
@@ -1,19 +1,5 @@
-#!/bin/sh -e
+#!/bin/sh
-destination="/${__object_id:?}/.git"
+destination="/$__object_id/.git"
-# shellcheck disable=SC2012
-owner_uid=$(ls -ldn "${destination}" | awk '{ print $3 }')
-
-# NOTE: +1 because $((notanum)) prints 0.
-if test $((owner_uid + 1)) -ge 0
-then
- owner_should=$(cat "${__object:?}/parameter/owner")
-
- if expr "${owner_should}" : '[0-9]*$' >/dev/null
- then
- printf '%u\n' "${owner_uid}"
- else
- printf '%s\n' "$(id -u -n "${owner_uid}")"
- fi
-fi
+stat --print "%U" ${destination} 2>/dev/null || exit 0
diff --git a/cdist/conf/type/__git/gencode-remote b/cdist/conf/type/__git/gencode-remote
old mode 100755
new mode 100644
index ab22655f..c4fc1ef2
--- a/cdist/conf/type/__git/gencode-remote
+++ b/cdist/conf/type/__git/gencode-remote
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/sh
#
# 2012 Nico Schottelius (nico-cdist at schottelius.org)
#
@@ -19,46 +19,43 @@
#
#
-state_is=$(cat "$__object/explorer/state")
-owner_is=$(cat "$__object/explorer/owner")
-group_is=$(cat "$__object/explorer/group")
+state_is="$(cat "$__object/explorer/state")"
+owner_is="$(cat "$__object/explorer/owner")"
+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")
-group=$(cat "$__object/parameter/group")
-mode=$(cat "$__object/parameter/mode")
+owner="$(cat "$__object/parameter/owner")"
+group="$(cat "$__object/parameter/group")"
+mode="$(cat "$__object/parameter/mode")"
-[ -f "$__object/parameter/recursive" ] && recursive='--recurse-submodules' || recursive=''
-[ -f "$__object/parameter/shallow" ] && shallow='--depth 1 --shallow-submodules' || shallow=''
-
-[ "$state_should" = "$state_is" ] \
- && [ "$owner" = "$owner_is" ] \
- && [ "$group" = "$group_is" ] \
- && [ -n "$mode" ] && exit 0
+[ "$state_should" = "$state_is" -a \
+ "$owner" = "$owner_is" -a \
+ "$group" = "$group_is" -a \
+ -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
+ if [ \( -n "$owner" -a "$owner_is" != "$owner" \) -o \
+ \( -n "$group" -a "$group_is" != "$group" \) ]; then
echo chown -R "${owner}:${group}" "$destination"
fi
if [ -n "$mode" ]; then
echo chmod -R "$mode" "$destination"
fi
;;
-
+ # Handled in manifest
absent)
- # Handled in manifest
;;
*)
diff --git a/cdist/conf/type/__git/man.rst b/cdist/conf/type/__git/man.rst
deleted file mode 100644
index d3e15f25..00000000
--- a/cdist/conf/type/__git/man.rst
+++ /dev/null
@@ -1,66 +0,0 @@
-cdist-type__git(7)
-==================
-
-NAME
-----
-cdist-type__git - Get and or keep git repositories up-to-date
-
-
-DESCRIPTION
------------
-This cdist type allows you to clone git repositories
-
-
-REQUIRED PARAMETERS
--------------------
-source
- Specifies the git remote to clone from
-
-
-OPTIONAL PARAMETERS
--------------------
-state
- Either "present" or "absent", defaults to "present"
-
-branch
- Create this branch by checking out the remote branch of this name
- Default branch is "master"
-
-group
- Group to chgrp to.
-
-mode
- Unix permissions, suitable for chmod.
-
-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
---------
-
-.. code-block:: sh
-
- __git /home/services/dokuwiki --source git://github.com/splitbrain/dokuwiki.git
-
- # Checkout cdist, stay on branch 2.1
- __git /home/nico/cdist --source git@code.ungleich.ch:ungleich-public/cdist.git --branch 2.1
-
-
-AUTHORS
--------
-Nico Schottelius
-
-
-COPYING
--------
-Copyright \(C) 2012 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.
diff --git a/cdist/conf/type/__git/man.text b/cdist/conf/type/__git/man.text
new file mode 100644
index 00000000..5f74108b
--- /dev/null
+++ b/cdist/conf/type/__git/man.text
@@ -0,0 +1,60 @@
+cdist-type__git(7)
+==================
+Nico Schottelius
+
+
+NAME
+----
+cdist-type__git - Get and or keep git repositories up-to-date
+
+
+DESCRIPTION
+-----------
+This cdist type allows you to clone git repositories
+
+
+REQUIRED PARAMETERS
+-------------------
+source::
+ Specifies the git remote to clone from
+
+
+OPTIONAL PARAMETERS
+-------------------
+state::
+ Either "present" or "absent", defaults to "present"
+
+branch::
+ Create this branch by checking out the remote branch of this name
+ Default branch is "master"
+
+group::
+ Group to chgrp to.
+
+mode::
+ Unix permissions, suitable for chmod.
+
+owner::
+ User to chown to.
+
+
+EXAMPLES
+--------
+
+--------------------------------------------------------------------------------
+__git /home/services/dokuwiki --source git://github.com/splitbrain/dokuwiki.git
+
+# Checkout cdist, stay on branch 2.1
+__git /home/nico/cdist --source git://github.com/telmich/cdist.git --branch 2.1
+--------------------------------------------------------------------------------
+
+
+SEE ALSO
+--------
+- cdist-type(7)
+
+
+COPYING
+-------
+Copyright \(C) 2012 Nico Schottelius. Free use of this software is
+granted under the terms of the GNU General Public License version 3 (GPLv3).
diff --git a/cdist/conf/type/__git/manifest b/cdist/conf/type/__git/manifest
old mode 100755
new mode 100644
index 6fb870f4..b2b0feb0
--- a/cdist/conf/type/__git/manifest
+++ b/cdist/conf/type/__git/manifest
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/sh
#
# 2012 Nico Schottelius (nico-cdist at schottelius.org)
#
diff --git a/cdist/conf/type/__git/parameter/boolean b/cdist/conf/type/__git/parameter/boolean
deleted file mode 100644
index d600d4ca..00000000
--- a/cdist/conf/type/__git/parameter/boolean
+++ /dev/null
@@ -1,2 +0,0 @@
-recursive
-shallow
diff --git a/cdist/conf/type/__go_get/explorer/go-executable b/cdist/conf/type/__go_get/explorer/go-executable
deleted file mode 100755
index 87182282..00000000
--- a/cdist/conf/type/__go_get/explorer/go-executable
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-# shellcheck disable=SC1091
-[ -f /etc/environment ] && . /etc/environment
-# shellcheck disable=SC1091
-[ -f /etc/profile ] && . /etc/profile
-go version 2>/dev/null || true
diff --git a/cdist/conf/type/__go_get/gencode-remote b/cdist/conf/type/__go_get/gencode-remote
deleted file mode 100755
index 4c47a70e..00000000
--- a/cdist/conf/type/__go_get/gencode-remote
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh -e
-
-package=$__object_id
-
-cat<
-
-
-COPYING
--------
-Copyright \(C) 2017 Kamila Součková. 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.
diff --git a/cdist/conf/type/__go_get/manifest b/cdist/conf/type/__go_get/manifest
deleted file mode 100755
index a5cc4c80..00000000
--- a/cdist/conf/type/__go_get/manifest
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh -e
-
-go_executable=$(cat "$__object/explorer/go-executable")
-[ -z "$go_executable" ] && echo "__go_get: Cannot find go executable; make sure it is installed and in PATH" >&2 && exit 1
-
-os=$(cat "$__global/explorer/os")
-case $os in
- debian|devuan|ubuntu)
- __package build-essential
- ;;
- *)
- echo "__go_get: Don't know how to install g++ on $os" >&2
- echo "__go_get: Send a pull request or contact to add support for $os." >&2
- exit 1
- ;;
-esac
-
-__package git
diff --git a/cdist/conf/type/__golang_from_vendor/gencode-remote b/cdist/conf/type/__golang_from_vendor/gencode-remote
deleted file mode 100755
index 5200e9e3..00000000
--- a/cdist/conf/type/__golang_from_vendor/gencode-remote
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh -e
-
-version=$(cat "$__object/parameter/version")
-
-kernel_name=$(tr '[:upper:]' '[:lower:]' < "$__global/explorer/kernel_name")
-machine=$(cat "$__global/explorer/machine")
-case $machine in
- x86_64|amd64)
- arch=amd64
- ;;
- x86)
- arch=386
- ;;
- *)
- arch=$machine # at least try...
- ;;
-esac
-
-PACKAGE="go${version}.${kernel_name}-${arch}"
-URL="https://storage.googleapis.com/golang/${PACKAGE}.tar.gz"
-cat </dev/null)" = "xgo$version" ] && exit 0 # already there
-wget --no-verbose "$URL" -O "/tmp/${PACKAGE}.tar.gz"
-rm -rf /usr/local/go
-tar -C /usr/local -xzf /tmp/${PACKAGE}.tar.gz
-EOF
diff --git a/cdist/conf/type/__golang_from_vendor/man.rst b/cdist/conf/type/__golang_from_vendor/man.rst
deleted file mode 100644
index 2b4f065e..00000000
--- a/cdist/conf/type/__golang_from_vendor/man.rst
+++ /dev/null
@@ -1,48 +0,0 @@
-cdist-type__golang_from_vendor(7)
-=================================
-
-NAME
-----
-cdist-type__golang_from_vendor - Install any version of golang from golang.org
-
-
-DESCRIPTION
------------
-This cdist type allows you to install golang from archives provided by https://golang.org/dl/.
-
-See https://golang.org/dl/ for the list of supported versions, operating systems and architectures.
-
-This is a singleton type.
-
-
-REQUIRED PARAMETERS
--------------------
-None.
-
-
-OPTIONAL PARAMETERS
--------------------
-version
- The golang version to install, defaults to 1.8.1
-
-
-EXAMPLES
---------
-
-.. code-block:: sh
-
- __golang_from_vendor --version 1.8.1
-
-
-
-AUTHORS
--------
-Kamila Součková
-
-
-COPYING
--------
-Copyright \(C) 2017 Kamila Součková. 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.
diff --git a/cdist/conf/type/__golang_from_vendor/manifest b/cdist/conf/type/__golang_from_vendor/manifest
deleted file mode 100755
index ad39ddfb..00000000
--- a/cdist/conf/type/__golang_from_vendor/manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh -e
-
-# shellcheck disable=SC2016
-__line go_in_path --line 'export PATH=/usr/local/go/bin:$PATH' --file /etc/profile
diff --git a/cdist/conf/type/__golang_from_vendor/parameter/default/version b/cdist/conf/type/__golang_from_vendor/parameter/default/version
deleted file mode 100644
index a8fdfda1..00000000
--- a/cdist/conf/type/__golang_from_vendor/parameter/default/version
+++ /dev/null
@@ -1 +0,0 @@
-1.8.1
diff --git a/cdist/conf/type/__golang_from_vendor/parameter/optional b/cdist/conf/type/__golang_from_vendor/parameter/optional
deleted file mode 100644
index 088eda41..00000000
--- a/cdist/conf/type/__golang_from_vendor/parameter/optional
+++ /dev/null
@@ -1 +0,0 @@
-version
diff --git a/cdist/conf/type/__golang_from_vendor/singleton b/cdist/conf/type/__golang_from_vendor/singleton
deleted file mode 100644
index e69de29b..00000000
diff --git a/cdist/conf/type/__grafana_dashboard/man.rst b/cdist/conf/type/__grafana_dashboard/man.rst
deleted file mode 100644
index b3974028..00000000
--- a/cdist/conf/type/__grafana_dashboard/man.rst
+++ /dev/null
@@ -1,43 +0,0 @@
-cdist-type__grafana_dashboard(7)
-================================
-
-NAME
-----
-cdist-type__grafana_dashboard - Install Grafana (https://grafana.com)
-
-
-DESCRIPTION
------------
-This cdist type adds the Grafana repository, installs the grafana package, and sets the server to start on boot.
-
-This is a singleton type.
-
-REQUIRED PARAMETERS
--------------------
-None.
-
-
-OPTIONAL PARAMETERS
--------------------
-None.
-
-
-EXAMPLES
---------
-
-.. code-block:: sh
-
- __grafana_dashboard
-
-
-AUTHORS
--------
-Kamila Součková
-
-
-COPYING
--------
-Copyright \(C) 2017 Kamila Součková. 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.
diff --git a/cdist/conf/type/__grafana_dashboard/manifest b/cdist/conf/type/__grafana_dashboard/manifest
deleted file mode 100755
index 0d944482..00000000
--- a/cdist/conf/type/__grafana_dashboard/manifest
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/sh -e
-
-os=$(cat "$__global/explorer/os")
-os_version=$(cat "$__global/explorer/os_version")
-
-require=""
-case $os in
- debian|devuan)
- case $os_version in
- 8*|jessie)
- # Differntation not needed anymore
- apt_source_distribution=stable
- ;;
- 9*|ascii/ceres|ascii)
- # Differntation not needed anymore
- apt_source_distribution=stable
- ;;
- 10*|11*)
- # 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
- exit 1
- ;;
- esac
-
- __apt_key_uri grafana \
- --name 'Grafana Release Signing Key' \
- --uri https://packages.grafana.com/gpg.key
-
- require="$require __apt_key_uri/grafana" __apt_source grafana \
- --uri https://packages.grafana.com/oss/deb \
- --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 __package/grafana" __start_on_boot grafana-server
- require="$require __start_on_boot/grafana-server" __process grafana-server --start "service grafana-server start"
- ;;
- *)
- echo "Don't know how to install Grafana on $os. Send us a pull request!" >&2
- exit 1
- ;;
-esac
diff --git a/cdist/conf/type/__grafana_dashboard/singleton b/cdist/conf/type/__grafana_dashboard/singleton
deleted file mode 100644
index e69de29b..00000000
diff --git a/cdist/conf/type/__group/explorer/group b/cdist/conf/type/__group/explorer/group
index dc673f61..07f73a91 100755
--- a/cdist/conf/type/__group/explorer/group
+++ b/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
+getent group "$name" || true
+
diff --git a/cdist/conf/type/__group/explorer/gshadow b/cdist/conf/type/__group/explorer/gshadow
index 05841d69..8d40e9e0 100755
--- a/cdist/conf/type/__group/explorer/gshadow
+++ b/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,11 @@
#
name=$__object_id
-os=$("$__explorer/os")
+os="$($__explorer/os)"
-not_supported() {
- 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
- 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
+if [ "$os" = "freebsd" ]; then
+ echo "FreeBSD does not have getent gshadow"
+ exit 0
fi
+
+getent gshadow "$name" || true
diff --git a/cdist/conf/type/__group/gencode-remote b/cdist/conf/type/__group/gencode-remote
index ff63e218..2aaa83f3 100755
--- a/cdist/conf/type/__group/gencode-remote
+++ b/cdist/conf/type/__group/gencode-remote
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/sh
#
# 2011-2015 Steven Armstrong (steven-cdist at armstrong.cc)
# 2011 Nico Schottelius (nico-cdist at schottelius.org)
@@ -30,9 +30,9 @@ state="$(cat "$__object/parameter/state")"
# Use short option names for portability
shorten_property() {
case "$1" in
- gid) echo " -g";;
- password) echo " -p";;
- system) echo " -r";;
+ gid) echo "-g";;
+ password) echo "-p";;
+ system) echo "-r";;
esac
}
@@ -40,9 +40,11 @@ shorten_property() {
if [ "$state" = "present" ]; then
case "$os" in
freebsd)
+ supported_add_properties="gid"
supported_change_properties="gid"
;;
*)
+ supported_add_properties="gid password system"
supported_change_properties="gid password"
;;
esac
@@ -61,8 +63,8 @@ if [ "$state" = "present" ]; then
;;
esac
if [ "$new_value" != "$current_value" ]; then
- set -- "$@" "$(shorten_property "$property")" \'"$new_value"\'
- echo "change $property $new_value $current_value" >> "$__messages_out"
+ set -- "$@" "$(shorten_property $property)" \'$new_value\'
+ echo change $property $new_value $current_value >> "$__messages_out"
fi
fi
done
@@ -81,14 +83,14 @@ if [ "$state" = "present" ]; then
new_value="$(cat "$__object/parameter/$property")"
if [ -z "$new_value" ]; then
# Boolean parameters have no value
- set -- "$@" "$(shorten_property "$property")"
+ set -- "$@" "$(shorten_property $property)"
else
- set -- "$@" "$(shorten_property "$property")" \'"$new_value"\'
+ set -- "$@" "$(shorten_property $property)" \'$new_value\'
fi
fi
done
if [ "$os" = "freebsd" ]; then
- echo pw groupadd "$name" "$@"
+ echo pw groupadd "$@" "$name"
else
echo groupadd "$@" "$name"
fi
diff --git a/cdist/conf/type/__group/man.rst b/cdist/conf/type/__group/man.rst
deleted file mode 100644
index 614f3d57..00000000
--- a/cdist/conf/type/__group/man.rst
+++ /dev/null
@@ -1,80 +0,0 @@
-cdist-type__group(7)
-====================
-
-NAME
-----
-cdist-type__group - Manage groups
-
-
-DESCRIPTION
------------
-This cdist type allows you to create or modify groups on the target.
-
-
-REQUIRED PARAMETERS
--------------------
-None.
-
-
-OPTIONAL PARAMETERS
--------------------
-state
- absent or present, defaults to present
-gid
- see groupmod(8)
-password
- see above
-
-
-BOOLEAN PARAMETERS
-------------------
-system
- see groupadd(8), apply only on group creation
-
-
-MESSAGES
---------
-mod
- group is modified
-add
- New group added
-remove
- group is removed
-change
- Changed group property from current_value to new_value
-set
- set property to new value, property was not set before
-
-
-EXAMPLES
---------
-
-.. code-block:: sh
-
- # Create a group 'foobar' with operating system default settings
- __group foobar
-
- # Remove the 'foobar' group
- __group foobar --state absent
-
- # Create a system group 'myservice' with operating system default settings
- __group myservice --system
-
- # Same but with a specific gid
- __group foobar --gid 1234
-
- # Same but with a gid and password
- __group foobar --gid 1234 --password 'crypted-password-string'
-
-
-AUTHORS
--------
-Steven Armstrong
-
-
-COPYING
--------
-Copyright \(C) 2011-2015 Steven Armstrong. You can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
diff --git a/cdist/conf/type/__group/man.text b/cdist/conf/type/__group/man.text
new file mode 100644
index 00000000..4b18a552
--- /dev/null
+++ b/cdist/conf/type/__group/man.text
@@ -0,0 +1,80 @@
+cdist-type__group(7)
+====================
+Steven Armstrong
+
+
+NAME
+----
+cdist-type__group - Manage groups
+
+
+DESCRIPTION
+-----------
+This cdist type allows you to create or modify groups on the target.
+
+
+REQUIRED PARAMETERS
+-------------------
+None.
+
+
+OPTIONAL PARAMETERS
+-------------------
+state::
+ absent or present, defaults to present
+gid::
+ see groupmod(8)
+password::
+ see above
+
+
+BOOLEAN PARAMETERS
+------------------
+system::
+ see groupadd(8), apply only on group creation
+
+
+MESSAGES
+--------
+mod::
+ group is modified
+add::
+ New group added
+remove::
+ group is removed
+change ::
+ Changed group property from current_value to new_value
+set ::
+ set property to new value, property was not set bevore
+
+
+EXAMPLES
+--------
+
+--------------------------------------------------------------------------------
+# Create a group 'foobar' with operating system default settings
+__group foobar
+
+# Remove the 'foobar' group
+__group foobar --state absent
+
+# Create a system group 'myservice' with operating system default settings
+__group myservice --system
+
+# Same but with a specific gid
+__group foobar --gid 1234
+
+# Same but with a gid and password
+__group foobar --gid 1234 --password 'crypted-password-string'
+--------------------------------------------------------------------------------
+
+
+SEE ALSO
+--------
+- cdist-type(7)
+
+
+COPYING
+-------
+Copyright \(C) 2011-2015 Steven Armstrong. Free use of this software is
+granted under the terms of the GNU General Public License version 3 (GPLv3).
diff --git a/cdist/conf/type/__haproxy_dualstack/files/http b/cdist/conf/type/__haproxy_dualstack/files/http
deleted file mode 100644
index 0508a465..00000000
--- a/cdist/conf/type/__haproxy_dualstack/files/http
+++ /dev/null
@@ -1,8 +0,0 @@
-frontend http
- bind BIND@:80
- mode http
- option httplog
- default_backend http
-
-backend http
- mode http
diff --git a/cdist/conf/type/__haproxy_dualstack/files/https b/cdist/conf/type/__haproxy_dualstack/files/https
deleted file mode 100644
index 73deac46..00000000
--- a/cdist/conf/type/__haproxy_dualstack/files/https
+++ /dev/null
@@ -1,10 +0,0 @@
-frontend https
- bind BIND@:443
- mode tcp
- option tcplog
- tcp-request inspect-delay 5s
- tcp-request content accept if { req_ssl_hello_type 1 }
- default_backend https
-
-backend https
- mode tcp
diff --git a/cdist/conf/type/__haproxy_dualstack/files/imaps b/cdist/conf/type/__haproxy_dualstack/files/imaps
deleted file mode 100644
index b1ec3793..00000000
--- a/cdist/conf/type/__haproxy_dualstack/files/imaps
+++ /dev/null
@@ -1,12 +0,0 @@
-frontend imaps
- bind BIND@:143
- bind BIND@:993
-
- mode tcp
- option tcplog
- tcp-request inspect-delay 5s
- tcp-request content accept if { req_ssl_hello_type 1 }
- default_backend imaps
-
-backend imaps
- mode tcp
diff --git a/cdist/conf/type/__haproxy_dualstack/files/smtps b/cdist/conf/type/__haproxy_dualstack/files/smtps
deleted file mode 100644
index dce6ed4a..00000000
--- a/cdist/conf/type/__haproxy_dualstack/files/smtps
+++ /dev/null
@@ -1,12 +0,0 @@
-frontend smtps
- bind BIND@:25
- bind BIND@:465
-
- mode tcp
- option tcplog
- tcp-request inspect-delay 5s
- tcp-request content accept if { req_ssl_hello_type 1 }
- default_backend smtps
-
-backend smtps
- mode tcp
diff --git a/cdist/conf/type/__haproxy_dualstack/man.rst b/cdist/conf/type/__haproxy_dualstack/man.rst
deleted file mode 100644
index 6c131cbe..00000000
--- a/cdist/conf/type/__haproxy_dualstack/man.rst
+++ /dev/null
@@ -1,121 +0,0 @@
-cdist-type__haproxy_dualstack(7)
-================================
-
-
-NAME
-----
-cdist-type__haproxy_dualstack - Proxy services from a dual-stack server
-
-
-DESCRIPTION
------------
-This (singleton) type installs and configures haproxy to act as a dual-stack
-proxy for single-stack services.
-
-This can be useful to add IPv4 support to IPv6-only services while only using
-one IPv4 for many such services.
-
-By default this type uses the plain TCP proxy mode, which means that there is no
-need for TLS termination on this host when SNI is supported.
-This also means that proxied services will not receive the client's IP address,
-but will see the proxy's IP address instead (that of `$__target_host`).
-
-This can be solved by using the PROXY protocol, but do take into account that,
-e.g. nginx cannot serve both regular HTTP(S) and PROXY protocols on the same
-port, so you will need to use other ports for that.
-
-As a recommendation in this type: use TCP ports 8080 and 591 respectively to
-serve HTTP and HTTPS using the PROXY protocol.
-
-See the EXAMPLES for more details.
-
-
-OPTIONAL PARAMETERS
--------------------
-v4proxy
- Proxy incoming IPv4 connections to the equivalent IPv6 endpoint.
- In its simplest use, it must be a NAME with an `AAAA` DNS entry, which is
- the IP address actually providing the proxied services.
- The full format of this argument is:
- `[proxy:]NAME[[:PROTOCOL_1=PORT_1]...[:PROTOCOL_N=PORT_N]]`
- Where starting with `proxy:` determines that the PROXY protocol must be
- used and each `:PROTOCOL=PORT` (e.g. `:http=8080` or `:https=591`) is a PORT
- override for the given PROTOCOL (see `--protocol`), if not present the
- PROTOCOL's default port will be used.
-
-
-v6proxy
- Proxy incoming IPv6 connections to the equivalent IPv4 endpoint.
- In its simplest use, it must be a NAME with an `A` DNS entry, which is
- the IP address actually providing the proxied services.
- See `--v4proxy` for more options and details.
-
-protocol
- Can be passed multiple times or as a space-separated list of protocols.
- Currently supported protocols are: `http`, `https`, `imaps`, `smtps`.
- This defaults to: `http https imaps smtps`.
-
-
-EXAMPLES
---------
-
-.. code-block:: sh
-
- # Proxy the IPv6-only services so IPv4-only clients can access them
- # This uses HAProxy's TCP mode for http, https, imaps and smtps
- __haproxy_dualstack \
- --v4proxy ipv6.chat \
- --v4proxy matrix.ungleich.ch
-
- # Proxy the IPv6-only HTTP(S) services so IPv4-only clients can access them
- # Note this means that the backend IPv6-only server will only see
- # the IPv6 address of the haproxy host managed by cdist, which can be
- # troublesome if this information is relevant for analytics/security/...
- # See the PROXY example below
- __haproxy_dualstack \
- --protocol http --protocol https \
- --v4proxy ipv6.chat \
- --v4proxy matrix.ungleich.ch
-
- # Use the PROXY protocol to proxy the IPv6-only HTTP(S) services enabling
- # IPv4-only clients to access them while maintaining the client's IP address
- __haproxy_dualstack \
- --protocol http --protocol https \
- --v4proxy proxy:ipv6.chat:http=8080:https=591 \
- --v4proxy proxy:matrix.ungleich.ch:http=8080:https=591
- # Note however that the PROXY protocol is not compatible with regular
- # HTTP(S) protocols, so your nginx will have to listen on different ports
- # with the PROXY settings.
- # Note that you will need to restrict access to the 8080 port to prevent
- # Client IP spoofing.
- # This can be something like:
- # server {
- # # listen for regular HTTP connections
- # listen [::]:80 default_server;
- # listen 80 default_server;
- # # listen for PROXY HTTP connections
- # listen [::]:8080 proxy_protocol;
- # # Accept the Client's IP from the PROXY protocol
- # real_ip_header proxy_protocol;
- # }
-
-
-SEE ALSO
---------
-- https://www.haproxy.com/blog/enhanced-ssl-load-balancing-with-server-name-indication-sni-tls-extension/
-- https://www.haproxy.com/blog/haproxy/proxy-protocol/
-- https://docs.nginx.com/nginx/admin-guide/load-balancer/using-proxy-protocol/
-
-
-AUTHORS
--------
-ungleich
-Evilham
-
-
-COPYING
--------
-Copyright \(C) 2021 ungleich glarus ag. 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.
diff --git a/cdist/conf/type/__haproxy_dualstack/manifest b/cdist/conf/type/__haproxy_dualstack/manifest
deleted file mode 100644
index d110eea6..00000000
--- a/cdist/conf/type/__haproxy_dualstack/manifest
+++ /dev/null
@@ -1,155 +0,0 @@
-#!/bin/sh -eu
-
-__package haproxy
-require="__package/haproxy" __start_on_boot haproxy
-
-tmpdir="$__object/files"
-mkdir "$tmpdir"
-configtmp="$__object/files/haproxy.cfg"
-
-os=$(cat "$__global/explorer/os")
-case $os in
- freebsd)
- CONFIG_FILE="/usr/local/etc/haproxy.conf"
- cat < "$configtmp"
-global
- maxconn 4000
- user nobody
- group nogroup
- daemon
-
-EOF
-
- ;;
- *)
- CONFIG_FILE="/etc/haproxy/haproxy.cfg"
- cat < "$configtmp"
-global
- log [::1] local2
- chroot /var/lib/haproxy
- pidfile /var/run/haproxy.pid
- maxconn 4000
- user haproxy
- group haproxy
- daemon
-
- # turn on stats unix socket
- stats socket /var/lib/haproxy/stats
-
-EOF
- ;;
-esac
-
-cat <> "$configtmp"
-defaults
- retries 3
- log global
- timeout http-request 10s
- timeout queue 1m
- timeout connect 10s
- timeout client 1m
- timeout server 1m
- timeout http-keep-alive 10s
- timeout check 10s
-EOF
-
-dig_cmd="$(command -v dig || true)"
-get_ip() {
- # Usage: get_ip (ipv4|ipv6) NAME
- # uses "dig" if available, else fallback to "host"
- case $1 in
- ipv4)
- if [ -n "${dig_cmd}" ]; then
- ${dig_cmd} +short A "$2"
- else
- host -t A "$2" | cut -d ' ' -f 4 | grep -v 'found:'
- fi
- ;;
- ipv6)
- if [ -n "${dig_cmd}" ]; then
- ${dig_cmd} +short AAAA "$2"
- else
- host -t AAAA "$2" | cut -d ' ' -f 5 | grep -v 'NXDOMAIN'
- fi
- ;;
- esac
-}
-
-PROTOCOLS="$(cat "$__object/parameter/protocol")"
-
-for proxy in v4proxy v6proxy; do
- param=$__object/parameter/$proxy
- # no backend? skip generating code
- if [ ! -f "$param" ]; then
- continue
- fi
-
- # turn backend name into bind parameter: v4backend -> ipv4@
- bind=$(echo $proxy | sed -e 's/^/ip/' -e 's/proxy//')
-
- case $bind in
- ipv4)
- backendproto=ipv6
- ;;
- ipv6)
- backendproto=ipv4
- ;;
- esac
-
- for proto in ${PROTOCOLS}; do
- # Add protocol "header"
- printf "\n# %s %s \n" "${bind}" "${proto}" >> "$configtmp"
-
- sed -e "s/BIND/$bind/" \
- -e "s/\(frontend[[:space:]].*\)/\1$bind/" \
- -e "s/\(backend[[:space:]].*\)/\\1$bind/" \
- "$__type/files/$proto" >> "$configtmp"
-
- while read -r hostdefinition; do
- if echo "$hostdefinition" | grep -qE '^proxy:'; then
- # Proxy protocol was requested
- host="$(echo "$hostdefinition" | sed -E 's/^proxy:([^:]+).*$/\1/')"
- send_proxy=" send-proxy"
- else
- # Just use tcp proxy mode
- host="$hostdefinition"
- send_proxy=""
- fi
- if echo "$hostdefinition" | grep -qE ":${proto}="; then
- # Use custom port definition if requested
- port="$(echo "$hostdefinition" | sed -E "s/^(.*:)?${proto}=([0-9]+).*$/:\2/")"
- else
- # Else use the default
- port=""
- fi
- servername=$host
-
- res=$(get_ip "$bind" "$servername")
-
- if [ -z "$res" ]; then
- echo "$servername does not resolve - aborting config" >&2
- exit 1
- fi
-
- # Treat protocols without TLS+SNI specially
- if [ "$proto" = http ]; then
- echo " use-server $servername if { hdr(host) -i $host }" >> "$configtmp"
- else
- echo " use-server $servername if { req_ssl_sni -i $host }" >> "$configtmp"
- fi
-
- # Create the "server" itself.
- # Note that port and send_proxy will be empty unless
- # they were requested by the type user
- echo " server $servername ${backendproto}@${host}${port}${send_proxy}" >> "$configtmp"
-
- done < "$param"
- done
-done
-
-# Create config file
-require="__package/haproxy" __file ${CONFIG_FILE} --source "$configtmp" --mode 0644
-
-require="__file${CONFIG_FILE}" __check_messages "haproxy_reload" \
- --pattern "^__file${CONFIG_FILE}" \
- --execute "service haproxy reload || service haproxy restart"
diff --git a/cdist/conf/type/__haproxy_dualstack/parameter/default/protocol b/cdist/conf/type/__haproxy_dualstack/parameter/default/protocol
deleted file mode 100644
index dc8bb7bf..00000000
--- a/cdist/conf/type/__haproxy_dualstack/parameter/default/protocol
+++ /dev/null
@@ -1 +0,0 @@
-http https imaps smtps
diff --git a/cdist/conf/type/__haproxy_dualstack/parameter/optional_multiple b/cdist/conf/type/__haproxy_dualstack/parameter/optional_multiple
deleted file mode 100644
index 8c482bd4..00000000
--- a/cdist/conf/type/__haproxy_dualstack/parameter/optional_multiple
+++ /dev/null
@@ -1,3 +0,0 @@
-protocol
-v4proxy
-v6proxy
diff --git a/cdist/conf/type/__haproxy_dualstack/singleton b/cdist/conf/type/__haproxy_dualstack/singleton
deleted file mode 100644
index e69de29b..00000000
diff --git a/cdist/conf/type/__hostname/explorer/has_hostnamectl b/cdist/conf/type/__hostname/explorer/has_hostnamectl
index 2f531f30..9040023d 100755
--- a/cdist/conf/type/__hostname/explorer/has_hostnamectl
+++ b/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
diff --git a/cdist/conf/type/__hostname/explorer/hostname_file b/cdist/conf/type/__hostname/explorer/hostname_file
new file mode 100755
index 00000000..6a00aa9f
--- /dev/null
+++ b/cdist/conf/type/__hostname/explorer/hostname_file
@@ -0,0 +1,30 @@
+#!/bin/sh
+#
+# 2014 Nico Schottelius (nico-cdist at schottelius.org)
+#
+# This file is part of cdist.
+#
+# cdist is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# cdist is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with cdist. If not, see .
+#
+#
+# Retrieve the contents of /etc/hostname
+#
+
+# Almost any distribution
+if [ -f /etc/hostname ]; then
+ cat /etc/hostname
+# SuSE
+elif [ -f /etc/HOSTNAME ]; then
+ cat /etc/HOSTNAME
+fi
diff --git a/cdist/test/autil/fixtures/explorer/hostname b/cdist/conf/type/__hostname/explorer/hostname_sysconfig
similarity index 76%
rename from cdist/test/autil/fixtures/explorer/hostname
rename to cdist/conf/type/__hostname/explorer/hostname_sysconfig
index 7715c6b0..d0d7b4e7 100755
--- a/cdist/test/autil/fixtures/explorer/hostname
+++ b/cdist/conf/type/__hostname/explorer/hostname_sysconfig
@@ -1,7 +1,6 @@
#!/bin/sh
#
-# 2010-2014 Nico Schottelius (nico-cdist at schottelius.org)
-# 2012 Steven Armstrong (steven-cdist at armstrong.cc)
+# 2014 Nico Schottelius (nico-cdist at schottelius.org)
#
# This file is part of cdist.
#
@@ -19,7 +18,9 @@
# along with cdist. If not, see .
#
#
+# Retrieve the contents of /etc/hostname
+#
-if command -v uname >/dev/null; then
- uname -n
+if [ -f /etc/sysconfig/network ]; then
+ awk -F= '/^HOSTNAME=/ { print $2 }' /etc/sysconfig/network
fi
diff --git a/cdist/conf/type/__hostname/explorer/max_len b/cdist/conf/type/__hostname/explorer/max_len
deleted file mode 100644
index fb863949..00000000
--- a/cdist/conf/type/__hostname/explorer/max_len
+++ /dev/null
@@ -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
diff --git a/cdist/conf/type/__hostname/gencode-remote b/cdist/conf/type/__hostname/gencode-remote
index c1a97ac8..576f80bf 100755
--- a/cdist/conf/type/__hostname/gencode-remote
+++ b/cdist/conf/type/__hostname/gencode-remote
@@ -1,8 +1,7 @@
-#!/bin/sh -e
+#!/bin/sh
#
-# 2014-2017 Steven Armstrong (steven-cdist at armstrong.cc)
+# 2014 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,86 +19,57 @@
# along with cdist. If not, see .
#
-os=$(cat "${__global:?}/explorer/os")
-name_running=$(cat "${__global:?}/explorer/hostname")
-has_hostnamectl=$(cat "${__object:?}/explorer/has_hostnamectl")
-
-
-if test -s "${__object:?}/parameter/name"
-then
- name_should=$(cat "${__object:?}/parameter/name")
+if [ -f "$__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:?}
- name_should=${name_should%%.*}
- ;;
- esac
+ name_should="$(echo "${__target_host%%.*}")"
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)
+ if [ "$name_config" = "$name_should" -a "$name_running" = "$name_should" ]; then
+ exit 0
+ fi
+ ;;
+ centos)
+ if [ "$name_sysconfig" = "$name_should" -a "$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.
-case ${os}
-in
- (alpine|debian|devuan|ubuntu)
- echo 'hostname -F /etc/hostname'
+if [ "$has_hostnamectl" ]; then
+ echo "hostnamectl set-hostname '$name_should'"
+else
+ case "$os" in
+ archlinux|debian|ubuntu)
+ echo "hostname '$name_should'"
+ echo "printf '%s\n' '$name_should' > /etc/hostname"
;;
- (archlinux)
- echo 'command -v hostnamectl >/dev/null 2>&1' \
- "&& hostnamectl set-hostname '${name_should}'" \
- "|| hostname '${name_should}'"
+ centos)
+ echo "hostname '$name_should'"
;;
- (centos|fedora|redhat|scientific|freebsd|netbsd|openbsd|gentoo|void)
- echo "hostname '${name_should}'"
+ suse)
+ echo "hostname '$name_should'"
+ echo "printf '%s\n' '$name_should' > /etc/HOSTNAME"
;;
- (openwrt)
- echo "echo '${name_should}' >/proc/sys/kernel/hostname"
- ;;
- (macosx)
- echo "scutil --set HostName '${name_should}'"
- ;;
- (solaris)
- echo "uname -S '${name_should}'"
- ;;
- (slackware|suse)
- # 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}'"
- ;;
- (*)
- # 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\n" "${os}"
- printf 'exit 1\n'
- fi
- ;;
-esac
+ esac
+fi
diff --git a/cdist/conf/type/__hostname/man.rst b/cdist/conf/type/__hostname/man.rst
deleted file mode 100644
index 72aefbab..00000000
--- a/cdist/conf/type/__hostname/man.rst
+++ /dev/null
@@ -1,55 +0,0 @@
-cdist-type__hostname(7)
-=======================
-
-NAME
-----
-cdist-type__hostname - Set the hostname
-
-
-DESCRIPTION
------------
-Sets the hostname on various operating systems.
-
-**Tip:** For advice on choosing a hostname, see
-`RFC 1178 `_.
-
-
-REQUIRED PARAMETERS
--------------------
-None.
-
-OPTIONAL PARAMETERS
--------------------
-name
- The hostname to set. Defaults to the first segment of __target_host
- (${__target_host%%.*})
-
-
-MESSAGES
---------
-changed
- Changed the hostname
-
-EXAMPLES
---------
-
-.. code-block:: sh
-
- # take hostname from __target_host
- __hostname
-
- # set hostname explicitly
- __hostname --name some-static-hostname
-
-
-AUTHORS
--------
-Steven Armstrong
-
-
-COPYING
--------
-Copyright \(C) 2012 Steven Armstrong. You can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
diff --git a/cdist/conf/type/__hostname/man.text b/cdist/conf/type/__hostname/man.text
new file mode 100644
index 00000000..ac44d426
--- /dev/null
+++ b/cdist/conf/type/__hostname/man.text
@@ -0,0 +1,52 @@
+cdist-type__hostname(7)
+=======================
+Steven Armstrong
+
+
+NAME
+----
+cdist-type__hostname - set the hostname
+
+
+DESCRIPTION
+-----------
+Set's the hostname on various operating systems.
+
+
+REQUIRED PARAMETERS
+-------------------
+None.
+
+OPTIONAL PARAMETERS
+-------------------
+name::
+ The hostname to set. Defaults to the first segment of __target_host
+ (${__target_host%%.*})
+
+
+MESSAGES
+--------
+changed::
+ Changed the hostname
+
+EXAMPLES
+--------
+
+--------------------------------------------------------------------------------
+# take hostname from __target_host
+__hostname
+
+# set hostname explicitly
+__hostname --name some-static-hostname
+--------------------------------------------------------------------------------
+
+
+SEE ALSO
+--------
+- cdist-type(7)
+
+
+COPYING
+-------
+Copyright \(C) 2012 Steven Armstrong. Free use of this software is
+granted under the terms of the GNU General Public License version 3 (GPLv3).
diff --git a/cdist/conf/type/__hostname/manifest b/cdist/conf/type/__hostname/manifest
index b80aa2ef..448e56da 100755
--- a/cdist/conf/type/__hostname/manifest
+++ b/cdist/conf/type/__hostname/manifest
@@ -1,8 +1,7 @@
-#!/bin/sh -e
+#!/bin/sh
#
# 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,176 +19,33 @@
# along with cdist. If not, see .
#
-set_hostname_systemd() {
- echo "$1" | __file /etc/hostname --source -
+os=$(cat "$__global/explorer/os")
+if [ -f "$__object/parameter/name" ]; then
+ name_should="$(cat "$__object/parameter/name")"
+else
+ name_should="$(echo "${__target_host%%.*}")"
+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
}
-os=$(cat "${__global:?}/explorer/os")
-
-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|suse)
- # Hostname is FQDN
- name_should=${__target_host:?}
- ;;
- *)
- # Hostname is only first component of FQDN on all other systems.
- name_should=${__target_host:?}
- name_should=${name_should%%.*}
- ;;
- 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)
+case "$os" in
+ archlinux|debian|suse|ubuntu)
# handled in gencode-remote
- ;;
- (netbsd)
- __key_value '/etc/rc.conf:hostname' \
- --file /etc/rc.conf \
- --delimiter '=' --exact_delimiter \
- --key 'hostname' \
- --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 -
- ;;
- (openwrt)
- __uci system.@system[0].hostname --value "${name_should}"
- # --transaction hostname
- ;;
- (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)
- if test -s "${__global:?}/explorer/os_release"
- then
- # shellcheck source=/dev/null
- os_version=$(. "${__global:?}/explorer/os_release" && echo "${VERSION}")
- else
- os_version=$(sed -n 's/^VERSION\ *=\ *//p' "${__global:?}/explorer/os_version")
- fi
- os_major=$(expr "${os_version}" : '\([0-9]\{1,\}\)')
-
- # 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
- # strip away everything but the first part from $name_should
- name_should=${name_should%%.*}
- fi
-
- # 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
- 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
- fi
- ;;
+ :
+ ;;
+ centos)
+ __key_value sysconfig-hostname \
+ --file /etc/sysconfig/network \
+ --delimiter '=' \
+ --key HOSTNAME \
+ --value "$name_should" --exact_delimiter
+ ;;
+ *)
+ not_supported
+ ;;
esac
diff --git a/cdist/conf/type/__hosts/man.rst b/cdist/conf/type/__hosts/man.rst
deleted file mode 100644
index 1ac706cb..00000000
--- a/cdist/conf/type/__hosts/man.rst
+++ /dev/null
@@ -1,62 +0,0 @@
-cdist-type__hosts(7)
-====================
-
-NAME
-----
-
-cdist-type__hosts - manage entries in /etc/hosts
-
-DESCRIPTION
------------
-
-Add or remove entries from */etc/hosts* file.
-
-OPTIONAL PARAMETERS
--------------------
-
-state
- If state is ``present``, make *object_id* resolve to *ip*. If
- state is ``absent``, *object_id* will no longer resolve via
- */etc/hosts*, if it was previously configured with this type.
- Manually inserted entries are unaffected.
-
-ip
- IP address, to which hostname (=\ *object_id*) must resolve. If
- state is ``present``, this parameter is mandatory, if state is
- ``absent``, this parameter is silently ignored.
-
-alias
- An alias for the hostname.
- This parameter can be specified multiple times (once per alias).
-
-EXAMPLES
---------
-
-.. code-block:: sh
-
- # Now `funny' resolves to 192.168.1.76,
- __hosts funny --ip 192.168.1.76
- # and `happy' no longer resolve via /etc/hosts if it was
- # previously configured via __hosts.
- __hosts happy --state absent
-
- __hosts srv1.example.com --ip 192.168.0.42 --alias srv1
-
-SEE ALSO
---------
-
-:strong:`hosts`\ (5)
-
-AUTHORS
--------
-| Dmitry Bogatov
-| Dennis Camera
-
-
-COPYING
--------
-
-Copyright \(C) 2015-2016 Dmitry Bogatov, 2019 Dennis Camera.
-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.
diff --git a/cdist/conf/type/__hosts/manifest b/cdist/conf/type/__hosts/manifest
deleted file mode 100755
index 8103ebd5..00000000
--- a/cdist/conf/type/__hosts/manifest
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/sh -e
-#
-# Copyright (C) 2015 Bogatov Dmitry
-# 2019 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 this program. If not, see .
-#
-
-set -e
-
-hostname=$__object_id
-state=$(cat "${__object}/parameter/state")
-marker="# __hosts/${hostname}"
-
-if test "${state}" != 'absent'
-then
- ip=$(cat "${__object}/parameter/ip")
- if test -s "${__object}/parameter/alias"
- then
- aliases=$(while read -r a; do printf '\t%s' "$a"; done <"$__object/parameter/alias")
- fi
-
- set -- --line "$(printf '%s\t%s%s %s' \
- "${ip}" "${hostname}" "${aliases}" "${marker}")"
-else
- set -- --regex "$(echo "${marker}" | sed -e 's/\./\\./')$"
-fi
-
-__line "/etc/hosts:${hostname}" --file /etc/hosts --state "${state}" "$@"
diff --git a/cdist/conf/type/__hosts/parameter/default/state b/cdist/conf/type/__hosts/parameter/default/state
deleted file mode 100644
index e7f6134f..00000000
--- a/cdist/conf/type/__hosts/parameter/default/state
+++ /dev/null
@@ -1 +0,0 @@
-present
diff --git a/cdist/conf/type/__hosts/parameter/optional b/cdist/conf/type/__hosts/parameter/optional
deleted file mode 100644
index 411fc5d2..00000000
--- a/cdist/conf/type/__hosts/parameter/optional
+++ /dev/null
@@ -1,2 +0,0 @@
-state
-ip
diff --git a/cdist/conf/type/__hosts/parameter/optional_multiple b/cdist/conf/type/__hosts/parameter/optional_multiple
deleted file mode 100644
index d077ed80..00000000
--- a/cdist/conf/type/__hosts/parameter/optional_multiple
+++ /dev/null
@@ -1 +0,0 @@
-alias
diff --git a/cdist/conf/type/__hwclock/explorer/adjtime_mode b/cdist/conf/type/__hwclock/explorer/adjtime_mode
deleted file mode 100755
index 2b27bedc..00000000
--- a/cdist/conf/type/__hwclock/explorer/adjtime_mode
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh -e
-#
-# 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 .
-#
-# Prints the clock mode read from the /etc/adjtime file, if present.
-#
-
-# not all operating systems use an adjfile
-test -f /etc/adjtime || exit 0
-
-# 3rd line is clock mode
-# adjtime(5) https://man7.org/linux/man-pages/man5/adjtime.5.html
-sed -n 3p /etc/adjtime
diff --git a/cdist/conf/type/__hwclock/explorer/timedatectl_localrtc b/cdist/conf/type/__hwclock/explorer/timedatectl_localrtc
deleted file mode 100755
index 8239122e..00000000
--- a/cdist/conf/type/__hwclock/explorer/timedatectl_localrtc
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh -e
-#
-# 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 .
-#
-# Prints the LocalRTC property using timedatectl on systemd-based systems.
-#
-
-command -v timedatectl >/dev/null 2>&1 || exit 0
-
-# NOTE: Older versions of timedatectl do not support `timedatectl show'
-timedatectl --no-pager status \
-| awk -F': ' '$1 ~ "RTC in local TZ$" { sub(/[ \t]*$/, "", $2); print $2 }'
diff --git a/cdist/conf/type/__hwclock/gencode-remote b/cdist/conf/type/__hwclock/gencode-remote
deleted file mode 100755
index 5995fb23..00000000
--- a/cdist/conf/type/__hwclock/gencode-remote
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/sh -e
-#
-# 2020 Dennis Camera (dennis.camera@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 .
-#
-
-mode=$(cat "${__object:?}/parameter/mode")
-
-timedatectl_localrtc=$(cat "${__object:?}/explorer/timedatectl_localrtc")
-adjtime_mode=$(cat "${__object:?}/explorer/adjtime_mode")
-
-
-case ${mode}
-in
- (localtime)
- adjtime_str=LOCAL
- local_rtc_str=yes
- ;;
- (UTC|utc)
- adjtime_str=UTC
- local_rtc_str=no
- ;;
- (*)
- printf 'Invalid value for --mode: %s\n' "${mode}" >&2
- printf 'Acceptable values are: localtime, utc.\n' >&2
- exit 1
-esac
-
-
-if test -n "${timedatectl_localrtc}"
-then
- # systemd
- timedatectl_should=${local_rtc_str}
- if test "${timedatectl_localrtc}" != "${timedatectl_should}"
- then
- printf 'timedatectl set-local-rtc %s\n' "${timedatectl_should}"
- fi
-elif test -n "${adjtime_mode}"
-then
- # others (update /etc/adjtime if present)
- if test "${adjtime_mode}" != "${adjtime_str}"
- then
- # Update /etc/adjtime (3rd line is clock mode)
- # adjtime(5) https://man7.org/linux/man-pages/man5/adjtime.5.html
- # FIXME: Should maybe add third line if adjfile only contains two lines
- printf "sed -i '3c\\\\\\n%s\\n' /etc/adjtime\\n" "${adjtime_str}"
- fi
-fi
diff --git a/cdist/conf/type/__hwclock/man.rst b/cdist/conf/type/__hwclock/man.rst
deleted file mode 100644
index 65eb648f..00000000
--- a/cdist/conf/type/__hwclock/man.rst
+++ /dev/null
@@ -1,63 +0,0 @@
-cdist-type__hwclock(7)
-======================
-
-NAME
-----
-cdist-type__hwclock - Manage the hardware real time clock.
-
-
-DESCRIPTION
------------
-This type can be used to control how the hardware clock is used by the operating
-system.
-
-
-REQUIRED PARAMETERS
--------------------
-mode
- What mode the hardware clock is in.
-
- Acceptable values:
-
- localtime
- The hardware clock is set to local time (common for systems also running
- Windows.)
- UTC
- The hardware clock is set to UTC (common on UNIX systems.)
-
-
-OPTIONAL PARAMETERS
--------------------
-None.
-
-
-BOOLEAN PARAMETERS
-------------------
-None.
-
-
-EXAMPLES
---------
-
-.. code-block:: sh
-
- # Make the operating system treat the time read from the hwclock as UTC.
- __hwclock --mode UTC
-
-
-SEE ALSO
---------
-:strong:`hwclock`\ (8)
-
-
-AUTHORS
--------
-Dennis Camera
-
-
-COPYING
--------
-Copyright \(C) 2020 Dennis Camera. 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.
diff --git a/cdist/conf/type/__hwclock/manifest b/cdist/conf/type/__hwclock/manifest
deleted file mode 100755
index 7d9ab88f..00000000
--- a/cdist/conf/type/__hwclock/manifest
+++ /dev/null
@@ -1,222 +0,0 @@
-#!/bin/sh -e
-#
-# 2020 Dennis Camera (dennis.camera@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 .
-#
-
-# TODO: Consider supporting BADYEAR
-
-os=$(cat "${__global:?}/explorer/os")
-mode=$(cat "${__object:?}/parameter/mode")
-
-has_systemd_timedatectl=$(test -s "${__object:?}/explorer/timedatectl_localrtc" && echo true || echo false)
-
-
-case ${mode}
-in
- (localtime)
- local_clock=true
- ;;
- (UTC|utc)
- local_clock=false
- ;;
- (*)
- printf 'Invalid value for --mode: %s\n' "${mode}" >&2
- printf 'Acceptable values are: UTC, localtime.\n' >&2
- exit 1
-esac
-
-
-case ${os}
-in
- (alpine|gentoo)
- if ! $has_systemd_timedatectl
- then
- # NOTE: Gentoo also supports systemd, in which case /etc/conf.d is
- # not used. So we check for systemd presence here and only
- # update /etc/conf.d if systemd is not installed.
- # https://wiki.gentoo.org/wiki/System_time#Hardware_clock
-
- export CDIST_ORDER_DEPENDENCY=true
- __file /etc/conf.d/hwclock --state present \
- --owner root --group root --mode 0644
- __key_value /etc/conf.d/hwclock:clock \
- --file /etc/conf.d/hwclock \
- --key clock \
- --delimiter '=' --exact_delimiter \
- --value "\"$($local_clock && echo local || echo UTC)\""
- unset CDIST_ORDER_DEPENDENCY
- fi
- ;;
- (centos|fedora|redhat|scientific)
- os_version=$(cat "${__global:?}/explorer/os_version")
- os_major=$(expr "${os_version}" : '.* release \([0-9]*\)')
- case ${os}
- in
- (centos|scientific)
- update_sysconfig=$(test "${os_major}" -lt 6 && echo true || echo false)
- ;;
- (fedora)
- update_sysconfig=$(test "${os_major}" -lt 10 && echo true || echo false)
- ;;
- (redhat|*)
- case ${os_version}
- in
- ('Red Hat Enterprise Linux'*)
- update_sysconfig=$(test "${os_major}" -lt 6 && echo true || echo false)
- ;;
- ('Red Hat Linux'*)
- update_sysconfig=true
- ;;
- (*)
- printf 'Could not determine Red Hat distribution.\n' >&2
- printf "Please contribute an implementation for it if you can.\n" >&2
- exit 1
- ;;
- esac
- ;;
- esac
-
- if ${update_sysconfig:?}
- then
- export CDIST_ORDER_DEPENDENCY=true
- __file /etc/sysconfig/clock --state present \
- --owner root --group root --mode 0644
- __key_value /etc/sysconfig/clock:UTC \
- --file /etc/sysconfig/clock \
- --key UTC \
- --delimiter '=' --exact_delimiter \
- --value "$($local_clock && echo false || echo true)"
- unset CDIST_ORDER_DEPENDENCY
- fi
- ;;
- (debian|devuan|ubuntu)
- os_major=$(sed 's/[^0-9].*$//' "${__global:?}/explorer/os_version")
-
- case ${os}
- in
- (debian)
- if test "${os_major}" -ge 7
- then
- update_rcS=false
- elif test "${os_major}" -ge 3
- then
- update_rcS=true
- else
- # Debian 2.2 should be supportable using rcS.
- # Debian 2.1 uses the ancient GMT key.
- # Debian 1.3 does not have rcS.
- printf "Your operating system (Debian %s) is currently not supported by this type (%s)\n" \
- "$(cat "${__global:?}/explorer/os_version")" "${__type##*/}" >&2
- printf "Please contribute an implementation for it if you can.\n" >&2
- exit 1
- fi
- ;;
- (devuan)
- update_rcS=false
- ;;
- (ubuntu)
- update_rcS=$(test "${os_major}" -lt 16 && echo true || echo false)
- ;;
- esac
-
- if ${update_rcS}
- then
- export CDIST_ORDER_DEPENDENCY=true
- __file /etc/default/rcS --state present \
- --owner root --group root --mode 0644
- __key_value /etc/default/rcS:UTC \
- --file /etc/default/rcS \
- --key UTC \
- --delimiter '=' --exact_delimiter \
- --value "$($local_clock && echo no || echo yes)"
- unset CDIST_ORDER_DEPENDENCY
- fi
- ;;
- (freebsd)
- # cf. adjkerntz(8)
- __file /etc/wall_cmos_clock \
- --state "$($local_clock && echo present || echo absent)" \
- --owner root --group wheel --mode 0444
- ;;
- (netbsd)
- # https://wiki.netbsd.org/guide/boot/#index9h2
- __key_value /etc/rc.conf:rtclocaltime \
- --file /etc/rc.conf \
- --key rtclocaltime \
- --delimiter '=' --exact_delimiter \
- --value "$($local_clock && echo YES || echo NO)"
- ;;
- (slackware)
- __file /etc/hardwareclock --owner root --group root --mode 0644 \
- --source - <<-EOF
- # /etc/hardwareclock
- #
- # Tells how the hardware clock time is stored.
- # This file is managed by cdist.
-
- $($local_clock && echo localtime || echo UTC)
- EOF
- ;;
- (suse)
- if test -s "${__global:?}/explorer/os_release"
- then
- # shellcheck source=/dev/null
- os_version=$(. "${__global:?}/explorer/os_release" && echo "${VERSION}")
- else
- os_version=$(sed -n 's/^VERSION\ *=\ *//p' "${__global:?}/explorer/os_version")
- fi
- os_major=$(expr "${os_version}" : '\([0-9]\{1,\}\)')
-
- # TODO: Consider using `yast2 timezone set hwclock' instead
- if expr "${os_major}" \< 12
- then
- # Starting with SuSE 12 (first systemd-based version)
- # /etc/sysconfig/clock does not contain the HWCLOCK line
- # anymore.
- # With SuSE 13, it has been reduced to TIMEZONE configuration.
- __key_value /etc/sysconfig/clock:HWCLOCK \
- --file /etc/sysconfig/clock \
- --delimiter '=' --exact_delimiter \
- --key HWCLOCK \
- --value "$($local_clock && echo '"--localtime"' || echo '"-u"')"
- fi
- ;;
- (void)
- export CDIST_ORDER_DEPENDENCY=true
- __file /etc/rc.conf \
- --owner root --group root --mode 0644 \
- --state present
- __key_value /etc/rc.conf:HARDWARECLOCK \
- --file /etc/rc.conf \
- --delimiter '=' --exact_delimiter \
- --key HARDWARECLOCK \
- --value "\"$($local_clock && echo localtime || echo UTC)\""
- unset CDIST_ORDER_DEPENDENCY
- ;;
- (*)
- if ! $has_systemd_timedatectl
- then
- printf "Your operating system (%s) is currently not supported by this type (%s)\n" "$os" "${__type##*/}" >&2
- printf "Please contribute an implementation for it if you can.\n" >&2
- exit 1
- fi
- ;;
-esac
-
-# NOTE: timedatectl set-local-rtc for systemd is in gencode-remote
-# NOTE: /etc/adjtime is also updated in gencode-remote
diff --git a/cdist/conf/type/__hwclock/parameter/required b/cdist/conf/type/__hwclock/parameter/required
deleted file mode 100644
index 17ab372f..00000000
--- a/cdist/conf/type/__hwclock/parameter/required
+++ /dev/null
@@ -1 +0,0 @@
-mode
diff --git a/cdist/conf/type/__hwclock/singleton b/cdist/conf/type/__hwclock/singleton
deleted file mode 100644
index e69de29b..00000000
diff --git a/cdist/conf/type/__install_bootloader_grub/explorer/target_os b/cdist/conf/type/__install_bootloader_grub/explorer/target_os
deleted file mode 100755
index f235710a..00000000
--- a/cdist/conf/type/__install_bootloader_grub/explorer/target_os
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/bin/sh
-#
-# 2010-2011 Nico Schottelius (nico-cdist at schottelius.org)
-# 2014 Steven Armstrong (steven-cdist at armstrong.cc)
-#
-# This file is part of cdist.
-#
-# cdist is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# cdist is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with cdist. If not, see .
-#
-#
-# All os variables are lower case. Keep this file in alphabetical
-# order by os variable except in cases where order otherwise matters,
-# in which case keep the primary os and its derivatives together in
-# a block (see Debian and Redhat examples below).
-#
-
-chroot="$(cat "$__object/parameter/chroot")"
-
-if grep -q ^Amazon "$chroot/etc/system-release" 2>/dev/null; then
- echo amazon
- exit 0
-fi
-
-if [ -f "$chroot/etc/arch-release" ]; then
- echo archlinux
- exit 0
-fi
-
-if [ -f "$chroot/etc/cdist-preos" ]; then
- echo cdist-preos
- exit 0
-fi
-
-### Debian and derivatives
-if grep -q ^DISTRIB_ID=Ubuntu "$chroot/etc/lsb-release" 2>/dev/null; then
- echo ubuntu
- exit 0
-fi
-
-if [ -f "$chroot/etc/debian_version" ]; then
- echo debian
- exit 0
-fi
-###
-
-if [ -f "$chroot/etc/gentoo-release" ]; then
- echo gentoo
- exit 0
-fi
-
-if [ -f "$chroot/etc/openwrt_version" ]; then
- echo openwrt
- exit 0
-fi
-
-if [ -f "$chroot/etc/owl-release" ]; then
- echo owl
- exit 0
-fi
-
-### Redhat and derivatives
-if grep -q ^CentOS "$chroot/etc/redhat-release" 2>/dev/null; then
- echo centos
- exit 0
-fi
-
-if grep -q ^Fedora "$chroot/etc/redhat-release" 2>/dev/null; then
- echo fedora
- exit 0
-fi
-
-if [ -f "$chroot/etc/redhat-release" ]; then
- echo redhat
- exit 0
-fi
-###
-
-if [ -f "$chroot/etc/SuSE-release" ]; then
- echo suse
- exit 0
-fi
-
-if [ -f "$chroot/etc/slackware-version" ]; then
- echo slackware
- exit 0
-fi
-
-echo "Unknown OS" >&2
-exit 1
diff --git a/cdist/conf/type/__install_bootloader_grub/gencode-remote b/cdist/conf/type/__install_bootloader_grub/gencode-remote
index 1caebbbf..ed57331a 100755
--- a/cdist/conf/type/__install_bootloader_grub/gencode-remote
+++ b/cdist/conf/type/__install_bootloader_grub/gencode-remote
@@ -1,6 +1,6 @@
-#!/bin/sh -e
+#!/bin/sh
#
-# 2011-2015 Steven Armstrong (steven-cdist at armstrong.cc)
+# 2011 Steven Armstrong (steven-cdist at armstrong.cc)
#
# This file is part of cdist.
#
@@ -18,74 +18,51 @@
# along with cdist. If not, see .
#
-device="$(cat "$__object/parameter/device" 2>/dev/null || echo "/$__object_id")"
+device="$(cat "$__object/parameter/device")"
chroot="$(cat "$__object/parameter/chroot")"
-target_os=$(cat "$__object/explorer/target_os")
-
-mkdir "$__object/files"
-install_script="$__object/files/install_script"
-# Link file descriptor #6 with stdout
-exec 6>&1
-# Link stdout with $install_script
-exec > "$install_script"
-
-# Generate script to install bootloader on distro
-printf '#!/bin/sh -l\n'
-
-case "$target_os" in
- ubuntu|debian)
- if [ -s "$__global/explorer/efi" ]; then
- # FIXME: untested. maybe also just run update-grub for EFI system?
- printf 'grub-mkconfig --output=/boot/efi/EFI/%s/grub.cfg\n' "$target_os"
- printf 'mkdir -p /boot/efi/EFI/BOOT\n'
- printf 'cp /boot/efi/EFI/%s/grubx64.efi /boot/efi/EFI/BOOT/bootx64.efi' "$target_os"
- else
- printf 'grub-install "%s"\n' "$device"
- printf 'update-grub\n'
- fi
- ;;
- archlinux)
- if [ -s "$__global/explorer/efi" ]; then
- echo "EFI boot loader installation is on your operating system ($target_os) is currently not supported by this type (${__type##*/})." >&2
- echo "Please contribute an implementation for it if you can." >&2
- exit 1
- else
- printf 'grub-install "%s"\n' "$device"
- # bugfix/workarround: rebuild initramfs
- # FIXME: doesn't belong here
- printf 'mkinitcpio -p linux\n'
- printf 'grub-mkconfig -o /boot/grub/grub.cfg\n'
- fi
- ;;
- centos)
- if [ -s "$__global/explorer/efi" ]; then
- printf 'grub2-mkconfig --output=/boot/efi/EFI/%s/grub.cfg\n' "$target_os"
- printf 'mkdir -p /boot/efi/EFI/BOOT\n'
- printf 'cp /boot/efi/EFI/%s/grubx64.efi /boot/efi/EFI/BOOT/bootx64.efi' "$target_os"
- else
- printf 'grub2-install "%s"\n' "$device"
- printf 'grub2-mkconfig --output=/boot/grub2/grub.cfg\n'
- fi
- ;;
- *)
- echo "Your operating system ($target_os) is currently not supported by this type (${__type##*/})." >&2
- echo "If you can, please contribute an implementation for it." >&2
- exit 1
- ;;
-esac
-# Restore stdout and close file descriptor #6.
-exec 1>&6 6>&-
-
cat << DONE
+os=\$(
+if grep -q ^DISTRIB_ID=Ubuntu ${chroot}/etc/lsb-release 2>/dev/null; then
+ echo ubuntu
+ exit 0
+fi
+
+if [ -f ${chroot}/etc/arch-release ]; then
+ echo archlinux
+ exit 0
+fi
+
+if [ -f ${chroot}/etc/debian_version ]; then
+ echo debian
+ exit 0
+fi
+)
+
# Ensure /tmp exists
[ -d "${chroot}/tmp" ] || mkdir -m 1777 "${chroot}/tmp"
# Generate script to run in chroot
-script=\$(mktemp "${chroot}/tmp/${__type##*/}.XXXXXXXXXX")
-cat > \$script << script_DONE
-$(cat "$install_script")
-script_DONE
+script=\$(mktemp "${chroot}/tmp/__install_bootloader_grub.XXXXXXXXXX")
+# Link file descriptor #6 with stdout
+exec 6>&1
+# Link stdout with \$script
+exec > \$script
+
+echo "#!/bin/sh -l"
+echo "grub-install $device"
+case \$os in
+ archlinux)
+ # bugfix/workarround: rebuild initramfs
+ # FIXME: doesn't belong here
+ echo "mkinitcpio -p linux"
+ echo "grub-mkconfig -o /boot/grub/grub.cfg"
+ ;;
+ ubuntu|debian) echo "update-grub" ;;
+esac
+
+# Restore stdout and close file descriptor #6.
+exec 1>&6 6>&-
# Make script executable
chmod +x "\$script"
@@ -93,5 +70,4 @@ chmod +x "\$script"
# Run script in chroot
relative_script="\${script#$chroot}"
chroot "$chroot" "\$relative_script"
-rm -rf \$script
DONE
diff --git a/cdist/conf/type/__install_bootloader_grub/man.rst b/cdist/conf/type/__install_bootloader_grub/man.text
similarity index 55%
rename from cdist/conf/type/__install_bootloader_grub/man.rst
rename to cdist/conf/type/__install_bootloader_grub/man.text
index 625db1d2..858e6a67 100644
--- a/cdist/conf/type/__install_bootloader_grub/man.rst
+++ b/cdist/conf/type/__install_bootloader_grub/man.text
@@ -1,5 +1,7 @@
cdist-type__install_bootloader_grub(7)
======================================
+Steven Armstrong
+
NAME
----
@@ -13,36 +15,33 @@ This cdist type allows you to install grub2 bootloader on given disk.
REQUIRED PARAMETERS
-------------------
-None
+None.
OPTIONAL PARAMETERS
-------------------
-device
+device::
The device to install grub to. Defaults to object_id
-chroot
+chroot::
where to chroot before running grub-install. Defaults to /target.
EXAMPLES
--------
-.. code-block:: sh
-
- __install_bootloader_grub /dev/sda
-
- __install_bootloader_grub /dev/sda --chroot /mnt/foobar
+--------------------------------------------------------------------------------
+__install_bootloader_grub /dev/sda
+__install_bootloader_grub /dev/sda --chroot /mnt/foobar
+--------------------------------------------------------------------------------
-AUTHORS
--------
-Steven Armstrong
+SEE ALSO
+--------
+- cdist-type(7)
COPYING
-------
-Copyright \(C) 2011 Steven Armstrong. You can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
+Copyright \(C) 2011 Steven Armstrong. Free use of this software is
+granted under the terms of the GNU General Public License version 3 (GPLv3).
diff --git a/cdist/test/autil/fixtures/explorer/lsb_id b/cdist/conf/type/__install_bootloader_grub/manifest
similarity index 74%
rename from cdist/test/autil/fixtures/explorer/lsb_id
rename to cdist/conf/type/__install_bootloader_grub/manifest
index 9754eb63..4c7c4955 100755
--- a/cdist/test/autil/fixtures/explorer/lsb_id
+++ b/cdist/conf/type/__install_bootloader_grub/manifest
@@ -17,17 +17,9 @@
# You should have received a copy of the GNU General Public License
# along with cdist. If not, see .
#
-#
-set +e
-case "$($__explorer/os)" in
- openwrt)
- (. /etc/openwrt_release && echo "$DISTRIB_ID")
- ;;
- *)
- lsb_release=$(command -v lsb_release)
- if [ -x "$lsb_release" ]; then
- $lsb_release --short --id
- fi
- ;;
-esac
+# set defaults
+device="$(cat "$__object/parameter/device" 2>/dev/null \
+ || echo "/$__object_id" | tee "$__object/parameter/device")"
+chroot="$(cat "$__object/parameter/chroot" 2>/dev/null \
+ || echo "/target" | tee "$__object/parameter/chroot")"
diff --git a/cdist/conf/type/__install_bootloader_grub/parameter/default/chroot b/cdist/conf/type/__install_bootloader_grub/parameter/default/chroot
deleted file mode 100644
index ea8c4bf7..00000000
--- a/cdist/conf/type/__install_bootloader_grub/parameter/default/chroot
+++ /dev/null
@@ -1 +0,0 @@
-/target
diff --git a/cdist/conf/type/__install_chroot_mount/gencode-local b/cdist/conf/type/__install_chroot_mount/gencode-local
deleted file mode 120000
index 68dcbd6a..00000000
--- a/cdist/conf/type/__install_chroot_mount/gencode-local
+++ /dev/null
@@ -1 +0,0 @@
-../__chroot_mount/gencode-local
\ No newline at end of file
diff --git a/cdist/conf/type/__install_chroot_mount/man.rst b/cdist/conf/type/__install_chroot_mount/man.rst
deleted file mode 100644
index 4054c4c4..00000000
--- a/cdist/conf/type/__install_chroot_mount/man.rst
+++ /dev/null
@@ -1,42 +0,0 @@
-cdist-type__install_chroot_mount(7)
-===================================
-
-NAME
-----
-cdist-type__install_chroot_mount - mount a chroot with install command
-
-
-DESCRIPTION
------------
-Mount and prepare a chroot for running commands within it.
-
-
-REQUIRED PARAMETERS
--------------------
-None
-
-
-OPTIONAL PARAMETERS
--------------------
-None
-
-
-EXAMPLES
---------
-
-.. code-block:: sh
-
- __install_chroot_mount /path/to/chroot
-
-
-AUTHORS
--------
-Steven Armstrong
-
-
-COPYING
--------
-Copyright \(C) 2012 Steven Armstrong. You can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
diff --git a/cdist/conf/type/__install_chroot_mount/man.text b/cdist/conf/type/__install_chroot_mount/man.text
new file mode 120000
index 00000000..e131fceb
--- /dev/null
+++ b/cdist/conf/type/__install_chroot_mount/man.text
@@ -0,0 +1 @@
+../__chroot_mount/man.text
\ No newline at end of file
diff --git a/cdist/conf/type/__install_chroot_mount/parameter b/cdist/conf/type/__install_chroot_mount/parameter
deleted file mode 120000
index 5b5c9e20..00000000
--- a/cdist/conf/type/__install_chroot_mount/parameter
+++ /dev/null
@@ -1 +0,0 @@
-../__chroot_mount/parameter
\ No newline at end of file
diff --git a/cdist/conf/type/__install_chroot_umount/man.rst b/cdist/conf/type/__install_chroot_umount/man.rst
deleted file mode 100644
index 2e020c01..00000000
--- a/cdist/conf/type/__install_chroot_umount/man.rst
+++ /dev/null
@@ -1,47 +0,0 @@
-cdist-type__install_chroot_umount(7)
-====================================
-
-NAME
-----
-cdist-type__install_chroot_umount - unmount a chroot mounted by __install_chroot_mount
-
-
-DESCRIPTION
------------
-Undo what __install_chroot_mount did.
-
-
-REQUIRED PARAMETERS
--------------------
-None
-
-
-OPTIONAL PARAMETERS
--------------------
-None
-
-
-EXAMPLES
---------
-
-.. code-block:: sh
-
- __install_chroot_umount /path/to/chroot
-
-
-SEE ALSO
---------
-:strong:`cdist-type__install_chroot_mount`\ (7)
-
-
-AUTHORS
--------
-Steven Armstrong
-
-
-COPYING
--------
-Copyright \(C) 2012 Steven Armstrong. You can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
diff --git a/cdist/conf/type/__install_chroot_umount/man.text b/cdist/conf/type/__install_chroot_umount/man.text
new file mode 120000
index 00000000..f615c734
--- /dev/null
+++ b/cdist/conf/type/__install_chroot_umount/man.text
@@ -0,0 +1 @@
+../__chroot_umount/man.text
\ No newline at end of file
diff --git a/cdist/conf/type/__install_chroot_umount/manifest b/cdist/conf/type/__install_chroot_umount/manifest
deleted file mode 120000
index f17af67a..00000000
--- a/cdist/conf/type/__install_chroot_umount/manifest
+++ /dev/null
@@ -1 +0,0 @@
-../__chroot_umount/manifest
\ No newline at end of file
diff --git a/cdist/conf/type/__install_chroot_umount/parameter b/cdist/conf/type/__install_chroot_umount/parameter
deleted file mode 120000
index 4148bcd0..00000000
--- a/cdist/conf/type/__install_chroot_umount/parameter
+++ /dev/null
@@ -1 +0,0 @@
-../__chroot_umount/parameter
\ No newline at end of file
diff --git a/cdist/conf/type/__install_config/files/remote/copy b/cdist/conf/type/__install_config/files/remote/copy
index fa7fa9b7..5b6f555c 100755
--- a/cdist/conf/type/__install_config/files/remote/copy
+++ b/cdist/conf/type/__install_config/files/remote/copy
@@ -1,6 +1,6 @@
-#!/bin/sh -e
+#!/bin/sh
#
-# 2011-2017 Steven Armstrong (steven-cdist at armstrong.cc)
+# 2011 Steven Armstrong (steven-cdist at armstrong.cc)
#
# This file is part of cdist.
#
@@ -25,24 +25,24 @@
#
log() {
- #echo "$@" | logger -t "__install_config copy"
+ echo "$@" | logger -t "__install_config copy"
:
}
chroot="$1"; shift
target_host="$__target_host"
+scp="scp -o User=root -q"
+
# postfix target_host with chroot location
code="$(echo "$@" | sed "s|$target_host:|$target_host:$chroot|g")"
log "target_host: $target_host"
log "chroot: $chroot"
-log "@: $*"
+log "@: $@"
log "code: $code"
# copy files into chroot
-# __default_remote_copy and code should be split
-# shellcheck disable=SC2086
-$__default_remote_copy $code
+$scp $code
log "-----"
diff --git a/cdist/conf/type/__install_config/files/remote/exec b/cdist/conf/type/__install_config/files/remote/exec
index c2057ebf..58e6b162 100755
--- a/cdist/conf/type/__install_config/files/remote/exec
+++ b/cdist/conf/type/__install_config/files/remote/exec
@@ -1,6 +1,6 @@
-#!/bin/sh -e
+#!/bin/sh
#
-# 2011-2017 Steven Armstrong (steven-cdist at armstrong.cc)
+# 2011-2013 Steven Armstrong (steven-cdist at armstrong.cc)
#
# This file is part of cdist.
#
@@ -25,7 +25,7 @@
#
log() {
- #echo "$@" | logger -t "__install_config exec"
+ echo "$@" | logger -t "__install_config exec"
:
}
@@ -34,19 +34,15 @@ target_host="$__target_host"
# In exec mode the first argument is the __target_host which we already got from env. Get rid of it.
shift
-# escape ' with '"'"'
-code="$(echo "$@" | sed -e "s/'/'\"'\"'/g")"
-# shellcheck disable=SC2089
-code="chroot $chroot sh -e -c '$code'"
+ssh="ssh -o User=root -q $target_host"
+code="$ssh chroot $chroot sh -c '$@'"
log "target_host: $target_host"
log "chroot: $chroot"
-log "@: $*"
+log "@: $@"
log "code: $code"
# Run the code
-# __default_remote_exec and code should be split
-# shellcheck disable=SC2086,SC2090
-$__default_remote_exec "$target_host" $code
+$code
log "-----"
diff --git a/cdist/conf/type/__install_config/gencode-local b/cdist/conf/type/__install_config/gencode-local
index dd4f2a78..674dec25 100755
--- a/cdist/conf/type/__install_config/gencode-local
+++ b/cdist/conf/type/__install_config/gencode-local
@@ -1,6 +1,6 @@
-#!/bin/sh -e
+#!/bin/sh
#
-# 2011-2018 Steven Armstrong (steven-cdist at armstrong.cc)
+# 2011 Steven Armstrong (steven-cdist at armstrong.cc)
#
# This file is part of cdist.
#
@@ -22,14 +22,29 @@ chroot="$(cat "$__object/parameter/chroot")"
remote_exec="$__type/files/remote/exec"
remote_copy="$__type/files/remote/copy"
+cdist_args="-v"
+[ "$__debug" = "yes" ] && cdist_args="$cdist_args -d"
+
cat << DONE
-export __cdist_install_config=yes
-export __cdist_log_level=$__cdist_log_level
-export __default_remote_exec="$__remote_exec"
-export __default_remote_copy="$__remote_copy"
-cdist config \
+#echo "__apt_noautostart --state present" \
+# | cdist $cdist_args \
+# config \
+# --initial-manifest - \
+# --remote-exec="$remote_exec $chroot" \
+# --remote-copy="$remote_copy $chroot" \
+# $__target_host
+
+cdist $cdist_args \
+ config \
--remote-exec="$remote_exec $chroot" \
--remote-copy="$remote_copy $chroot" \
$__target_host
-DONE
+#echo "__apt_noautostart --state absent" \
+# | cdist $cdist_args \
+# config \
+# --initial-manifest - \
+# --remote-exec="$remote_exec $chroot" \
+# --remote-copy="$remote_copy $chroot" \
+# $__target_host
+DONE
diff --git a/cdist/conf/type/__install_config/man.rst b/cdist/conf/type/__install_config/man.text
similarity index 60%
rename from cdist/conf/type/__install_config/man.rst
rename to cdist/conf/type/__install_config/man.text
index 0034e85d..def0439b 100644
--- a/cdist/conf/type/__install_config/man.rst
+++ b/cdist/conf/type/__install_config/man.text
@@ -1,5 +1,7 @@
cdist-type__install_config(7)
=============================
+Steven Armstrong
+
NAME
----
@@ -15,33 +17,31 @@ cdist config against the /target chroot on the remote host.
REQUIRED PARAMETERS
-------------------
-None
+None.
OPTIONAL PARAMETERS
-------------------
-chroot
+chroot::
where to chroot before running grub-install. Defaults to /target.
EXAMPLES
--------
-.. code-block:: sh
+--------------------------------------------------------------------------------
+__install_config
- __install_config
-
- __install_config --chroot /mnt/somewhere
+__install_config --chroot /mnt/somewhere
+--------------------------------------------------------------------------------
-AUTHORS
--------
-Steven Armstrong
+SEE ALSO
+--------
+- cdist-type(7)
COPYING
-------
-Copyright \(C) 2011 Steven Armstrong. You can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
+Copyright \(C) 2011 Steven Armstrong. Free use of this software is
+granted under the terms of the GNU General Public License version 3 (GPLv3).
diff --git a/cdist/conf/type/__systemd_unit/explorer/unit-status b/cdist/conf/type/__install_config/manifest
old mode 100644
new mode 100755
similarity index 78%
rename from cdist/conf/type/__systemd_unit/explorer/unit-status
rename to cdist/conf/type/__install_config/manifest
index b68e5169..f26297b4
--- a/cdist/conf/type/__systemd_unit/explorer/unit-status
+++ b/cdist/conf/type/__install_config/manifest
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# 2017 Ľubomír Kučera
+# 2011 Steven Armstrong (steven-cdist at armstrong.cc)
#
# This file is part of cdist.
#
@@ -18,4 +18,6 @@
# along with cdist. If not, see .
#
-systemctl is-active "${__object_id}" || true
+# set defaults
+chroot="$(cat "$__object/parameter/chroot" 2>/dev/null \
+ || echo "/target" | tee "$__object/parameter/chroot")"
diff --git a/cdist/conf/type/__install_config/parameter/default/chroot b/cdist/conf/type/__install_config/parameter/default/chroot
deleted file mode 100644
index ea8c4bf7..00000000
--- a/cdist/conf/type/__install_config/parameter/default/chroot
+++ /dev/null
@@ -1 +0,0 @@
-/target
diff --git a/cdist/conf/type/__install_coreos/gencode-remote b/cdist/conf/type/__install_coreos/gencode-remote
deleted file mode 100755
index f550b5a5..00000000
--- a/cdist/conf/type/__install_coreos/gencode-remote
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh -e
-
-device=$(cat "${__object:?}/parameter/device")
-ignition=$(cat "${__object}/parameter/ignition")
-
-cat < "\${ignition_file}" << eof
-$(base64 "${ignition}")
-eof
-
-coreos-install -d "${device}" \
- \$(if [ -s "\${ignition_file}" ]; then
- printf -- "-i \${ignition_file}\\n"
- fi)
-
-rm "\${ignition_file}"
-EOF
diff --git a/cdist/conf/type/__install_coreos/install b/cdist/conf/type/__install_coreos/install
deleted file mode 100644
index e69de29b..00000000
diff --git a/cdist/conf/type/__install_coreos/man.rst b/cdist/conf/type/__install_coreos/man.rst
deleted file mode 100644
index 314f9f2a..00000000
--- a/cdist/conf/type/__install_coreos/man.rst
+++ /dev/null
@@ -1,50 +0,0 @@
-cdist-type__install_coreos(7)
-=============================
-
-NAME
-----
-
-cdist-type__install_coreos - Install CoreOS
-
-DESCRIPTION
------------
-
-This type installs CoreOS to a given device using coreos-install_, which is
-present in CoreOS ISO by default.
-
-.. _coreos-install: https://raw.githubusercontent.com/coreos/init/master/bin/coreos-install
-
-REQUIRED PARAMETERS
--------------------
-
-device
- A device CoreOS will be installed to.
-
-OPTIONAL PARAMETERS
--------------------
-
-ignition
- Path to ignition config.
-
-EXAMPLES
---------
-
-.. code-block:: sh
-
- __install_coreos \
- --device /dev/sda \
- --ignition ignition.json
-
-
-AUTHORS
--------
-
-Ľubomír Kučera
-
-COPYING
--------
-
-Copyright \(C) 2018 Ľubomír Kučera. 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.
diff --git a/cdist/conf/type/__install_coreos/parameter/default/ignition b/cdist/conf/type/__install_coreos/parameter/default/ignition
deleted file mode 100644
index e69de29b..00000000
diff --git a/cdist/conf/type/__install_coreos/parameter/optional b/cdist/conf/type/__install_coreos/parameter/optional
deleted file mode 100644
index df284caa..00000000
--- a/cdist/conf/type/__install_coreos/parameter/optional
+++ /dev/null
@@ -1 +0,0 @@
-ignition
diff --git a/cdist/conf/type/__install_coreos/parameter/required b/cdist/conf/type/__install_coreos/parameter/required
deleted file mode 100644
index f89ee6a8..00000000
--- a/cdist/conf/type/__install_coreos/parameter/required
+++ /dev/null
@@ -1 +0,0 @@
-device
diff --git a/cdist/conf/type/__install_coreos/singleton b/cdist/conf/type/__install_coreos/singleton
deleted file mode 100644
index e69de29b..00000000
diff --git a/cdist/conf/type/__install_directory/explorer b/cdist/conf/type/__install_directory/explorer
deleted file mode 120000
index ba2591e1..00000000
--- a/cdist/conf/type/__install_directory/explorer
+++ /dev/null
@@ -1 +0,0 @@
-../__directory/explorer
\ No newline at end of file
diff --git a/cdist/conf/type/__install_directory/gencode-remote b/cdist/conf/type/__install_directory/gencode-remote
deleted file mode 120000
index c86d61c9..00000000
--- a/cdist/conf/type/__install_directory/gencode-remote
+++ /dev/null
@@ -1 +0,0 @@
-../__directory/gencode-remote
\ No newline at end of file
diff --git a/cdist/conf/type/__install_directory/install b/cdist/conf/type/__install_directory/install
deleted file mode 100644
index e69de29b..00000000
diff --git a/cdist/conf/type/__install_directory/man.rst b/cdist/conf/type/__install_directory/man.rst
deleted file mode 100644
index c402cbad..00000000
--- a/cdist/conf/type/__install_directory/man.rst
+++ /dev/null
@@ -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
- Changed group membership
-chown
- Changed owner
-chmod
- 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
-
-
-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.
diff --git a/cdist/conf/type/__install_directory/parameter b/cdist/conf/type/__install_directory/parameter
deleted file mode 120000
index e23d9672..00000000
--- a/cdist/conf/type/__install_directory/parameter
+++ /dev/null
@@ -1 +0,0 @@
-../__directory/parameter
\ No newline at end of file
diff --git a/cdist/conf/type/__install_file/man.rst b/cdist/conf/type/__install_file/man.rst
deleted file mode 100644
index 977ed77c..00000000
--- a/cdist/conf/type/__install_file/man.rst
+++ /dev/null
@@ -1,124 +0,0 @@
-cdist-type__install_file(7)
-===========================
-
-NAME
-----
-cdist-type__install_file - Manage files with install command.
-
-
-DESCRIPTION
------------
-This cdist type allows you to create files, remove files and set file
-attributes on the target.
-
-If the file already exists on the target, then if it is a:
-
-regular file, and state is:
- present
- replace it with the source file if they are not equal
- exists
- do nothing
-symlink
- replace it with the source file
-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.
-
-
-REQUIRED PARAMETERS
--------------------
-None.
-
-OPTIONAL PARAMETERS
--------------------
-state
- 'present', 'absent', 'exists' or 'pre-exists', defaults to 'present' where:
-
- present
- the file is exactly the one from source
- absent
- 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.
-
-mode
- Unix permissions, suitable for chmod.
-
-owner
- User to chown to.
-
-source
- If supplied, copy this file from the host running cdist to the target.
- 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
- Changed group membership
-chown
- Changed owner
-chmod
- Changed mode
-create
- Empty file was created (no --source specified)
-remove
- File exists, but state is absent, file will be removed by generated code.
-upload
- File was uploaded
-
-
-EXAMPLES
---------
-
-.. code-block:: sh
-
- # Create /etc/cdist-configured as an empty file
- __install_file /etc/cdist-configured
- # The same thing
- __install_file /etc/cdist-configured --state present
- # Use __file from another type
- __install_file /etc/issue --source "$__type/files/archlinux" --state present
- # Delete existing file
- __install_file /etc/cdist-configured --state absent
- # Supply some more settings
- __install_file /etc/shadow --source "$__type/files/shadow" \
- --owner root --group shadow --mode 0640 \
- --state present
- # Provide a default file, but let the user change it
- __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
- DONE
-
-
-AUTHORS
--------
-Nico Schottelius
-
-
-COPYING
--------
-Copyright \(C) 2011-2013 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.
diff --git a/cdist/conf/type/__install_file/man.text b/cdist/conf/type/__install_file/man.text
new file mode 120000
index 00000000..ba483161
--- /dev/null
+++ b/cdist/conf/type/__install_file/man.text
@@ -0,0 +1 @@
+../__file/man.text
\ No newline at end of file
diff --git a/cdist/conf/type/__install_fstab/man.rst b/cdist/conf/type/__install_fstab/man.text
similarity index 54%
rename from cdist/conf/type/__install_fstab/man.rst
rename to cdist/conf/type/__install_fstab/man.text
index 5562c139..7c509427 100644
--- a/cdist/conf/type/__install_fstab/man.rst
+++ b/cdist/conf/type/__install_fstab/man.text
@@ -1,5 +1,7 @@
cdist-type__install_fstab(7)
============================
+Steven Armstrong
+
NAME
----
@@ -14,12 +16,12 @@ to the target machine at ${prefix}/etc/fstab.
REQUIRED PARAMETERS
-------------------
-None
+None.
OPTIONAL PARAMETERS
-------------------
-prefix
+prefix::
The prefix under which to generate the /etc/fstab file.
Defaults to /target.
@@ -27,27 +29,20 @@ prefix
EXAMPLES
--------
-.. code-block:: sh
-
- __install_fstab
-
- __install_fstab --prefix /mnt/target
+--------------------------------------------------------------------------------
+__install_fstab
+__install_fstab --prefix /mnt/target
+--------------------------------------------------------------------------------
SEE ALSO
--------
-:strong:`cdist-type__install_generate_fstab`\ (7),
-:strong:`cdist-type__install_mount`\ (7)
-
-
-AUTHORS
--------
-Steven Armstrong
+- cdist-type(7)
+- cdist-type__install_mount(7)
+- cdist-type__install_generate_fstab(7)
COPYING
-------
-Copyright \(C) 2011 Steven Armstrong. You can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
+Copyright \(C) 2011 Steven Armstrong. Free use of this software is
+granted under the terms of the GNU General Public License version 3 (GPLv3).
diff --git a/cdist/conf/type/__install_fstab/manifest b/cdist/conf/type/__install_fstab/manifest
index c5d24f3c..74af53c0 100755
--- a/cdist/conf/type/__install_fstab/manifest
+++ b/cdist/conf/type/__install_fstab/manifest
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/sh
#
# 2011 Steven Armstrong (steven-cdist at armstrong.cc)
#
diff --git a/cdist/conf/type/__install_generate_fstab/gencode-local b/cdist/conf/type/__install_generate_fstab/gencode-local
index 80455aaa..d10e5b92 100755
--- a/cdist/conf/type/__install_generate_fstab/gencode-local
+++ b/cdist/conf/type/__install_generate_fstab/gencode-local
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/sh
#
# 2011 Steven Armstrong (steven-cdist at armstrong.cc)
#
@@ -23,13 +23,12 @@ cat "$__type/files/fstab.header" > "$destination"
mkdir "$__object/files"
# get current UUID's from target_host
-$__remote_exec "$__target_host" blkid > "$__object/files/blkid"
+$__remote_exec $__target_host blkid > "$__object/files/blkid"
-find "$__global/object/__install_mount" -type d -name "$__cdist_object_marker" |
-while IFS= read -r object
-do
+for object in $(find "$__global/object/__install_mount" -path "*.cdist"); do
device="$(cat "$object/parameter/device")"
dir="$(cat "$object/parameter/dir")"
+ prefix="$(cat "$object/parameter/prefix")"
type="$(cat "$object/parameter/type")"
if [ -f "$object/parameter/options" ]; then
options="$(cat "$object/parameter/options")"
@@ -45,17 +44,12 @@ do
tmpfs)
pass=0
;;
- bind)
- pass=0
- type=none
- options="bind,$options"
- ;;
*)
pass=1
;;
esac
if [ -f "$__object/parameter/uuid" ]; then
- uuid="$(grep -w "$device" "$__object/files/blkid" | awk '{print $2}')"
+ uuid="$(grep -w $device "$__object/files/blkid" | awk '{print $2}')"
if [ -n "$uuid" ]; then
echo "# $dir was on $device during installation" >> "$destination"
device="$uuid"
diff --git a/cdist/conf/type/__install_generate_fstab/man.rst b/cdist/conf/type/__install_generate_fstab/man.text
similarity index 57%
rename from cdist/conf/type/__install_generate_fstab/man.rst
rename to cdist/conf/type/__install_generate_fstab/man.text
index b38f8876..d229f4df 100644
--- a/cdist/conf/type/__install_generate_fstab/man.rst
+++ b/cdist/conf/type/__install_generate_fstab/man.text
@@ -1,5 +1,7 @@
cdist-type__install_generate_fstab(7)
=====================================
+Steven Armstrong
+
NAME
----
@@ -14,40 +16,37 @@ __install_mount definitions.
REQUIRED PARAMETERS
-------------------
-destination
+destination::
The path where to store the generated fstab file.
Note that this is a path on the server, where cdist is running, not the target host.
OPTIONAL PARAMETERS
-------------------
-None
+None.
BOOLEAN PARAMETERS
-------------------
-uuid
+uuid::
use UUID instead of device in fstab
EXAMPLES
--------
-.. code-block:: sh
-
- __install_generate_fstab --destination /path/where/you/want/fstab
-
- __install_generate_fstab --uuid --destination /path/where/you/want/fstab
+--------------------------------------------------------------------------------
+__install_generate_fstab --destination /path/where/you/want/fstab
+__install_generate_fstab --uuid --destination /path/where/you/want/fstab
+--------------------------------------------------------------------------------
-AUTHORS
--------
-Steven Armstrong
+SEE ALSO
+--------
+- cdist-type(7)
COPYING
-------
-Copyright \(C) 2012 Steven Armstrong. You can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
+Copyright \(C) 2012 Steven Armstrong. Free use of this software is
+granted under the terms of the GNU General Public License version 3 (GPLv3).
diff --git a/cdist/conf/type/__install_mkfs/gencode-remote b/cdist/conf/type/__install_mkfs/gencode-remote
index 8fc2c98e..2fe680e5 100755
--- a/cdist/conf/type/__install_mkfs/gencode-remote
+++ b/cdist/conf/type/__install_mkfs/gencode-remote
@@ -1,7 +1,6 @@
-#!/bin/sh -e
+#!/bin/sh
#
# 2011-2013 Steven Armstrong (steven-cdist at armstrong.cc)
-# 2017 Nico Schottelius (nico-cdist at schottelius.org)
#
# This file is part of cdist.
#
@@ -23,31 +22,32 @@ device="$(cat "$__object/parameter/device")"
type="$(cat "$__object/parameter/type")"
case "$type" in
- swap)
- echo "mkswap -f $device"
- exit 0
- ;;
- xfs)
- command="mkfs.xfs -f -q"
- ;;
-
- vfat)
- command="mkfs.vfat"
- ;;
-
- *)
- command="mkfs -t $type -q"
- ;;
+ swap)
+ echo "mkswap $device"
+ ;;
+ xfs)
+ command="mkfs.xfs -f -q"
+ if [ -f "$__object/parameter/options" ]; then
+ options="$(cat "$__object/parameter/options")"
+ command="$command $options"
+ fi
+ command="$command $device"
+ if [ -f "$__object/parameter/blocks" ]; then
+ blocks="$(cat "$__object/parameter/blocks")"
+ command="$command $blocks"
+ fi
+ echo "$command"
+ ;;
+ *)
+ command="mkfs -t $type -q"
+ if [ -f "$__object/parameter/options" ]; then
+ options="$(cat "$__object/parameter/options")"
+ command="$command $options"
+ fi
+ command="$command $device"
+ if [ -f "$__object/parameter/blocks" ]; then
+ blocks="$(cat "$__object/parameter/blocks")"
+ command="$command $blocks"
+ fi
+ echo "$command"
esac
-
-if [ -f "$__object/parameter/options" ]; then
- options="$(cat "$__object/parameter/options")"
- command="$command $options"
-fi
-
-command="$command $device"
-if [ -f "$__object/parameter/blocks" ]; then
- blocks="$(cat "$__object/parameter/blocks")"
- command="$command $blocks"
-fi
-echo "$command"
diff --git a/cdist/conf/type/__install_mkfs/man.rst b/cdist/conf/type/__install_mkfs/man.rst
deleted file mode 100644
index 6e5c9aa9..00000000
--- a/cdist/conf/type/__install_mkfs/man.rst
+++ /dev/null
@@ -1,62 +0,0 @@
-cdist-type__install_mkfs(7)
-===========================
-
-NAME
-----
-cdist-type__install_mkfs - build a linux file system
-
-
-DESCRIPTION
------------
-This cdist type is a wrapper for the mkfs command.
-
-
-REQUIRED PARAMETERS
--------------------
-type
- The filesystem type to use. Same as used with mkfs -t.
-
-
-OPTIONAL PARAMETERS
--------------------
-device
- defaults to object_id
-
-options
- file system-specific options to be passed to the mkfs command
-
-blocks
- the number of blocks to be used for the file system
-
-
-EXAMPLES
---------
-
-.. code-block:: sh
-
- # reiserfs /dev/sda5
- __install_mkfs /dev/sda5 --type reiserfs
-
- # same thing with explicit device
- __install_mkfs whatever --device /dev/sda5 --type reiserfs
-
- # jfs with journal on /dev/sda2
- __install_mkfs /dev/sda1 --type jfs --options "-j /dev/sda2"
-
-
-SEE ALSO
---------
-:strong:`mkfs`\ (8)
-
-
-AUTHORS
--------
-Steven Armstrong
-
-
-COPYING
--------
-Copyright \(C) 2011 Steven Armstrong. You can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
diff --git a/cdist/conf/type/__install_mkfs/man.text b/cdist/conf/type/__install_mkfs/man.text
new file mode 100644
index 00000000..3a9a325d
--- /dev/null
+++ b/cdist/conf/type/__install_mkfs/man.text
@@ -0,0 +1,57 @@
+cdist-type__install_mkfs(7)
+===========================
+Steven Armstrong
+
+
+NAME
+----
+cdist-type__install_mkfs - build a linux file system
+
+
+DESCRIPTION
+-----------
+This cdist type is a wrapper for the mkfs command.
+
+
+REQUIRED PARAMETERS
+-------------------
+type::
+ The filesystem type to use. Same as used with mkfs -t.
+
+
+OPTIONAL PARAMETERS
+-------------------
+device::
+ defaults to object_id
+
+options::
+ file system-specific options to be passed to the mkfs command
+
+blocks::
+ the number of blocks to be used for the file system
+
+
+EXAMPLES
+--------
+
+--------------------------------------------------------------------------------
+# reiserfs /dev/sda5
+__install_mkfs /dev/sda5 --type reiserfs
+# same thing with explicit device
+__install_mkfs whatever --device /dev/sda5 --type reiserfs
+
+# jfs with journal on /dev/sda2
+__install_mkfs /dev/sda1 --type jfs --options "-j /dev/sda2"
+--------------------------------------------------------------------------------
+
+
+SEE ALSO
+--------
+- cdist-type(7)
+- mkfs(8)
+
+
+COPYING
+-------
+Copyright \(C) 2011 Steven Armstrong. Free use of this software is
+granted under the terms of the GNU General Public License version 3 (GPLv3).
diff --git a/cdist/conf/type/__install_mkfs/manifest b/cdist/conf/type/__install_mkfs/manifest
index b0a21dae..e9d275a4 100755
--- a/cdist/conf/type/__install_mkfs/manifest
+++ b/cdist/conf/type/__install_mkfs/manifest
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/sh
#
# 2011 Steven Armstrong (steven-cdist at armstrong.cc)
#
@@ -19,7 +19,13 @@
#
# set defaults
-if [ ! -f "$__object/parameter/device" ]; then
+if [ -f "$__object/parameter/device" ]; then
+ device="(cat "$__object/parameter/device")"
+else
device="/$__object_id"
echo "$device" > "$__object/parameter/device"
fi
+
+type="(cat "$__object/parameter/type")"
+
+options="(cat "$__object/parameter/options")"
diff --git a/cdist/conf/type/__install_mount/gencode-remote b/cdist/conf/type/__install_mount/gencode-remote
index 4415f0ff..3a35c139 100755
--- a/cdist/conf/type/__install_mount/gencode-remote
+++ b/cdist/conf/type/__install_mount/gencode-remote
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/sh
#
# 2011-2013 Steven Armstrong (steven-cdist at armstrong.cc)
#
@@ -20,9 +20,7 @@
get_type_from_mkfs() {
_device="$1"
- find "$__global/object/__install_mkfs" -type d -name "$__cdist_object_marker" |
- while IFS= read -r mkfs_object
- do
+ for mkfs_object in $(find "$__global/object/__install_mkfs" -path "*.cdist"); do
mkfs_device="$(cat "$mkfs_object/parameter/device")"
if [ "$_device" = "$mkfs_device" ]; then
cat "$mkfs_object/parameter/type"
@@ -44,25 +42,18 @@ else
# store for later use by others
echo "$type" > "$__object/parameter/type"
fi
-[ -n "$type" ] || {
- echo "Can't determine type for $__object" >&2
- exit 1
-}
+[ -n "$type" ] || die "Can't determine type for $__object"
if [ "$type" = "swap" ]; then
- printf 'swapon "%s"\n' "$device"
+ echo "swapon \"$device\""
else
- mount_point="${prefix}${dir}"
- printf '[ -d "%s" ] || mkdir -p "%s"\n' "$mount_point" "$mount_point"
- printf 'mount'
- if [ "$type" = "bind" ]; then
- printf ' --bind'
- device="${prefix}${device}"
- else
- printf ' -t "%s"' "$type"
- fi
if [ -f "$__object/parameter/options" ]; then
- printf ' -o %s' "$(cat "$__object/parameter/options")"
+ options="$(cat "$__object/parameter/options")"
+ else
+ options=""
fi
- printf ' "%s"' "$device"
- printf ' "%s"\n' "$mount_point"
+ [ -n "$options" ] && options="-o $options"
+ mount_point="${prefix}${dir}"
+
+ echo "[ -d \"$mount_point\" ] || mkdir -p \"$mount_point\""
+ echo "mount -t \"$type\" $options \"$device\" \"$mount_point\""
fi
diff --git a/cdist/conf/type/__install_mount/man.rst b/cdist/conf/type/__install_mount/man.text
similarity index 54%
rename from cdist/conf/type/__install_mount/man.rst
rename to cdist/conf/type/__install_mount/man.text
index 256cef53..b55cb83e 100644
--- a/cdist/conf/type/__install_mount/man.rst
+++ b/cdist/conf/type/__install_mount/man.text
@@ -1,5 +1,7 @@
cdist-type__install_mount(7)
============================
+Steven Armstrong
+
NAME
----
@@ -13,24 +15,24 @@ Mounts filesystems in the installer. Collects data to generate /etc/fstab.
REQUIRED PARAMETERS
-------------------
-device
+device::
the device to mount
OPTIONAL PARAMETERS
-------------------
-dir
+dir::
where to mount device. Defaults to object_id.
-options
+options::
mount options passed to mount(8) and used in /etc/fstab
-type
+type::
filesystem type passed to mount(8) and used in /etc/fstab.
If type is swap, 'dir' is ignored.
Defaults to the filesystem used in __install_mkfs for the same 'device'.
-prefix
+prefix::
the prefix to prepend to 'dir' when mounting in the installer.
Defaults to /target.
@@ -38,28 +40,22 @@ prefix
EXAMPLES
--------
-.. code-block:: sh
-
- __install_mount slash --dir / --device /dev/sda5 --options noatime
- require="__install_mount/slash" __install_mount /boot --device /dev/sda1
- __install_mount swap --device /dev/sda2 --type swap
- require="__install_mount/slash" __install_mount /tmp --device tmpfs --type tmpfs
+--------------------------------------------------------------------------------
+__install_mount slash --dir / --device /dev/sda5 --options noatime
+require="__install_mount/slash" __install_mount /boot --device /dev/sda1
+__install_mount swap --device /dev/sda2 --type swap
+require="__install_mount/slash" __install_mount /tmp --device tmpfs --type tmpfs
+--------------------------------------------------------------------------------
SEE ALSO
--------
-:strong:`cdist-type__install_mkfs`\ (7),
-:strong:`cdist-type__install_mount_apply` (7)
-
-
-AUTHORS
--------
-Steven Armstrong
+- cdist-type(7)
+- cdist-type__install_mount_apply(7)
+- cdist-type__install_mkfs(7)
COPYING
-------
-Copyright \(C) 2011 Steven Armstrong. You can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
+Copyright \(C) 2011 Steven Armstrong. Free use of this software is
+granted under the terms of the GNU General Public License version 3 (GPLv3).
diff --git a/cdist/conf/type/__install_mount/manifest b/cdist/conf/type/__install_mount/manifest
index 72fc26e2..5afae7fc 100755
--- a/cdist/conf/type/__install_mount/manifest
+++ b/cdist/conf/type/__install_mount/manifest
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/sh
#
# 2011 Steven Armstrong (steven-cdist at armstrong.cc)
#
diff --git a/cdist/conf/type/__install_partition_msdos/man.rst b/cdist/conf/type/__install_partition_msdos/man.rst
deleted file mode 100644
index c408a614..00000000
--- a/cdist/conf/type/__install_partition_msdos/man.rst
+++ /dev/null
@@ -1,72 +0,0 @@
-cdist-type__install_partition_msdos(7)
-======================================
-
-NAME
-----
-cdist-type__install_partition_msdos - creates msdos partitions
-
-
-DESCRIPTION
------------
-This cdist type allows you to create msdos paritions.
-
-
-REQUIRED PARAMETERS
--------------------
-type
- the partition type used in fdisk (such as 82 or 83) or "extended"
-
-
-OPTIONAL PARAMETERS
--------------------
-device
- the device we're working on. Defaults to the string prefix of --partition
-
-minor
- the partition number we're working on. Defaults to the numeric suffix of --partition
-
-partition
- defaults to object_id
-
-bootable
- mark partition as bootable, true or false, defaults to false
-
-size
- the size of the partition (such as 32M or 15G, whole numbers
- only), '+' for remaining space, or 'n%' for percentage of remaining
- (these should only be used after all specific partition sizes are
- specified). Defaults to +.
-
-
-EXAMPLES
---------
-
-.. code-block:: sh
-
- # 128MB, linux, bootable
- __install_partition_msdos /dev/sda1 --type 83 --size 128M --bootable true
- # 512MB, swap
- __install_partition_msdos /dev/sda2 --type 82 --size 512M
- # 100GB, extended
- __install_partition_msdos /dev/sda3 --type extended --size 100G
- # 10GB, linux
- __install_partition_msdos /dev/sda5 --type 83 --size 10G
- # 50% of the free space of the extended partition, linux
- __install_partition_msdos /dev/sda6 --type 83 --size 50%
- # rest of the extended partition, linux
- __install_partition_msdos /dev/sda7 --type 83 --size +
- # nvm device partition 2
- __install_partition_msdos /dev/nvme0n1p2 --device /dev/nvme0n1 --minor 2 --type 83 --size 128M --bootable true
-
-
-AUTHORS
--------
-Steven Armstrong
-
-
-COPYING
--------
-Copyright \(C) 2011-2017 Steven Armstrong. You can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
diff --git a/cdist/conf/type/__install_partition_msdos/man.text b/cdist/conf/type/__install_partition_msdos/man.text
new file mode 100644
index 00000000..82d81ac5
--- /dev/null
+++ b/cdist/conf/type/__install_partition_msdos/man.text
@@ -0,0 +1,62 @@
+cdist-type__install_partition_msdos(7)
+======================================
+Steven Armstrong
+
+
+NAME
+----
+cdist-type__install_partition_msdos - creates msdos partitions
+
+
+DESCRIPTION
+-----------
+This cdist type allows you to create msdos paritions.
+
+
+REQUIRED PARAMETERS
+-------------------
+type::
+ the partition type used in fdisk (such as 82 or 83) or "extended"
+
+
+OPTIONAL PARAMETERS
+-------------------
+partition::
+ defaults to object_id
+bootable::
+ mark partition as bootable, true or false, defaults to false
+size::
+ the size of the partition (such as 32M or 15G, whole numbers
+ only), '+' for remaining space, or 'n%' for percentage of remaining
+ (these should only be used after all specific partition sizes are
+ specified). Defaults to +.
+
+
+EXAMPLES
+--------
+
+--------------------------------------------------------------------------------
+# 128MB, linux, bootable
+__install_partition_msdos /dev/sda1 --type 83 --size 128M --bootable true
+# 512MB, swap
+__install_partition_msdos /dev/sda2 --type 82 --size 512M
+# 100GB, extended
+__install_partition_msdos /dev/sda3 --type extended --size 100G
+# 10GB, linux
+__install_partition_msdos /dev/sda5 --type 83 --size 10G
+# 50% of the free space of the extended partition, linux
+__install_partition_msdos /dev/sda6 --type 83 --size 50%
+# rest of the extended partition, linux
+__install_partition_msdos /dev/sda7 --type 83 --size +
+--------------------------------------------------------------------------------
+
+
+SEE ALSO
+--------
+- cdist-type(7)
+
+
+COPYING
+-------
+Copyright \(C) 2011 Steven Armstrong. Free use of this software is
+granted under the terms of the GNU General Public License version 3 (GPLv3).
diff --git a/cdist/conf/type/__install_partition_msdos/manifest b/cdist/conf/type/__install_partition_msdos/manifest
index b32605fa..e55d3f24 100755
--- a/cdist/conf/type/__install_partition_msdos/manifest
+++ b/cdist/conf/type/__install_partition_msdos/manifest
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/sh
#
# 2011 Steven Armstrong (steven-cdist at armstrong.cc)
#
@@ -25,15 +25,10 @@ else
partition="/$__object_id"
echo "$partition" > "$__object/parameter/partition"
fi
-
-if [ ! -f "$__object/parameter/device" ]; then
- device="$(echo "$partition" | sed 's/[0-9]//g')"
- echo "$device" > "$__object/parameter/device"
-fi
-if [ ! -f "$__object/parameter/minor" ]; then
- minor="$(echo "$partition" | sed 's/[^0-9]//g')"
- echo "$minor" > "$__object/parameter/minor"
-fi
+device="$(echo "$partition" | sed 's/[0-9]//g')"
+echo "$device" > "$__object/parameter/device"
+minor="$(echo "$partition" | sed 's/[^0-9]//g')"
+echo "$minor" > "$__object/parameter/minor"
if [ ! -f "$__object/parameter/bootable" ]; then
echo "false" > "$__object/parameter/bootable"
diff --git a/cdist/conf/type/__install_partition_msdos/parameter/optional b/cdist/conf/type/__install_partition_msdos/parameter/optional
index 3b3f2083..b2b0a4c2 100644
--- a/cdist/conf/type/__install_partition_msdos/parameter/optional
+++ b/cdist/conf/type/__install_partition_msdos/parameter/optional
@@ -1,5 +1,3 @@
-device
-minor
partition
bootable
size
diff --git a/cdist/conf/type/__install_partition_msdos_apply/files/lib.sh b/cdist/conf/type/__install_partition_msdos_apply/files/lib.sh
index 2db9a441..cddc575d 100644
--- a/cdist/conf/type/__install_partition_msdos_apply/files/lib.sh
+++ b/cdist/conf/type/__install_partition_msdos_apply/files/lib.sh
@@ -1,20 +1,18 @@
-#!/bin/sh
-
die() {
- echo "[__install_partition_msdos_apply] $*" >&2
+ echo "[__install_partition_msdos_apply] $@" >&2
exit 1
}
debug() {
- #echo "[__install_partition_msdos_apply] $*" >&2
+ #echo "[__install_partition_msdos_apply] $@" >&2
:
}
fdisk_command() {
- device="$1"
- cmd="$2"
+ local device="$1"
+ local cmd="$2"
debug fdisk_command "running fdisk command '${cmd}' on device ${device}"
- printf '%s\nw\n' "${cmd}" | fdisk -c -u "$device"
+ printf "${cmd}\nw\n" | fdisk -c -u "$device"
ret=$?
# give disk some time
sleep 1
@@ -22,49 +20,49 @@ fdisk_command() {
}
create_disklabel() {
- device=$1
+ local device=$1
debug create_disklabel "creating new msdos disklabel"
- fdisk_command "${device}" "o"
+ fdisk_command ${device} "o"
return $?
}
toggle_bootable() {
- device="$1"
- minor="$2"
- fdisk_command "${device}" "a\\n${minor}\\n"
+ local device="$1"
+ local minor="$2"
+ fdisk_command ${device} "a\n${minor}\n"
return $?
}
create_partition() {
- device="$1"
- minor="$2"
- size="$3"
- type="$4"
- primary_count="$5"
+ local device="$1"
+ local minor="$2"
+ local size="$3"
+ local type="$4"
+ local primary_count="$5"
- if [ "$type" = "extended" ] || [ "$type" = "5" ]; then
+ if [ "$type" = "extended" -o "$type" = "5" ]; then
# Extended partition
- primary_extended='e\n'
- first_minor="${minor}\\n"
+ primary_extended="e\n"
+ first_minor="${minor}\n"
[ "${minor}" = "4" ] && first_minor=""
- type_minor="${minor}\\n"
+ type_minor="${minor}\n"
[ "${minor}" = "1" ] && type_minor=""
type="5"
elif [ "${minor}" -lt "5" ]; then
- primary_extended='p\n'
- first_minor="${minor}\\n"
+ primary_extended="p\n"
+ first_minor="${minor}\n"
[ "${minor}" = "4" ] && first_minor=""
- type_minor="${minor}\\n"
+ type_minor="${minor}\n"
[ "${minor}" = "1" ] && type_minor=""
else
# Logical partitions
- first_minor="${minor}\\n"
- type_minor="${minor}\\n"
- primary_extended='l\n'
+ first_minor="${minor}\n"
+ type_minor="${minor}\n"
+ primary_extended="l\n"
[ "$primary_count" -gt "3" ] && primary_extended=""
fi
[ -n "${size}" ] && size="+${size}M"
- fdisk_command "${device}" "n\\n${primary_extended}${first_minor}\\n${size}\\nt\\n${type_minor}${type}\\n"
+ fdisk_command ${device} "n\n${primary_extended}${first_minor}\n${size}\nt\n${type_minor}${type}\n"
return $?
}
diff --git a/cdist/conf/type/__install_partition_msdos_apply/gencode-remote b/cdist/conf/type/__install_partition_msdos_apply/gencode-remote
index a0b46b2d..a1547296 100755
--- a/cdist/conf/type/__install_partition_msdos_apply/gencode-remote
+++ b/cdist/conf/type/__install_partition_msdos_apply/gencode-remote
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/sh
#
# 2011-2013 Steven Armstrong (steven-cdist at armstrong.cc)
#
@@ -18,38 +18,36 @@
# along with cdist. If not, see .
#
-#set -x
-
die() {
- echo "[__install_partition_msdos_apply] $*" >&2
+ echo "[__install_partition_msdos_apply] $@" >&2
exit 1
}
debug() {
- #echo "[__install_partition_msdos_apply] $*" >&2
+ #echo "[__install_partition_msdos_apply] $@" >&2
:
}
# Convert a size specifier 1G 100M or 50% into the corresponding numeric MB.
size_to_mb() {
- size=$1
- available_size="$2"
+ local size=$1
+ local available_size="$2"
- number_suffix="$(echo "${size}" | sed -e 's:\.[0-9]\+::' -e 's:\([0-9]\+\)\([KkMmGg%]\)[Bb]\?:\1|\2:')"
- number="$(echo "${number_suffix}" | cut -d '|' -f1)"
- suffix="$(echo "${number_suffix}" | cut -d '|' -f2)"
+ local number_suffix="$(echo ${size} | sed -e 's:\.[0-9]\+::' -e 's:\([0-9]\+\)\([KkMmGg%]\)[Bb]\?:\1|\2:')"
+ local number="$(echo ${number_suffix} | cut -d '|' -f1)"
+ local suffix="$(echo ${number_suffix} | cut -d '|' -f2)"
case "$suffix" in
K|k)
- size="$(( number / 1024 ))"
+ size="$(( $number / 1024 ))"
;;
M|m)
size="$number"
;;
G|g)
- size="$(( number * 1024 ))"
+ size="$(( $number * 1024 ))"
;;
%)
- size="$(( available_size * number / 100 ))"
+ size="$(( $available_size * $number / 100 ))"
;;
*)
size="-1"
@@ -59,15 +57,13 @@ size_to_mb() {
get_objects() {
objects_file=$(mktemp)
- find "$__global/object/__install_partition_msdos" -type d -name "$__cdist_object_marker" |
- while IFS= read -r object
- do
+ for object in $(find "$__global/object/__install_partition_msdos" -path "*.cdist"); do
object_device="$(cat "$object/parameter/device")"
object_minor="$(cat "$object/parameter/minor")"
- echo "$object_device $object_minor $object" >> "$objects_file"
+ echo "$object_device $object_minor $object" >> $objects_file
done
- sort -k 1,2 "$objects_file" | cut -d' ' -f 3
- rm "$objects_file"
+ sort -k 1,2 $objects_file | cut -d' ' -f 3
+ rm $objects_file
unset objects_file
unset object
unset object_device
@@ -87,9 +83,9 @@ primary_count=0
for object in $objects; do
device="$(cat "$object/parameter/device")"
if [ "$current_device" != "$device" ]; then
- echo "create_disklabel '$device' || die 'Failed to create disklabel for $device'"
+ echo "create_disklabel \"$device\" || die 'Failed to create disklabel for $device'"
current_device="$device"
- device_name=$(echo "${device}" | sed -e 's:^/dev/::;s:/:\\/:g')
+ device_name=$(echo ${device} | sed -e 's:^/dev/::;s:/:\\/:g')
available_device_size=$(( $(awk "/${device_name}\$/ { print \$3; }" "$partitions") / 1024))
# make sure we don't go past the end of the drive
available_device_size=$((available_device_size - 2))
@@ -110,7 +106,7 @@ for object in $objects; do
if [ "${minor}" -lt "5" ]; then
# Primary partitions
- primary_count=$(( primary_count + 1 ))
+ primary_count=$(( $primary_count + 1 ))
available_size=$available_device_size
else
# Logical partitions
@@ -123,13 +119,13 @@ for object in $objects; do
available_size=0
else
partition_size=$(size_to_mb "$size" "$available_size")
- available_size="$(( available_size - partition_size ))"
+ available_size="$(( $available_size - $partition_size ))"
fi
if [ "${minor}" -lt "5" ]; then
# Primary partitions
available_device_size=$available_size
- if [ "$type" = "extended" ] || [ "$type" = "5" ]; then
+ if [ "$type" = "extended" -o "$type" = "5" ]; then
# Extended partition
available_extended_size=$partition_size
fi
diff --git a/cdist/conf/type/__install_partition_msdos_apply/man.rst b/cdist/conf/type/__install_partition_msdos_apply/man.text
similarity index 52%
rename from cdist/conf/type/__install_partition_msdos_apply/man.rst
rename to cdist/conf/type/__install_partition_msdos_apply/man.text
index 80740fde..5399afb7 100644
--- a/cdist/conf/type/__install_partition_msdos_apply/man.rst
+++ b/cdist/conf/type/__install_partition_msdos_apply/man.text
@@ -1,5 +1,7 @@
cdist-type__install_partition_msdos_apply(7)
============================================
+Steven Armstrong
+
NAME
----
@@ -18,30 +20,23 @@ None
OPTIONAL PARAMETERS
-------------------
-None
+None.
EXAMPLES
--------
-.. code-block:: sh
-
- __install_partition_msdos_apply
+--------------------------------------------------------------------------------
+__install_partition_msdos_apply
+--------------------------------------------------------------------------------
SEE ALSO
--------
-:strong:`cdist-type__install_partition_msdos_apply`\ (7)
-
-
-AUTHORS
--------
-Steven Armstrong
-
+- cdist-type(7)
+- cdist-type__install_partition_msdos_apply(7)
COPYING
-------
-Copyright \(C) 2011 Steven Armstrong. You can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
+Copyright \(C) 2011 Steven Armstrong. Free use of this software is
+granted under the terms of the GNU General Public License version 3 (GPLv3).
diff --git a/cdist/conf/type/__install_reboot/gencode-remote b/cdist/conf/type/__install_reboot/gencode-remote
index 9a6322c1..4358347d 100755
--- a/cdist/conf/type/__install_reboot/gencode-remote
+++ b/cdist/conf/type/__install_reboot/gencode-remote
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/sh
#
# 2011 Steven Armstrong (steven-cdist at armstrong.cc)
#
@@ -18,13 +18,6 @@
# along with cdist. If not, see .
#
-#echo "reboot $options"
-cat << DONE
-echo 1 > /proc/sys/kernel/sysrq
-echo s > /proc/sysrq-trigger
+options="$(cat "$__object/parameter/options")"
-# close file descriptors to detach from ssh
-sh -c 'sleep 3; echo b > /proc/sysrq-trigger' > /dev/null 2>&1
-
-
-COPYING
--------
-Copyright \(C) 2011 Steven Armstrong. You can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
diff --git a/cdist/conf/type/__install_reboot/man.text b/cdist/conf/type/__install_reboot/man.text
new file mode 100644
index 00000000..91aec19a
--- /dev/null
+++ b/cdist/conf/type/__install_reboot/man.text
@@ -0,0 +1,43 @@
+cdist-type__install_reboot(7)
+=============================
+Steven Armstrong
+
+
+NAME
+----
+cdist-type__install_reboot - run reboot
+
+
+DESCRIPTION
+-----------
+This cdist type allows you to reboot a machine.
+
+
+REQUIRED PARAMETERS
+-------------------
+None.
+
+
+OPTIONAL PARAMETERS
+-------------------
+options::
+ options to pass to the reboot command. e.g. -f
+
+
+EXAMPLES
+--------
+
+--------------------------------------------------------------------------------
+__install_reboot
+--------------------------------------------------------------------------------
+
+
+SEE ALSO
+--------
+- cdist-type(7)
+
+
+COPYING
+-------
+Copyright \(C) 2011 Steven Armstrong. Free use of this software is
+granted under the terms of the GNU General Public License version 3 (GPLv3).
diff --git a/cdist/conf/type/__sysctl/explorer/conf-path b/cdist/conf/type/__install_reboot/manifest
similarity index 78%
rename from cdist/conf/type/__sysctl/explorer/conf-path
rename to cdist/conf/type/__install_reboot/manifest
index ba35c4c6..fab80a1e 100755
--- a/cdist/conf/type/__sysctl/explorer/conf-path
+++ b/cdist/conf/type/__install_reboot/manifest
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# 2018 Darko Poljak (darko.poljak at gmail.com)
+# 2011 Steven Armstrong (steven-cdist at armstrong.cc)
#
# This file is part of cdist.
#
@@ -18,8 +18,6 @@
# along with cdist. If not, see .
#
-if [ -d "/etc/sysctl.d" ]; then
- echo "/etc/sysctl.d/99-Z-sysctl-cdist.conf";
-else
- echo "/etc/sysctl.conf";
-fi
+# set defaults
+options="$(cat "$__object/parameter/options" 2>/dev/null \
+ || echo "" | tee "$__object/parameter/options")"
diff --git a/cdist/conf/type/__install_reset_disk/gencode-remote b/cdist/conf/type/__install_reset_disk/gencode-remote
index ac9ae6cf..e8e9cf8c 100755
--- a/cdist/conf/type/__install_reset_disk/gencode-remote
+++ b/cdist/conf/type/__install_reset_disk/gencode-remote
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/sh
#
# 2012 Steven Armstrong (steven-cdist at armstrong.cc)
#
@@ -22,44 +22,38 @@ disk="/$__object_id"
disk_name="${disk##*/}"
cat << DONE
-
-debug() {
- echo "[DEBUG] \$@" >&2
-}
-
-find_md_device_names() {
- local disk_name="\$1"
- for slave in \$(find /sys/devices/virtual/block/*/slaves/ -name "\${disk_name}*"); do
- debug "slave: \$slave"
- for holder in \$slave/holders/*; do
- debug "holder: \$holder"
- if [ -d "\$holder/md" ]; then
- debug "mdadm found at \$holder"
- holder_name="\${holder##*/}"
- echo "\$holder_name"
- fi
- done
- done
-}
-
-# disable any enabled volume group
-if command -v vgchange >/dev/null; then
- vgchange -a n
-else
- echo "WARNING: vgchange command not found" >&2
+# stop lvm's if any
+if find /sys/class/block/$disk_name*/holders/ -mindepth 1 | grep -q holders/dm; then
+ if command -v vgchange >/dev/null; then
+ vgchange -a n
+ else
+ echo "WARNING: vgchange command not found" >&2
+ fi
fi
-# disable any running mdadm arrays related to $disk
-for md_name in \$(find_md_device_names "$disk_name" | sort | uniq); do
- echo "md_name: \$md_name"
- if command -v mdadm >/dev/null; then
- mdadm --stop "/dev/\$md_name"
- else
- echo "WARNING: mdadm command not found" >&2
- echo "WARNING: could not stop active mdadm raid for disk $disk" >&2
+# stop mdadm raids if any
+if [ -r /proc/mdstat ]; then
+ md_name="\$(awk "/$disk_name/ {print \$1}" /proc/mdstat)"
+ if [ -n "\$md_name" ]; then
+ if command -v mdadm >/dev/null; then
+ mdadm --stop "/dev/\$md_name"
+ else
+ echo "WARNING: mdadm command not found" >&2
+ echo "WARNING: could not stop active mdadm raid for disk $disk" >&2
+ fi
fi
-done
+fi
+if command -v pvremove >/dev/null; then
+ pvremove --force --force --yes "$disk" || true
+else
+ echo "WARNING: pvremove command not found" >&2
+fi
+if command -v mdadm >/dev/null; then
+ mdadm --zero-superblock --force "$disk" || true
+else
+ echo "WARNING: mdadm command not found" >&2
+fi
# clean disks from any legacy signatures
if command -v wipefs >/dev/null; then
wipefs -a "$disk" || true
@@ -67,5 +61,5 @@ fi
# erase partition table
dd if=/dev/zero of=$disk bs=512 count=1
-printf 'w\\n' | fdisk -u -c $disk || true
+printf 'w\n' | fdisk -u -c $disk || true
DONE
diff --git a/cdist/conf/type/__install_reset_disk/man.rst b/cdist/conf/type/__install_reset_disk/man.text
similarity index 50%
rename from cdist/conf/type/__install_reset_disk/man.rst
rename to cdist/conf/type/__install_reset_disk/man.text
index fadeec71..542d68ba 100644
--- a/cdist/conf/type/__install_reset_disk/man.rst
+++ b/cdist/conf/type/__install_reset_disk/man.text
@@ -1,5 +1,7 @@
cdist-type__install_reset_disk(7)
=================================
+Steven Armstrong
+
NAME
----
@@ -15,29 +17,27 @@ Remove mdadm superblock.
REQUIRED PARAMETERS
-------------------
-None
+None.
OPTIONAL PARAMETERS
-------------------
-None
+None.
EXAMPLES
--------
-.. code-block:: sh
-
- __install_reset_disk /dev/sdb
+--------------------------------------------------------------------------------
+__install_reset_disk /dev/sdb
+--------------------------------------------------------------------------------
-AUTHORS
--------
-Steven Armstrong
+SEE ALSO
+--------
+- cdist-type(7)
COPYING
-------
-Copyright \(C) 2012 Steven Armstrong. You can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
+Copyright \(C) 2012 Steven Armstrong. Free use of this software is
+granted under the terms of the GNU General Public License version 3 (GPLv3).
diff --git a/cdist/conf/type/__install_stage/gencode-remote b/cdist/conf/type/__install_stage/gencode-remote
index 776e9fd5..3b83ea61 100755
--- a/cdist/conf/type/__install_stage/gencode-remote
+++ b/cdist/conf/type/__install_stage/gencode-remote
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/sh
#
# 2011-2013 Steven Armstrong (steven-cdist at armstrong.cc)
#
@@ -22,14 +22,8 @@ uri="$(cat "$__object/parameter/uri" 2>/dev/null \
|| echo "$__object_id")"
target="$(cat "$__object/parameter/target")"
-if [ "$__cdist_log_level" -le "10" ]
-then
- curl="curl"
- tar="tar -xvzp"
-else
- curl="curl -s"
- tar="tar -xzp"
-fi
+[ "$__debug" = "yes" ] && curl="curl" || curl="curl -s"
+[ "$__debug" = "yes" ] && tar="tar -xvzp" || tar="tar -xzp"
if [ -f "$__object/parameter/insecure" ] ; then
curl="$curl -k"
diff --git a/cdist/conf/type/__install_stage/man.rst b/cdist/conf/type/__install_stage/man.rst
deleted file mode 100644
index fd764693..00000000
--- a/cdist/conf/type/__install_stage/man.rst
+++ /dev/null
@@ -1,58 +0,0 @@
-cdist-type__install_stage(7)
-============================
-
-NAME
-----
-cdist-type__install_stage - download and unpack a stage file
-
-
-DESCRIPTION
------------
-Downloads a operating system stage using curl and unpacks it to /target
-using tar. The stage tarball is expected to be gzip compressed.
-
-
-REQUIRED PARAMETERS
--------------------
-uri
- The uri from which to fetch the tarball.
- Can be anything understood by curl, e.g:
- | http://path/to/stage.tgz
- | tftp:///path/to/stage.tgz
- | file:///local/path/stage.tgz
-
-
-OPTIONAL PARAMETERS
--------------------
-target
- where to unpack the tarball to. Defaults to /target.
-
-
-BOOLEAN PARAMETERS
-------------------
-insecure
- run curl in insecure mode so it does not check the servers ssl certificate
-
-
-EXAMPLES
---------
-
-.. code-block:: sh
-
- __install_stage --uri tftp:///path/to/stage.tgz
- __install_stage --uri http://path/to/stage.tgz --target /mnt/foobar
- __install_stage --uri file:///path/to/stage.tgz --target /target
- __install_stage --uri https://path/to/stage.tgz --target /mnt/foobar --insecure
-
-
-AUTHORS
--------
-Steven Armstrong
-
-
-COPYING
--------
-Copyright \(C) 2011 - 2013 Steven Armstrong. You can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
diff --git a/cdist/conf/type/__install_stage/man.text b/cdist/conf/type/__install_stage/man.text
new file mode 100644
index 00000000..289c8621
--- /dev/null
+++ b/cdist/conf/type/__install_stage/man.text
@@ -0,0 +1,58 @@
+cdist-type__install_stage(7)
+============================
+Steven Armstrong
+
+
+NAME
+----
+cdist-type__install_stage - download and unpack a stage file
+
+
+DESCRIPTION
+-----------
+Downloads a operating system stage using curl and unpacks it to /target
+using tar. The stage tarball is expected to be gzip compressed.
+
+
+REQUIRED PARAMETERS
+-------------------
+uri::
+ The uri from which to fetch the tarball.
+ Can be anything understood by curl, e.g:
+ http://path/to/stage.tgz
+ tftp:///path/to/stage.tgz
+ file:///local/path/stage.tgz
+
+
+OPTIONAL PARAMETERS
+-------------------
+target::
+ where to unpack the tarball to. Defaults to /target.
+
+
+BOOLEAN PARAMETERS
+------------------
+insecure::
+ run curl in insecure mode so it does not check the servers ssl certificate
+
+
+EXAMPLES
+--------
+
+--------------------------------------------------------------------------------
+__install_stage --uri tftp:///path/to/stage.tgz
+__install_stage --uri http://path/to/stage.tgz --target /mnt/foobar
+__install_stage --uri file:///path/to/stage.tgz --target /target
+__install_stage --uri https://path/to/stage.tgz --target /mnt/foobar --insecure
+--------------------------------------------------------------------------------
+
+
+SEE ALSO
+--------
+- cdist-type(7)
+
+
+COPYING
+-------
+Copyright \(C) 2011 - 2013 Steven Armstrong. Free use of this software is
+granted under the terms of the GNU General Public License version 3 (GPLv3).
diff --git a/cdist/conf/type/__install_umount/gencode-remote b/cdist/conf/type/__install_umount/gencode-remote
index 8dcfb253..c275fe5d 100755
--- a/cdist/conf/type/__install_umount/gencode-remote
+++ b/cdist/conf/type/__install_umount/gencode-remote
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/sh
#
# 2011 Steven Armstrong (steven-cdist at armstrong.cc)
#
diff --git a/cdist/conf/type/__install_umount/man.rst b/cdist/conf/type/__install_umount/man.text
similarity index 54%
rename from cdist/conf/type/__install_umount/man.rst
rename to cdist/conf/type/__install_umount/man.text
index 59f63449..8d9d1f55 100644
--- a/cdist/conf/type/__install_umount/man.rst
+++ b/cdist/conf/type/__install_umount/man.text
@@ -1,5 +1,7 @@
cdist-type__install_umount(7)
=============================
+Steven Armstrong
+
NAME
----
@@ -13,31 +15,29 @@ This cdist type allows you to recursively umount the given target directory.
REQUIRED PARAMETERS
-------------------
-None
+None.
OPTIONAL PARAMETERS
-------------------
-target
+target::
the mount point to umount. Defaults to object_id
EXAMPLES
--------
-.. code-block:: sh
-
- __install_umount /target
+--------------------------------------------------------------------------------
+__install_umount /target
+--------------------------------------------------------------------------------
-AUTHORS
--------
-Steven Armstrong
+SEE ALSO
+--------
+- cdist-type(7)
COPYING
-------
-Copyright \(C) 2011 Steven Armstrong. You can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
+Copyright \(C) 2011 Steven Armstrong. Free use of this software is
+granted under the terms of the GNU General Public License version 3 (GPLv3).
diff --git a/cdist/conf/type/__systemd_unit/explorer/enablement-state b/cdist/conf/type/__install_umount/manifest
old mode 100644
new mode 100755
similarity index 78%
rename from cdist/conf/type/__systemd_unit/explorer/enablement-state
rename to cdist/conf/type/__install_umount/manifest
index 5a5a4462..c547e167
--- a/cdist/conf/type/__systemd_unit/explorer/enablement-state
+++ b/cdist/conf/type/__install_umount/manifest
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# 2017 Ľubomír Kučera
+# 2011 Steven Armstrong (steven-cdist at armstrong.cc)
#
# This file is part of cdist.
#
@@ -18,4 +18,6 @@
# along with cdist. If not, see .
#
-systemctl is-enabled "${__object_id}" 2>/dev/null || true
+# set defaults
+target="$(cat "$__object/parameter/target" 2>/dev/null \
+ || echo "/target" | tee "$__object/parameter/target")"
diff --git a/cdist/conf/type/__install_umount/parameter/default/target b/cdist/conf/type/__install_umount/parameter/default/target
deleted file mode 100644
index ea8c4bf7..00000000
--- a/cdist/conf/type/__install_umount/parameter/default/target
+++ /dev/null
@@ -1 +0,0 @@
-/target
diff --git a/cdist/conf/type/__install_umount/parameter/optional b/cdist/conf/type/__install_umount/parameter/optional
deleted file mode 100644
index eb5a316c..00000000
--- a/cdist/conf/type/__install_umount/parameter/optional
+++ /dev/null
@@ -1 +0,0 @@
-target
diff --git a/cdist/conf/type/__iptables_apply/files/init-script b/cdist/conf/type/__iptables_apply/files/init-script
index e42017ae..2247dcf5 100644
--- a/cdist/conf/type/__iptables_apply/files/init-script
+++ b/cdist/conf/type/__iptables_apply/files/init-script
@@ -1,4 +1,7 @@
#!/bin/sh
+# Nico Schottelius
+# Zürisee, Mon Sep 2 18:38:27 CEST 2013
+#
### BEGIN INIT INFO
# Provides: iptables
# Required-Start: $local_fs $remote_fs
@@ -11,72 +14,32 @@
# and saves/restores previous status
### END INIT INFO
-# Originally written by:
-# Nico Schottelius
-# Zürisee, Mon Sep 2 18:38:27 CEST 2013
-#
-# 2013 Nico Schottelius (nico-cdist at schottelius.org)
-# 2020 Matthias Stecher (matthiasstecher at gmx.de)
-#
-# This file is distributed with cdist and licenced under the
-# GNU GPLv3+ WITHOUT ANY WARRANTY.
-
-
-# Read files and execute the content with the given commands
-#
-# Arguments:
-# 1: Directory
-# 2..n: Commands which should be used to execute the file content
-gothrough() {
- cd "$1" || return
- shift
-
- # iterate through all rules and continue if it's not a file
- for rule in *; do
- [ -f "$rule" ] || continue
- echo "Appling iptables rule $rule ..."
-
- # execute it with all commands specificed
- ruleparam="$(cat "$rule")"
- for cmd in "$@"; do
- # Command and Rule should be split.
- # shellcheck disable=SC2046
- command $cmd $ruleparam
- done
- done
-}
-
-# Shortcut for iptables command to do IPv4 and v6
-# only applies to the "reset" target
-iptables() {
- command iptables "$@"
- command ip6tables "$@"
-}
basedir=/etc/iptables.d
-status4="${basedir}/.pre-start"
-status6="${basedir}/.pre-start6"
+status="${basedir}/.pre-start"
case $1 in
start)
# Save status
- iptables-save > "$status4"
- ip6tables-save > "$status6"
+ iptables-save > "$status"
# Apply our ruleset
- gothrough "$basedir" iptables
- #gothrough "$basedir/v4" iptables # conflicts with $basedir
- gothrough "$basedir/v6" ip6tables
- gothrough "$basedir/all" iptables ip6tables
+ cd "$basedir"
+ count="$(ls -1 | wc -l)"
+
+ # Only do something if there are rules
+ if [ "$count" -ge 1 ]; then
+ for rule in *; do
+ echo "Applying iptables rule $rule ..."
+ iptables $(cat "$rule")
+ done
+ fi
;;
stop)
# Restore from status before, if there is something to restore
- if [ -f "$status4" ]; then
- iptables-restore < "$status4"
- fi
- if [ -f "$status6" ]; then
- ip6tables-restore < "$status6"
+ if [ -f "$status" ]; then
+ iptables-restore < "$status"
fi
;;
restart)
diff --git a/cdist/conf/type/__iptables_apply/gencode-remote b/cdist/conf/type/__iptables_apply/gencode-remote
old mode 100755
new mode 100644
index a80cb936..9cdf28cf
--- a/cdist/conf/type/__iptables_apply/gencode-remote
+++ b/cdist/conf/type/__iptables_apply/gencode-remote
@@ -1,5 +1,3 @@
-#!/bin/sh -e
-
if grep -q "^__file/etc/iptables.d/" "$__messages_in"; then
echo /etc/init.d/iptables restart
fi
diff --git a/cdist/conf/type/__iptables_apply/man.rst b/cdist/conf/type/__iptables_apply/man.rst
deleted file mode 100644
index 3bef92cc..00000000
--- a/cdist/conf/type/__iptables_apply/man.rst
+++ /dev/null
@@ -1,64 +0,0 @@
-cdist-type__iptables_apply(7)
-=============================
-
-NAME
-----
-cdist-type__iptables_apply - Apply the rules
-
-
-DESCRIPTION
------------
-This cdist type deploys an init script that triggers
-the configured rules and also re-applies them on
-configuration. Rules are written from __iptables_rule
-into the folder ``/etc/iptables.d/``.
-
-It reads all rules from the base folder as rules for IPv4.
-Rules in the subfolder ``v6/`` are IPv6 rules. Rules in
-the subfolder ``all/`` are applied to both rule tables. All
-files contain the arguments for a single ``iptables`` and/or
-``ip6tables`` command.
-
-Rules are applied in the following order:
-1. All IPv4 rules
-2. All IPv6 rules
-2. All rules that should be applied to both tables
-
-The order of the rules that will be applied are definite
-from the result the shell glob returns, which should be
-alphabetical. If rules must be applied in a special order,
-prefix them with a number like ``02-some-rule``.
-
-
-REQUIRED PARAMETERS
--------------------
-None
-
-OPTIONAL PARAMETERS
--------------------
-None
-
-EXAMPLES
---------
-
-None (__iptables_apply is used by __iptables_rule automatically)
-
-
-SEE ALSO
---------
-:strong:`cdist-type__iptables_rule`\ (7), :strong:`iptables`\ (8)
-
-
-AUTHORS
--------
-Nico Schottelius
-Matthias Stecher
-
-
-COPYING
--------
-Copyright \(C) 2013 Nico Schottelius.
-Copyright \(C) 2020 Matthias Stecher.
-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.
diff --git a/cdist/conf/type/__iptables_apply/man.text b/cdist/conf/type/__iptables_apply/man.text
new file mode 100644
index 00000000..87f4b4ee
--- /dev/null
+++ b/cdist/conf/type/__iptables_apply/man.text
@@ -0,0 +1,42 @@
+cdist-type__iptables_apply(7)
+=============================
+Nico Schottelius
+
+
+NAME
+----
+cdist-type__iptables_apply - Apply the rules
+
+
+DESCRIPTION
+-----------
+This cdist type deploys an init script that triggers
+the configured rules and also re-applies them on
+configuration.
+
+
+REQUIRED PARAMETERS
+-------------------
+None
+
+OPTIONAL PARAMETERS
+-------------------
+None
+
+EXAMPLES
+--------
+
+None (__iptables_apply is used by __iptables_rule)
+
+
+SEE ALSO
+--------
+- cdist-type(7)
+- cdist-type__iptables_rule(7)
+- iptables(8)
+
+
+COPYING
+-------
+Copyright \(C) 2013 Nico Schottelius. Free use of this software is
+granted under the terms of the GNU General Public License version 3 (GPLv3).
diff --git a/cdist/conf/type/__iptables_apply/manifest b/cdist/conf/type/__iptables_apply/manifest
old mode 100755
new mode 100644
index 0061d3de..a22901ba
--- a/cdist/conf/type/__iptables_apply/manifest
+++ b/cdist/conf/type/__iptables_apply/manifest
@@ -1,4 +1,3 @@
-#!/bin/sh -e
#
# 2013 Nico Schottelius (nico-cdist at schottelius.org)
#
diff --git a/cdist/conf/type/__iptables_rule/man.rst b/cdist/conf/type/__iptables_rule/man.rst
deleted file mode 100644
index afb71e01..00000000
--- a/cdist/conf/type/__iptables_rule/man.rst
+++ /dev/null
@@ -1,100 +0,0 @@
-cdist-type__iptables_rule(7)
-============================
-
-NAME
-----
-cdist-type__iptables_rule - Deploy iptable rulesets
-
-
-DESCRIPTION
------------
-This cdist type allows you to manage iptable rules
-in a distribution independent manner.
-
-See :strong:`cdist-type__iptables_apply`\ (7) for the
-execution order of these rules. It will be executed
-automaticly to apply all rules non-volaite.
-
-
-REQUIRED PARAMETERS
--------------------
-rule
- The rule to apply. Essentially an iptables command
- line without iptables in front of it.
-
-
-OPTIONAL PARAMETERS
--------------------
-state
- 'present' or 'absent', defaults to 'present'
-
-
-BOOLEAN PARAMETERS
-------------------
-All rules without any of these parameters will be treated like ``--v4`` because
-of backward compatibility.
-
-v4
- Explicitly set it as rule for IPv4. If IPv6 is set, too, it will be
- threaten like ``--all``. Will be the default if nothing else is set.
-
-v6
- Explicitly set it as rule for IPv6. If IPv4 is set, too, it will be
- threaten like ``--all``.
-
-all
- Set the rule for both IPv4 and IPv6. It will be saved separately from the
- other rules.
-
-
-EXAMPLES
---------
-
-.. code-block:: sh
-
- # Deploy some policies
- __iptables_rule policy-in --rule "-P INPUT DROP"
- __iptables_rule policy-out --rule "-P OUTPUT ACCEPT"
- __iptables_rule policy-fwd --rule "-P FORWARD DROP"
-
- # The usual established rule
- __iptables_rule established --rule "-A INPUT -m state --state RELATED,ESTABLISHED -j ACCEPT"
-
- # Some service rules
- __iptables_rule http --rule "-A INPUT -p tcp --dport 80 -j ACCEPT"
- __iptables_rule ssh --rule "-A INPUT -p tcp --dport 22 -j ACCEPT"
- __iptables_rule https --rule "-A INPUT -p tcp --dport 443 -j ACCEPT"
-
- # Ensure some rules are not present anymore
- __iptables_rule munin --rule "-A INPUT -p tcp --dport 4949 -j ACCEPT" \
- --state absent
-
-
- # IPv4-only rule for ICMPv4
- __iptables_rule icmp-v4 --v4 --rule "-A INPUT -p icmp -j ACCEPT"
- # IPv6-only rule for ICMPv6
- __iptables_rule icmp-v6 --v6 --rule "-A INPUT -p icmpv6 -j ACCEPT"
-
- # doing something for the dual stack
- __iptables_rule fwd-eth0-eth1 --v4 --v6 --rule "-A INPUT -i eth0 -o eth1 -j ACCEPT"
- __iptables_rule fwd-eth1-eth0 --all --rule "-A -o eth1 -i eth0 -m state --state RELATED,ESTABLISHED -j ACCEPT"
-
-
-SEE ALSO
---------
-:strong:`cdist-type__iptables_apply`\ (7), :strong:`iptables`\ (8)
-
-
-AUTHORS
--------
-Nico Schottelius
-Matthias Stecher
-
-
-COPYING
--------
-Copyright \(C) 2013 Nico Schottelius.
-Copyright \(C) 2020 Matthias Stecher.
-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.
diff --git a/cdist/conf/type/__iptables_rule/man.text b/cdist/conf/type/__iptables_rule/man.text
new file mode 100644
index 00000000..2f5b9785
--- /dev/null
+++ b/cdist/conf/type/__iptables_rule/man.text
@@ -0,0 +1,64 @@
+cdist-type__iptables_rule(7)
+============================
+Nico Schottelius
+
+
+NAME
+----
+cdist-type__iptables_rule - Deploy iptable rulesets
+
+
+DESCRIPTION
+-----------
+This cdist type allows you to manage iptable rules
+in a distribution independent manner.
+
+
+REQUIRED PARAMETERS
+-------------------
+rule::
+ The rule to apply. Essentially an iptables command
+ line without iptables in front of it.
+
+
+OPTIONAL PARAMETERS
+-------------------
+state::
+ 'present' or 'absent', defaults to 'present'
+
+
+EXAMPLES
+--------
+
+--------------------------------------------------------------------------------
+# Deploy some policies
+__iptables_rule policy-in --rule "-P INPUT DROP"
+__iptables_rule policy-out --rule "-P OUTPUT ACCEPT"
+__iptables_rule policy-fwd --rule "-P FORWARD DROP"
+
+# The usual established rule
+__iptables_rule established --rule "-A INPUT -m state --state RELATED,ESTABLISHED -j ACCEPT"
+
+# Some service rules
+__iptables_rule http --rule "-A INPUT -p tcp --dport 80 -j ACCEPT"
+__iptables_rule ssh --rule "-A INPUT -p tcp --dport 22 -j ACCEPT"
+__iptables_rule https --rule "-A INPUT -p tcp --dport 443 -j ACCEPT"
+
+# Ensure some rules are not present anymore
+__iptables_rule munin --rule "-A INPUT -p tcp --dport 4949 -j ACCEPT" \
+ --state absent
+
+--------------------------------------------------------------------------------
+
+
+SEE ALSO
+--------
+- cdist-type(7)
+- cdist-type__iptables_apply(7)
+- iptables(8)
+
+
+COPYING
+-------
+Copyright \(C) 2013 Nico Schottelius. Free use of this software is
+granted under the terms of the GNU General Public License version 3 (GPLv3).
diff --git a/cdist/conf/type/__iptables_rule/manifest b/cdist/conf/type/__iptables_rule/manifest
old mode 100755
new mode 100644
index d4394c25..f02ab18b
--- a/cdist/conf/type/__iptables_rule/manifest
+++ b/cdist/conf/type/__iptables_rule/manifest
@@ -1,7 +1,5 @@
-#!/bin/sh -e
#
# 2013 Nico Schottelius (nico-cdist at schottelius.org)
-# 2020 Matthias Stecher (matthiasstecher at gmx.de)
#
# This file is part of cdist.
#
@@ -25,36 +23,12 @@ base_dir=/etc/iptables.d
name="$__object_id"
state="$(cat "$__object/parameter/state")"
-if [ -f "$__object/parameter/v4" ]; then
- only_v4="yes"
- # $specific_dir is $base_dir
-fi
-if [ -f "$__object/parameter/v6" ]; then
- only_v6="yes"
- specific_dir="$base_dir/v6"
-fi
-# If rules should be set for both protocols
-if { [ "$only_v4" = "yes" ] && [ "$only_v6" = "yes" ]; } ||
- [ -f "$__object/parameter/all" ]; then
-
- # all to a specific directory
- specific_dir="$base_dir/all"
-fi
-
-# set rule directory based on if it's the base or subdirectory
-rule_dir="${specific_dir:-$base_dir}"
-
################################################################################
# Basic setup
#
__directory "$base_dir" --state present
-# sub-directory if required
-if [ "$specific_dir" ]; then
- require="__directory/$base_dir" __directory "$specific_dir" --state present
-fi
-
# Have apply do the real job
require="$__object_name" __iptables_apply
@@ -62,15 +36,6 @@ require="$__object_name" __iptables_apply
# The rule
#
-for dir in "$base_dir" "$base_dir/v6" "$base_dir/all"; do
- # defaults to absent except the directory that should contain the file
- if [ "$rule_dir" = "$dir" ]; then
- curr_state="$state"
- else
- curr_state="absent"
- fi
-
- require="__directory/$rule_dir" __file "$dir/$name" \
- --source "$__object/parameter/rule" \
- --state "$curr_state"
-done
+require="__directory/$base_dir" __file "$base_dir/${name}" \
+ --source "$__object/parameter/rule" \
+ --state "$state"
diff --git a/cdist/conf/type/__iptables_rule/parameter/boolean b/cdist/conf/type/__iptables_rule/parameter/boolean
deleted file mode 100644
index 76882272..00000000
--- a/cdist/conf/type/__iptables_rule/parameter/boolean
+++ /dev/null
@@ -1,3 +0,0 @@
-all
-v4
-v6
diff --git a/cdist/conf/type/__issue/man.rst b/cdist/conf/type/__issue/man.rst
deleted file mode 100644
index 097f2c01..00000000
--- a/cdist/conf/type/__issue/man.rst
+++ /dev/null
@@ -1,47 +0,0 @@
-cdist-type__issue(7)
-====================
-
-NAME
-----
-cdist-type__issue - Manage issue
-
-
-DESCRIPTION
------------
-This cdist type allows you to easily setup /etc/issue.
-
-
-REQUIRED PARAMETERS
--------------------
-None.
-
-
-OPTIONAL PARAMETERS
--------------------
-source
- If supplied, use this file as /etc/issue instead of default.
-
-
-
-EXAMPLES
---------
-
-.. code-block:: sh
-
- __issue
-
- # When called from another type
- __issue --source "$__type/files/myfancyissue"
-
-
-AUTHORS
--------
-Nico Schottelius
-
-
-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.
diff --git a/cdist/conf/type/__issue/man.text b/cdist/conf/type/__issue/man.text
new file mode 100644
index 00000000..40ed920e
--- /dev/null
+++ b/cdist/conf/type/__issue/man.text
@@ -0,0 +1,47 @@
+cdist-type__issue(7)
+====================
+Nico Schottelius
+
+
+NAME
+----
+cdist-type__issue - Manage issue
+
+
+DESCRIPTION
+-----------
+This cdist type allows you to easily setup /etc/issue.
+
+
+REQUIRED PARAMETERS
+-------------------
+None.
+
+
+OPTIONAL PARAMETERS
+-------------------
+source::
+ If supplied, use this file as /etc/issue instead of default.
+
+
+
+EXAMPLES
+--------
+
+--------------------------------------------------------------------------------
+__issue
+
+# When called from another type
+__issue --source "$__type/files/myfancyissue"
+--------------------------------------------------------------------------------
+
+
+SEE ALSO
+--------
+- cdist-type(7)
+
+
+COPYING
+-------
+Copyright \(C) 2011 Nico Schottelius. Free use of this software is
+granted under the terms of the GNU General Public License version 3 (GPLv3).
diff --git a/cdist/conf/type/__issue/manifest b/cdist/conf/type/__issue/manifest
index 0f0b3d83..d2720f2d 100755
--- a/cdist/conf/type/__issue/manifest
+++ b/cdist/conf/type/__issue/manifest
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/sh
#
# 2011-2012 Nico Schottelius (nico-cdist at schottelius.org)
#
@@ -25,9 +25,6 @@ os="$(cat "$__global/explorer/os")"
if [ -f "$__object/parameter/source" ]; then
source="$(cat "$__object/parameter/source")"
- if [ "$source" = "-" ]; then
- source="${__object}/stdin"
- fi
else
case "$os" in
archlinux|redhat)
diff --git a/cdist/conf/type/__jail_freebsd10/explorer/basepresent b/cdist/conf/type/__jail/explorer/basepresent
similarity index 100%
rename from cdist/conf/type/__jail_freebsd10/explorer/basepresent
rename to cdist/conf/type/__jail/explorer/basepresent
diff --git a/cdist/conf/type/__jail_freebsd10/explorer/present b/cdist/conf/type/__jail/explorer/present
similarity index 100%
rename from cdist/conf/type/__jail_freebsd10/explorer/present
rename to cdist/conf/type/__jail/explorer/present
diff --git a/cdist/conf/type/__jail_freebsd10/explorer/status b/cdist/conf/type/__jail/explorer/status
similarity index 94%
rename from cdist/conf/type/__jail_freebsd10/explorer/status
rename to cdist/conf/type/__jail/explorer/status
index c8039f21..1ceba212 100755
--- a/cdist/conf/type/__jail_freebsd10/explorer/status
+++ b/cdist/conf/type/__jail/explorer/status
@@ -39,7 +39,7 @@ fi
# backslash-escaped $jaildir
sjaildir="$(echo ${jaildir} | sed 's#/#\\/#g')"
-jls_output="$(jls | grep "[ ]${sjaildir}\\/${name}\$")" || true
+jls_output="$(jls | grep "[ ]${sjaildir}\/${name}\$")" || true
if [ -n "${jls_output}" ]; then
echo "STARTED"
diff --git a/cdist/conf/type/__jail_freebsd9/gencode-local b/cdist/conf/type/__jail/gencode-local
similarity index 82%
rename from cdist/conf/type/__jail_freebsd9/gencode-local
rename to cdist/conf/type/__jail/gencode-local
index bbdc9fcc..08c7b7bf 100755
--- a/cdist/conf/type/__jail_freebsd9/gencode-local
+++ b/cdist/conf/type/__jail/gencode-local
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/sh
#
# 2012 Jake Guffey (jake.guffey at eprotex.com)
#
@@ -39,14 +39,7 @@ basepresent="$(cat "$__object/explorer/basepresent")"
if [ "$state" = "present" ]; then
if [ "$basepresent" = "NONE" ]; then
- # IPv6 fix
- if echo "${__target_host}" | grep -q -E '^[0-9a-fA-F:]+$'
- then
- my_target_host="[${__target_host}]"
- else
- my_target_host="${__target_host}"
- fi
- echo "$__remote_copy" "${jailbase}" "${my_target_host}:${remotebase}"
+ echo "$__remote_copy" "${jailbase}" "$__target_host:${remotebase}"
fi # basepresent=NONE
fi # state=present
diff --git a/cdist/conf/type/__jail_freebsd9/gencode-remote b/cdist/conf/type/__jail/gencode-remote
similarity index 90%
rename from cdist/conf/type/__jail_freebsd9/gencode-remote
rename to cdist/conf/type/__jail/gencode-remote
index 68229d3e..c88f3361 100755
--- a/cdist/conf/type/__jail_freebsd9/gencode-remote
+++ b/cdist/conf/type/__jail/gencode-remote
@@ -1,6 +1,6 @@
-#!/bin/sh -e
+#!/bin/sh
#
-# 2012,2014,2016 Jake Guffey (jake.guffey at jointheirstm.org)
+# 2012,2014 Jake Guffey (jake.guffey at eprotex.com)
#
# This file is part of cdist.
#
@@ -18,8 +18,8 @@
# along with cdist. If not, see .
#
#
-# The __jail_freebsd9 type creates, configures, and deletes FreeBSD jails
-# for use as virtual machines on FreeBSD 9.x and before.
+# The __jail type creates, configures, and deletes FreeBSD jails for use as
+# virtual machines.
#
# Debug
@@ -36,7 +36,7 @@ state="$(cat "$__object/parameter/state")"
started="true"
# If the user wants the jail gone, it implies it shouldn't be started.
-{ [ -f "$__object/parameter/stopped" ] || [ "$state" = "absent" ]; } && started="false"
+[ -f "$__object/parameter/stopped" -o "$state" = "absent" ] && started="false"
if [ -f "$__object/parameter/ip" ]; then
ip="$(cat "$__object/parameter/ip")"
@@ -45,7 +45,7 @@ else
# when $state=present, it's required. Enforce this.
if [ "$state" = "present" ]; then
exec >&2
- printf 'If --state is "present", --ip must be given\!\n'
+ echo "If --state is 'present,' --ip must be given\!"
exit 1
fi
fi
@@ -70,7 +70,7 @@ devfsruleset="$(cat "$__object/parameter/devfs-ruleset")"
# devfs_ruleset being defined without devfs_enable being true
# is pointless. Treat this as an error.
-if [ -n "$devfsruleset" ] && [ "$devfsenable" = "false" ]; then
+if [ -n "$devfsruleset" -a "$devfsenable" = "false" ]; then
exec >&2
echo "Can't have --devfs-ruleset defined with --devfs-disable"
exit 1
@@ -86,14 +86,14 @@ present="$(cat "$__object/explorer/present")"
status="$(cat "$__object/explorer/status")"
# Handle ip="iface|addr, iface|addr" format
-if [ "$(expr "${ip}" : ".*|.*")" -gt "0" ]; then
+if [ $(expr "${ip}" : ".*|.*") -gt "0" ]; then
# If we have multiple IPs defined, $interface doesn't make sense because ip="iface|addr, iface|addr" implies it
interface=""
SAVE_IFS="$IFS"
IFS=", "
for cur_ip in ${ip}; do
# Just get the last IP address for SSH to listen on
- mgmt_ip=$(echo "${cur_ip}" | sed -E -e 's/^.*\|(.*)\/[0-9]+$/\1/')
+ mgmt_ip=$(echo "${ip}" | sed -E -e 's/^.*\|(.*)\/[0-9]+$/\1/')
done
IFS="$SAVE_IFS"
else
@@ -119,19 +119,19 @@ startJail() {
deleteJail() {
# Unmount the jail's mountpoints if necessary
cat <=1 rw mount is mounted still
- for DIR in "\${output}"; do
- umount -F "/etc/fstab.${name}" "\$(echo "${DIR}" | awk '{print \$3}')"
+ for DIR in "${output}"; do
+ umount -F "/etc/fstab.${name}" "\$(echo "${DIR}" | awk '{print $3}')"
done
fi
- output="\$(mount | grep "\\/${name} (")" || true
+ output="\$(mount | grep "\/${name} (")" || true
if [ -n "\${output}" ]; then # ro mount is mounted still
- umount -F "/etc/fstab.${name}" "\$(echo "\${output}" | awk '{print \$3}')"
+ umount -F "/etc/fstab.${name}" "\$(echo "${output}" | awk '{print $3}')"
fi
EOF
# Remove the jail's rw mountpoints
@@ -279,9 +279,9 @@ END
if [ ! -f /etc/devfs.rules ]; then
touch /etc/devfs.rules
fi
- if [ -z "\$(grep '\\[jailrules=' /etc/devfs.rules)" ]; then # The default ruleset doesn't exist
+ if [ -z "\$(grep '\[jailrules=' /etc/devfs.rules)" ]; then # The default ruleset doesn't exist
# Get the highest-numbered ruleset
- highest="\$(sed -n 's/\\[.*=\\([0-9]*\\)\\]/\\1/pg' /etc/devfs.rules | sort -u | tail -n 1)" || true
+ highest="\$(sed -n 's/\[.*=\([0-9]*\)\]/\1/pg' /etc/devfs.rules | sort -u | tail -n 1)" || true
# increment by 1
let num="\${highest}+1" 2>&- >&-
# add default ruleset
@@ -354,4 +354,3 @@ else # The jail does not currently exist
exit 0
fi
fi
-
diff --git a/cdist/conf/type/__jail/man.rst b/cdist/conf/type/__jail/man.text
similarity index 57%
rename from cdist/conf/type/__jail/man.rst
rename to cdist/conf/type/__jail/man.text
index 7fc8f455..be27e909 100644
--- a/cdist/conf/type/__jail/man.rst
+++ b/cdist/conf/type/__jail/man.text
@@ -1,5 +1,7 @@
cdist-type__jail(7)
===================
+Jake Guffey
+
NAME
----
@@ -8,52 +10,52 @@ cdist-type__jail - Manage FreeBSD jails
DESCRIPTION
-----------
-This type is used on FreeBSD to manage jails by calling the appropriate per-version subtype.
+This type is used on FreeBSD to manage jails.
REQUIRED PARAMETERS
-------------------
-state
+state::
Either "present" or "absent", defaults to "present".
-jailbase
+jailbase::
The location of the .tgz archive containing the base fs for your jails.
OPTIONAL PARAMETERS
-------------------
-name
+name::
The name of the jail. Default is to use the object_id as the jail name.
-ip
+ip::
The ifconfig style IP/netmask combination to use for the jail guest. If
the state parameter is "present," this parameter is required.
-hostname
+hostname::
The FQDN to use for the jail guest. Defaults to the name parameter.
-interface
+interface::
The name of the physical interface on the jail server to bind the jail to.
Defaults to the first interface found in the output of ifconfig -l.
-devfs-ruleset
+devfs-ruleset::
The name of the devfs ruleset to associate with the jail. Defaults to
"jailrules." This ruleset must be copied to the server via another type.
To use this option, devfs-enable must be "true."
-jaildir
+jaildir::
The location on the remote server to use for hosting jail filesystems.
Defaults to /usr/jail.
BOOLEAN PARAMETERS
------------------
-stopped
+stopped::
Do not start the jail
-devfs-disable
+devfs-disable::
Whether to disallow devfs mounting within the jail
-onboot
+onboot::
Whether to add the jail to rc.conf's jail_list variable.
@@ -67,58 +69,51 @@ means.
MESSAGES
--------
-start
+start::
The jail was started
-stop
+stop::
The jail was stopped
create:
The jail was created
-delete
+delete::
The jail was deleted
-onboot
+onboot::
The jail was configured to start on boot
EXAMPLES
--------
-.. code-block:: sh
+--------------------------------------------------------------------------------
+# Create a jail called www
+__jail www --state present --ip "192.168.1.2" --jailbase /my/jail/base.tgz
- # Create a jail called www
- __jail www --state present --ip "192.168.1.2" --jailbase /my/jail/base.tgz
+# Remove the jail called www
+__jail www --state absent --jailbase /my/jail/base.tgz
- # Remove the jail called www
- __jail www --state absent --jailbase /my/jail/base.tgz
+# The jail www should not be started
+__jail www --state present --stopped \
+ --ip "192.168.1.2 netmask 255.255.255.0" \
+ --jailbase /my/jail/base.tgz
- # The jail www should not be started
- __jail www --state present --stopped \
- --ip "192.168.1.2 netmask 255.255.255.0" \
- --jailbase /my/jail/base.tgz
+# Use the name variable explicitly
+__jail thisjail --state present --name www \
+ --ip "192.168.1.2" \
+ --jailbase /my/jail/base.tgz
- # Use the name variable explicitly
- __jail thisjail --state present --name www \
- --ip "192.168.1.2" \
- --jailbase /my/jail/base.tgz
-
- # Go nuts
- __jail lotsofoptions --state present --name testjail \
- --ip "192.168.1.100 netmask 255.255.255.0" \
- --hostname "testjail.example.com" --interface "em0" \
- --onboot --jailbase /my/jail/base.tgz --jaildir /jails
+# Go nuts
+__jail lotsofoptions --state present --name testjail \
+ --ip "192.168.1.100 netmask 255.255.255.0" \
+ --hostname "testjail.example.com" --interface "em0" \
+ --onboot --jailbase /my/jail/base.tgz --jaildir /jails
+--------------------------------------------------------------------------------
SEE ALSO
--------
-:strong:`jail`\ (8)
-
-
-AUTHORS
--------
-Jake Guffey
+- cdist-type(7)
COPYING
-------
-Copyright \(C) 2012,2016 Jake Guffey. 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.
+Copyright \(C) 2012 Jake Guffey. Free use of this software is
+granted under the terms of the GNU General Public License version 3 (GPLv3).
diff --git a/cdist/conf/type/__jail/manifest b/cdist/conf/type/__jail/manifest
index fad6a3a1..2d29e263 100755
--- a/cdist/conf/type/__jail/manifest
+++ b/cdist/conf/type/__jail/manifest
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/sh
#
# 2012 Jake Guffey (jake.guffey at eprotex.com)
#
@@ -35,19 +35,7 @@ fi
jaildir="$(cat "$__object/parameter/jaildir")"
-__directory "${jaildir}" --parents
-
-set -- "$@" "$__object_id"
-cd "$__object/parameter"
-for property in *; do
- set -- "$@" "--$property" "$(cat "$property")"
-done
-
-if grep -q '^10\.' "$(cat "$__global/explorer/os_version")" ; then # Version is 10.x
- __jail_freebsd10 "$@"
-else
- __jail_freebsd9 "$@"
-fi
+__directory ${jaildir} --parents
# Debug
#set +x
diff --git a/cdist/conf/type/__jail_freebsd10/gencode-local b/cdist/conf/type/__jail_freebsd10/gencode-local
deleted file mode 100755
index f163cad3..00000000
--- a/cdist/conf/type/__jail_freebsd10/gencode-local
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/bin/sh -e
-#
-# 2012 Jake Guffey (jake.guffey at eprotex.com)
-#
-# This file is part of cdist.
-#
-# cdist is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# cdist is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with cdist. If not, see .
-#
-#
-# The __jail type creates, configures, and deletes FreeBSD jails for use as
-# virtual machines.
-#
-
-# Debug
-#exec >&2
-#set -x
-
-jaildir="$(cat "$__object/parameter/jaildir")"
-
-jailbase="$(cat "$__object/parameter/jailbase")"
-
-state="$(cat "$__object/parameter/state")"
-
-if [ "$state" = "present" ] && [ -z "$jailbase" ]; then
- exec >&2
- echo "jailbase is a REQUIRED parameter when state=present!"
- exit 1
-fi
-
-remotebase="${jaildir}/jailbase.tgz"
-basepresent="$(cat "$__object/explorer/basepresent")"
-
-if [ "$state" = "present" ]; then
- if [ "$basepresent" = "NONE" ]; then
- # IPv6 fix
- if echo "${__target_host}" | grep -q -E '^[0-9a-fA-F:]+$'
- then
- my_target_host="[${__target_host}]"
- else
- my_target_host="${__target_host}"
- fi
- echo "$__remote_copy" "${jailbase}" "${my_target_host}:${remotebase}"
- fi # basepresent=NONE
-fi # state=present
-
-# Debug
-#set +x
-
diff --git a/cdist/conf/type/__jail_freebsd10/gencode-remote b/cdist/conf/type/__jail_freebsd10/gencode-remote
deleted file mode 100755
index 4f376c25..00000000
--- a/cdist/conf/type/__jail_freebsd10/gencode-remote
+++ /dev/null
@@ -1,362 +0,0 @@
-#!/bin/sh -e
-#
-# 2012,2014,2016 Jake Guffey (jake.guffey at jointheirstm.org)
-#
-# This file is part of cdist.
-#
-# cdist is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# cdist is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with cdist. If not, see .
-#
-#
-# The __jail_freebsd10 type creates, configures, and deletes FreeBSD
-# jails for use as virtual machines on FreeBSD 10.x.
-#
-
-# Debug
-#exec >&2
-#set -x
-
-if [ -f "$__object/parameter/name" ]; then
- name="$(cat "$__object/parameter/name")"
-else
- name="$__object_id"
-fi
-
-state="$(cat "$__object/parameter/state")"
-
-started="true"
-# If the user wants the jail gone, it implies it shouldn't be started.
-{ [ -f "$__object/parameter/stopped" ] || [ "$state" = "absent" ]; } && started="false"
-
-if [ -f "$__object/parameter/ip" ]; then
- ip="$(cat "$__object/parameter/ip")"
-else
-# IP is an optional param when $state=absent, but
-# when $state=present, it's required. Enforce this.
- if [ "$state" = "present" ]; then
- exec >&2
- printf 'If --state is "present", --ip must be given\!\n'
- exit 1
- fi
-fi
-
-if [ -f "$__object/parameter/hostname" ]; then
- hostname="$(cat "$__object/parameter/hostname")"
-else
- hostname="$name"
-fi
-
-if [ -f "$__object/parameter/devfs-disable" ]; then
- devfsenable="false"
-else
- devfsenable="true"
-fi
-
-devfsruleset="$(cat "$__object/parameter/devfs-ruleset")"
-
-# devfs_ruleset being defined without devfs_enable being true
-# is pointless. Treat this as an error.
-if [ -n "$devfsruleset" ] && [ "$devfsenable" = "false" ]; then
- exec >&2
- echo "Can't have --devfs-ruleset defined with --devfs-disable"
- exit 1
-fi
-
-if [ -f "$__object/parameter/onboot" ]; then
- onboot="true"
-fi
-
-jaildir="$(cat "$__object/parameter/jaildir")"
-
-present="$(cat "$__object/explorer/present")"
-#present="$(cat "$__type/explorer/present")"
-status="$(cat "$__object/explorer/status")"
-
-# Handle ip="addr, addr" format
-if [ "$(expr "${ip}" : ".*, .*")" -gt "0" ]; then
- SAVE_IFS="$IFS"
- IFS=", "
- for cur_ip in ${ip}; do
- # Just get the last IP address for SSH to listen on
- mgmt_ip=$(echo "${cur_ip}" | cut '-d ' -f1) # In case using "ip netmask" format rather than CIDR
- done
- IFS="$SAVE_IFS"
-else
- mgmt_ip=$(echo "${ip}" | cut '-d ' -f1) # In case using "ip netmask" format rather than CIDR
-fi
-
-stopJail() {
-# Check $status before issuing command
- if [ "$status" = "STARTED" ]; then
- echo "/etc/rc.d/jail stop ${name}"
- echo "stop" >> "$__messages_out"
- fi
-}
-
-startJail() {
-# Check $status before issuing command
- if [ "$status" = "NOTSTART" ]; then
- echo "/etc/rc.d/jail start ${name}"
- echo "start" >> "$__messages_out"
- fi
-}
-
-deleteJail() {
-# Unmount the jail's mountpoints if necessary
- cat <=1 rw mount is mounted still
- for DIR in "\${output}"; do
- umount -F "/etc/fstab.${name}" "\$(echo "${DIR}" | awk '{print \$3}')"
- done
- fi
- output="\$(mount | grep "\\/${name} (")" || true
- if [ -n "\${output}" ]; then # ro mount is mounted still
- umount -F "/etc/fstab.${name}" "\$(echo "\${output}" | awk '{print \$3}')"
- fi
-EOF
-# Remove the jail's rw mountpoints
- echo "rm -rf \"${jaildir}/rw/${name}\""
-# Remove the jail directory
- echo "rm -rf \"${jaildir}/${name}\""
-# Remove the jail's fstab
- echo "rm -f \"/etc/fstab.${name}\""
-# Remove jail entry from jail.conf
- cat <> "$__messages_out"
-}
-
-createJail() {
-# Create the jail directory
-cat <> "$__messages_out"
-
-# Create the ro+rw mountpoint entries in fstab
-cat </etc/fstab.${name} <>/etc/rc.conf
- elif [ ! "\$(echo \$jail_enable | tr '[a-z]' '[A-Z]' | tr -d '"')" = "YES" ]; then # jail_enable="NO"
- sed -i '.bak' 's/^jail_enable=.*$/jail_enable="YES"/g' /etc/rc.conf # fix this -^
- rm -f /etc/rc.conf.bak
- fi
-
- jailfile=/etc/jail.conf
- jailheader="${name} {"
-
- jaildata="path=\"${jaildir}/${name}\";"
-
- if [ "$devfsenable" = "true" ]; then
- jaildata="\$jaildata
- mount.devfs;"
- else
- jaildata="\$jaildata
- mount.nodevfs;"
- fi
-
- jaildata="\$jaildata
- host.hostname=\"${hostname}\";
- ip4.addr=\"${ip}\";
- exec.start=\"/bin/sh /etc/rc\";
- exec.stop=\"/bin/sh /etc/rc.shutdown\";
- exec.consolelog=\"/var/log/jail_${name}_console.log\";
- mount.fstab=\"/etc/fstab.${name}\";
- allow.mount;
- exec.clean;
- allow.set_hostname=0;
- allow.sysvipc=0;
- allow.raw_sockets=0;"
-
- jailtrailer="}"
-
- if [ "$devfsenable" = "true" ] && [ "${devfsruleset}" = "jailrules" ]; then # The default ruleset is to be used
- if [ ! -f /etc/devfs.rules ]; then
- touch /etc/devfs.rules
- fi
- if [ -z "\$(grep '\\[jailrules=' /etc/devfs.rules)" ]; then # The default ruleset doesn't exist
- # Get the highest-numbered ruleset
- highest="\$(sed -n 's/\\[.*=\\([0-9]*\\)\\]/\\1/pg' /etc/devfs.rules | sort -u | tail -n 1)" || true
- # increment by 1
- [ -z "\$highest" ] && highest=10
- let num="\${highest}+1" 2>&1 >/dev/null # Close the FD==fail...
- # add default ruleset
- cat >>/etc/devfs.rules <>\"\$jailfile\""
-
-# Add $name to jail_list if $onboot=yes
-if [ "$onboot" = "yes" ]; then
-
- # first check to see whether jail_enable="YES" exists in rc.conf or not and add it
- # if necessary
-
- cat <