Compare commits
No commits in common. "master" and "5.0.0" have entirely different histories.
545 changed files with 2092 additions and 23732 deletions
2
.gitattributes
vendored
2
.gitattributes
vendored
|
|
@ -4,5 +4,3 @@
|
||||||
docs/speeches export-ignore
|
docs/speeches export-ignore
|
||||||
docs/video export-ignore
|
docs/video export-ignore
|
||||||
docs/src/man7 export-ignore
|
docs/src/man7 export-ignore
|
||||||
bin/cdist-build-helper export-ignore
|
|
||||||
README-maintainers export-ignore
|
|
||||||
|
|
|
||||||
4
.gitignore
vendored
4
.gitignore
vendored
|
|
@ -24,8 +24,6 @@ docs/src/man1/*.1
|
||||||
docs/src/man7/*.7
|
docs/src/man7/*.7
|
||||||
docs/src/man7/cdist-type__*.rst
|
docs/src/man7/cdist-type__*.rst
|
||||||
docs/src/cdist-reference.rst
|
docs/src/cdist-reference.rst
|
||||||
docs/src/cdist-types.rst
|
|
||||||
docs/src/cdist.cfg.skeleton
|
|
||||||
|
|
||||||
# Ignore cdist cache for version control
|
# Ignore cdist cache for version control
|
||||||
/cache/
|
/cache/
|
||||||
|
|
@ -36,7 +34,7 @@ cdist/inventory/
|
||||||
# Python: cache, distutils, distribution in general
|
# Python: cache, distutils, distribution in general
|
||||||
__pycache__/
|
__pycache__/
|
||||||
*.pyc
|
*.pyc
|
||||||
/MANIFEST
|
MANIFEST
|
||||||
dist/
|
dist/
|
||||||
cdist/version.py
|
cdist/version.py
|
||||||
cdist.egg-info/
|
cdist.egg-info/
|
||||||
|
|
|
||||||
|
|
@ -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
|
|
||||||
674
LICENSE
674
LICENSE
|
|
@ -1,674 +0,0 @@
|
||||||
GNU GENERAL PUBLIC LICENSE
|
|
||||||
Version 3, 29 June 2007
|
|
||||||
|
|
||||||
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
|
|
||||||
Everyone is permitted to copy and distribute verbatim copies
|
|
||||||
of this license document, but changing it is not allowed.
|
|
||||||
|
|
||||||
Preamble
|
|
||||||
|
|
||||||
The GNU General Public License is a free, copyleft license for
|
|
||||||
software and other kinds of works.
|
|
||||||
|
|
||||||
The licenses for most software and other practical works are designed
|
|
||||||
to take away your freedom to share and change the works. By contrast,
|
|
||||||
the GNU General Public License is intended to guarantee your freedom to
|
|
||||||
share and change all versions of a program--to make sure it remains free
|
|
||||||
software for all its users. We, the Free Software Foundation, use the
|
|
||||||
GNU General Public License for most of our software; it applies also to
|
|
||||||
any other work released this way by its authors. You can apply it to
|
|
||||||
your programs, too.
|
|
||||||
|
|
||||||
When we speak of free software, we are referring to freedom, not
|
|
||||||
price. Our General Public Licenses are designed to make sure that you
|
|
||||||
have the freedom to distribute copies of free software (and charge for
|
|
||||||
them if you wish), that you receive source code or can get it if you
|
|
||||||
want it, that you can change the software or use pieces of it in new
|
|
||||||
free programs, and that you know you can do these things.
|
|
||||||
|
|
||||||
To protect your rights, we need to prevent others from denying you
|
|
||||||
these rights or asking you to surrender the rights. Therefore, you have
|
|
||||||
certain responsibilities if you distribute copies of the software, or if
|
|
||||||
you modify it: responsibilities to respect the freedom of others.
|
|
||||||
|
|
||||||
For example, if you distribute copies of such a program, whether
|
|
||||||
gratis or for a fee, you must pass on to the recipients the same
|
|
||||||
freedoms that you received. You must make sure that they, too, receive
|
|
||||||
or can get the source code. And you must show them these terms so they
|
|
||||||
know their rights.
|
|
||||||
|
|
||||||
Developers that use the GNU GPL protect your rights with two steps:
|
|
||||||
(1) assert copyright on the software, and (2) offer you this License
|
|
||||||
giving you legal permission to copy, distribute and/or modify it.
|
|
||||||
|
|
||||||
For the developers' and authors' protection, the GPL clearly explains
|
|
||||||
that there is no warranty for this free software. For both users' and
|
|
||||||
authors' sake, the GPL requires that modified versions be marked as
|
|
||||||
changed, so that their problems will not be attributed erroneously to
|
|
||||||
authors of previous versions.
|
|
||||||
|
|
||||||
Some devices are designed to deny users access to install or run
|
|
||||||
modified versions of the software inside them, although the manufacturer
|
|
||||||
can do so. This is fundamentally incompatible with the aim of
|
|
||||||
protecting users' freedom to change the software. The systematic
|
|
||||||
pattern of such abuse occurs in the area of products for individuals to
|
|
||||||
use, which is precisely where it is most unacceptable. Therefore, we
|
|
||||||
have designed this version of the GPL to prohibit the practice for those
|
|
||||||
products. If such problems arise substantially in other domains, we
|
|
||||||
stand ready to extend this provision to those domains in future versions
|
|
||||||
of the GPL, as needed to protect the freedom of users.
|
|
||||||
|
|
||||||
Finally, every program is threatened constantly by software patents.
|
|
||||||
States should not allow patents to restrict development and use of
|
|
||||||
software on general-purpose computers, but in those that do, we wish to
|
|
||||||
avoid the special danger that patents applied to a free program could
|
|
||||||
make it effectively proprietary. To prevent this, the GPL assures that
|
|
||||||
patents cannot be used to render the program non-free.
|
|
||||||
|
|
||||||
The precise terms and conditions for copying, distribution and
|
|
||||||
modification follow.
|
|
||||||
|
|
||||||
TERMS AND CONDITIONS
|
|
||||||
|
|
||||||
0. Definitions.
|
|
||||||
|
|
||||||
"This License" refers to version 3 of the GNU General Public License.
|
|
||||||
|
|
||||||
"Copyright" also means copyright-like laws that apply to other kinds of
|
|
||||||
works, such as semiconductor masks.
|
|
||||||
|
|
||||||
"The Program" refers to any copyrightable work licensed under this
|
|
||||||
License. Each licensee is addressed as "you". "Licensees" and
|
|
||||||
"recipients" may be individuals or organizations.
|
|
||||||
|
|
||||||
To "modify" a work means to copy from or adapt all or part of the work
|
|
||||||
in a fashion requiring copyright permission, other than the making of an
|
|
||||||
exact copy. The resulting work is called a "modified version" of the
|
|
||||||
earlier work or a work "based on" the earlier work.
|
|
||||||
|
|
||||||
A "covered work" means either the unmodified Program or a work based
|
|
||||||
on the Program.
|
|
||||||
|
|
||||||
To "propagate" a work means to do anything with it that, without
|
|
||||||
permission, would make you directly or secondarily liable for
|
|
||||||
infringement under applicable copyright law, except executing it on a
|
|
||||||
computer or modifying a private copy. Propagation includes copying,
|
|
||||||
distribution (with or without modification), making available to the
|
|
||||||
public, and in some countries other activities as well.
|
|
||||||
|
|
||||||
To "convey" a work means any kind of propagation that enables other
|
|
||||||
parties to make or receive copies. Mere interaction with a user through
|
|
||||||
a computer network, with no transfer of a copy, is not conveying.
|
|
||||||
|
|
||||||
An interactive user interface displays "Appropriate Legal Notices"
|
|
||||||
to the extent that it includes a convenient and prominently visible
|
|
||||||
feature that (1) displays an appropriate copyright notice, and (2)
|
|
||||||
tells the user that there is no warranty for the work (except to the
|
|
||||||
extent that warranties are provided), that licensees may convey the
|
|
||||||
work under this License, and how to view a copy of this License. If
|
|
||||||
the interface presents a list of user commands or options, such as a
|
|
||||||
menu, a prominent item in the list meets this criterion.
|
|
||||||
|
|
||||||
1. Source Code.
|
|
||||||
|
|
||||||
The "source code" for a work means the preferred form of the work
|
|
||||||
for making modifications to it. "Object code" means any non-source
|
|
||||||
form of a work.
|
|
||||||
|
|
||||||
A "Standard Interface" means an interface that either is an official
|
|
||||||
standard defined by a recognized standards body, or, in the case of
|
|
||||||
interfaces specified for a particular programming language, one that
|
|
||||||
is widely used among developers working in that language.
|
|
||||||
|
|
||||||
The "System Libraries" of an executable work include anything, other
|
|
||||||
than the work as a whole, that (a) is included in the normal form of
|
|
||||||
packaging a Major Component, but which is not part of that Major
|
|
||||||
Component, and (b) serves only to enable use of the work with that
|
|
||||||
Major Component, or to implement a Standard Interface for which an
|
|
||||||
implementation is available to the public in source code form. A
|
|
||||||
"Major Component", in this context, means a major essential component
|
|
||||||
(kernel, window system, and so on) of the specific operating system
|
|
||||||
(if any) on which the executable work runs, or a compiler used to
|
|
||||||
produce the work, or an object code interpreter used to run it.
|
|
||||||
|
|
||||||
The "Corresponding Source" for a work in object code form means all
|
|
||||||
the source code needed to generate, install, and (for an executable
|
|
||||||
work) run the object code and to modify the work, including scripts to
|
|
||||||
control those activities. However, it does not include the work's
|
|
||||||
System Libraries, or general-purpose tools or generally available free
|
|
||||||
programs which are used unmodified in performing those activities but
|
|
||||||
which are not part of the work. For example, Corresponding Source
|
|
||||||
includes interface definition files associated with source files for
|
|
||||||
the work, and the source code for shared libraries and dynamically
|
|
||||||
linked subprograms that the work is specifically designed to require,
|
|
||||||
such as by intimate data communication or control flow between those
|
|
||||||
subprograms and other parts of the work.
|
|
||||||
|
|
||||||
The Corresponding Source need not include anything that users
|
|
||||||
can regenerate automatically from other parts of the Corresponding
|
|
||||||
Source.
|
|
||||||
|
|
||||||
The Corresponding Source for a work in source code form is that
|
|
||||||
same work.
|
|
||||||
|
|
||||||
2. Basic Permissions.
|
|
||||||
|
|
||||||
All rights granted under this License are granted for the term of
|
|
||||||
copyright on the Program, and are irrevocable provided the stated
|
|
||||||
conditions are met. This License explicitly affirms your unlimited
|
|
||||||
permission to run the unmodified Program. The output from running a
|
|
||||||
covered work is covered by this License only if the output, given its
|
|
||||||
content, constitutes a covered work. This License acknowledges your
|
|
||||||
rights of fair use or other equivalent, as provided by copyright law.
|
|
||||||
|
|
||||||
You may make, run and propagate covered works that you do not
|
|
||||||
convey, without conditions so long as your license otherwise remains
|
|
||||||
in force. You may convey covered works to others for the sole purpose
|
|
||||||
of having them make modifications exclusively for you, or provide you
|
|
||||||
with facilities for running those works, provided that you comply with
|
|
||||||
the terms of this License in conveying all material for which you do
|
|
||||||
not control copyright. Those thus making or running the covered works
|
|
||||||
for you must do so exclusively on your behalf, under your direction
|
|
||||||
and control, on terms that prohibit them from making any copies of
|
|
||||||
your copyrighted material outside their relationship with you.
|
|
||||||
|
|
||||||
Conveying under any other circumstances is permitted solely under
|
|
||||||
the conditions stated below. Sublicensing is not allowed; section 10
|
|
||||||
makes it unnecessary.
|
|
||||||
|
|
||||||
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
|
|
||||||
|
|
||||||
No covered work shall be deemed part of an effective technological
|
|
||||||
measure under any applicable law fulfilling obligations under article
|
|
||||||
11 of the WIPO copyright treaty adopted on 20 December 1996, or
|
|
||||||
similar laws prohibiting or restricting circumvention of such
|
|
||||||
measures.
|
|
||||||
|
|
||||||
When you convey a covered work, you waive any legal power to forbid
|
|
||||||
circumvention of technological measures to the extent such circumvention
|
|
||||||
is effected by exercising rights under this License with respect to
|
|
||||||
the covered work, and you disclaim any intention to limit operation or
|
|
||||||
modification of the work as a means of enforcing, against the work's
|
|
||||||
users, your or third parties' legal rights to forbid circumvention of
|
|
||||||
technological measures.
|
|
||||||
|
|
||||||
4. Conveying Verbatim Copies.
|
|
||||||
|
|
||||||
You may convey verbatim copies of the Program's source code as you
|
|
||||||
receive it, in any medium, provided that you conspicuously and
|
|
||||||
appropriately publish on each copy an appropriate copyright notice;
|
|
||||||
keep intact all notices stating that this License and any
|
|
||||||
non-permissive terms added in accord with section 7 apply to the code;
|
|
||||||
keep intact all notices of the absence of any warranty; and give all
|
|
||||||
recipients a copy of this License along with the Program.
|
|
||||||
|
|
||||||
You may charge any price or no price for each copy that you convey,
|
|
||||||
and you may offer support or warranty protection for a fee.
|
|
||||||
|
|
||||||
5. Conveying Modified Source Versions.
|
|
||||||
|
|
||||||
You may convey a work based on the Program, or the modifications to
|
|
||||||
produce it from the Program, in the form of source code under the
|
|
||||||
terms of section 4, provided that you also meet all of these conditions:
|
|
||||||
|
|
||||||
a) The work must carry prominent notices stating that you modified
|
|
||||||
it, and giving a relevant date.
|
|
||||||
|
|
||||||
b) The work must carry prominent notices stating that it is
|
|
||||||
released under this License and any conditions added under section
|
|
||||||
7. This requirement modifies the requirement in section 4 to
|
|
||||||
"keep intact all notices".
|
|
||||||
|
|
||||||
c) You must license the entire work, as a whole, under this
|
|
||||||
License to anyone who comes into possession of a copy. This
|
|
||||||
License will therefore apply, along with any applicable section 7
|
|
||||||
additional terms, to the whole of the work, and all its parts,
|
|
||||||
regardless of how they are packaged. This License gives no
|
|
||||||
permission to license the work in any other way, but it does not
|
|
||||||
invalidate such permission if you have separately received it.
|
|
||||||
|
|
||||||
d) If the work has interactive user interfaces, each must display
|
|
||||||
Appropriate Legal Notices; however, if the Program has interactive
|
|
||||||
interfaces that do not display Appropriate Legal Notices, your
|
|
||||||
work need not make them do so.
|
|
||||||
|
|
||||||
A compilation of a covered work with other separate and independent
|
|
||||||
works, which are not by their nature extensions of the covered work,
|
|
||||||
and which are not combined with it such as to form a larger program,
|
|
||||||
in or on a volume of a storage or distribution medium, is called an
|
|
||||||
"aggregate" if the compilation and its resulting copyright are not
|
|
||||||
used to limit the access or legal rights of the compilation's users
|
|
||||||
beyond what the individual works permit. Inclusion of a covered work
|
|
||||||
in an aggregate does not cause this License to apply to the other
|
|
||||||
parts of the aggregate.
|
|
||||||
|
|
||||||
6. Conveying Non-Source Forms.
|
|
||||||
|
|
||||||
You may convey a covered work in object code form under the terms
|
|
||||||
of sections 4 and 5, provided that you also convey the
|
|
||||||
machine-readable Corresponding Source under the terms of this License,
|
|
||||||
in one of these ways:
|
|
||||||
|
|
||||||
a) Convey the object code in, or embodied in, a physical product
|
|
||||||
(including a physical distribution medium), accompanied by the
|
|
||||||
Corresponding Source fixed on a durable physical medium
|
|
||||||
customarily used for software interchange.
|
|
||||||
|
|
||||||
b) Convey the object code in, or embodied in, a physical product
|
|
||||||
(including a physical distribution medium), accompanied by a
|
|
||||||
written offer, valid for at least three years and valid for as
|
|
||||||
long as you offer spare parts or customer support for that product
|
|
||||||
model, to give anyone who possesses the object code either (1) a
|
|
||||||
copy of the Corresponding Source for all the software in the
|
|
||||||
product that is covered by this License, on a durable physical
|
|
||||||
medium customarily used for software interchange, for a price no
|
|
||||||
more than your reasonable cost of physically performing this
|
|
||||||
conveying of source, or (2) access to copy the
|
|
||||||
Corresponding Source from a network server at no charge.
|
|
||||||
|
|
||||||
c) Convey individual copies of the object code with a copy of the
|
|
||||||
written offer to provide the Corresponding Source. This
|
|
||||||
alternative is allowed only occasionally and noncommercially, and
|
|
||||||
only if you received the object code with such an offer, in accord
|
|
||||||
with subsection 6b.
|
|
||||||
|
|
||||||
d) Convey the object code by offering access from a designated
|
|
||||||
place (gratis or for a charge), and offer equivalent access to the
|
|
||||||
Corresponding Source in the same way through the same place at no
|
|
||||||
further charge. You need not require recipients to copy the
|
|
||||||
Corresponding Source along with the object code. If the place to
|
|
||||||
copy the object code is a network server, the Corresponding Source
|
|
||||||
may be on a different server (operated by you or a third party)
|
|
||||||
that supports equivalent copying facilities, provided you maintain
|
|
||||||
clear directions next to the object code saying where to find the
|
|
||||||
Corresponding Source. Regardless of what server hosts the
|
|
||||||
Corresponding Source, you remain obligated to ensure that it is
|
|
||||||
available for as long as needed to satisfy these requirements.
|
|
||||||
|
|
||||||
e) Convey the object code using peer-to-peer transmission, provided
|
|
||||||
you inform other peers where the object code and Corresponding
|
|
||||||
Source of the work are being offered to the general public at no
|
|
||||||
charge under subsection 6d.
|
|
||||||
|
|
||||||
A separable portion of the object code, whose source code is excluded
|
|
||||||
from the Corresponding Source as a System Library, need not be
|
|
||||||
included in conveying the object code work.
|
|
||||||
|
|
||||||
A "User Product" is either (1) a "consumer product", which means any
|
|
||||||
tangible personal property which is normally used for personal, family,
|
|
||||||
or household purposes, or (2) anything designed or sold for incorporation
|
|
||||||
into a dwelling. In determining whether a product is a consumer product,
|
|
||||||
doubtful cases shall be resolved in favor of coverage. For a particular
|
|
||||||
product received by a particular user, "normally used" refers to a
|
|
||||||
typical or common use of that class of product, regardless of the status
|
|
||||||
of the particular user or of the way in which the particular user
|
|
||||||
actually uses, or expects or is expected to use, the product. A product
|
|
||||||
is a consumer product regardless of whether the product has substantial
|
|
||||||
commercial, industrial or non-consumer uses, unless such uses represent
|
|
||||||
the only significant mode of use of the product.
|
|
||||||
|
|
||||||
"Installation Information" for a User Product means any methods,
|
|
||||||
procedures, authorization keys, or other information required to install
|
|
||||||
and execute modified versions of a covered work in that User Product from
|
|
||||||
a modified version of its Corresponding Source. The information must
|
|
||||||
suffice to ensure that the continued functioning of the modified object
|
|
||||||
code is in no case prevented or interfered with solely because
|
|
||||||
modification has been made.
|
|
||||||
|
|
||||||
If you convey an object code work under this section in, or with, or
|
|
||||||
specifically for use in, a User Product, and the conveying occurs as
|
|
||||||
part of a transaction in which the right of possession and use of the
|
|
||||||
User Product is transferred to the recipient in perpetuity or for a
|
|
||||||
fixed term (regardless of how the transaction is characterized), the
|
|
||||||
Corresponding Source conveyed under this section must be accompanied
|
|
||||||
by the Installation Information. But this requirement does not apply
|
|
||||||
if neither you nor any third party retains the ability to install
|
|
||||||
modified object code on the User Product (for example, the work has
|
|
||||||
been installed in ROM).
|
|
||||||
|
|
||||||
The requirement to provide Installation Information does not include a
|
|
||||||
requirement to continue to provide support service, warranty, or updates
|
|
||||||
for a work that has been modified or installed by the recipient, or for
|
|
||||||
the User Product in which it has been modified or installed. Access to a
|
|
||||||
network may be denied when the modification itself materially and
|
|
||||||
adversely affects the operation of the network or violates the rules and
|
|
||||||
protocols for communication across the network.
|
|
||||||
|
|
||||||
Corresponding Source conveyed, and Installation Information provided,
|
|
||||||
in accord with this section must be in a format that is publicly
|
|
||||||
documented (and with an implementation available to the public in
|
|
||||||
source code form), and must require no special password or key for
|
|
||||||
unpacking, reading or copying.
|
|
||||||
|
|
||||||
7. Additional Terms.
|
|
||||||
|
|
||||||
"Additional permissions" are terms that supplement the terms of this
|
|
||||||
License by making exceptions from one or more of its conditions.
|
|
||||||
Additional permissions that are applicable to the entire Program shall
|
|
||||||
be treated as though they were included in this License, to the extent
|
|
||||||
that they are valid under applicable law. If additional permissions
|
|
||||||
apply only to part of the Program, that part may be used separately
|
|
||||||
under those permissions, but the entire Program remains governed by
|
|
||||||
this License without regard to the additional permissions.
|
|
||||||
|
|
||||||
When you convey a copy of a covered work, you may at your option
|
|
||||||
remove any additional permissions from that copy, or from any part of
|
|
||||||
it. (Additional permissions may be written to require their own
|
|
||||||
removal in certain cases when you modify the work.) You may place
|
|
||||||
additional permissions on material, added by you to a covered work,
|
|
||||||
for which you have or can give appropriate copyright permission.
|
|
||||||
|
|
||||||
Notwithstanding any other provision of this License, for material you
|
|
||||||
add to a covered work, you may (if authorized by the copyright holders of
|
|
||||||
that material) supplement the terms of this License with terms:
|
|
||||||
|
|
||||||
a) Disclaiming warranty or limiting liability differently from the
|
|
||||||
terms of sections 15 and 16 of this License; or
|
|
||||||
|
|
||||||
b) Requiring preservation of specified reasonable legal notices or
|
|
||||||
author attributions in that material or in the Appropriate Legal
|
|
||||||
Notices displayed by works containing it; or
|
|
||||||
|
|
||||||
c) Prohibiting misrepresentation of the origin of that material, or
|
|
||||||
requiring that modified versions of such material be marked in
|
|
||||||
reasonable ways as different from the original version; or
|
|
||||||
|
|
||||||
d) Limiting the use for publicity purposes of names of licensors or
|
|
||||||
authors of the material; or
|
|
||||||
|
|
||||||
e) Declining to grant rights under trademark law for use of some
|
|
||||||
trade names, trademarks, or service marks; or
|
|
||||||
|
|
||||||
f) Requiring indemnification of licensors and authors of that
|
|
||||||
material by anyone who conveys the material (or modified versions of
|
|
||||||
it) with contractual assumptions of liability to the recipient, for
|
|
||||||
any liability that these contractual assumptions directly impose on
|
|
||||||
those licensors and authors.
|
|
||||||
|
|
||||||
All other non-permissive additional terms are considered "further
|
|
||||||
restrictions" within the meaning of section 10. If the Program as you
|
|
||||||
received it, or any part of it, contains a notice stating that it is
|
|
||||||
governed by this License along with a term that is a further
|
|
||||||
restriction, you may remove that term. If a license document contains
|
|
||||||
a further restriction but permits relicensing or conveying under this
|
|
||||||
License, you may add to a covered work material governed by the terms
|
|
||||||
of that license document, provided that the further restriction does
|
|
||||||
not survive such relicensing or conveying.
|
|
||||||
|
|
||||||
If you add terms to a covered work in accord with this section, you
|
|
||||||
must place, in the relevant source files, a statement of the
|
|
||||||
additional terms that apply to those files, or a notice indicating
|
|
||||||
where to find the applicable terms.
|
|
||||||
|
|
||||||
Additional terms, permissive or non-permissive, may be stated in the
|
|
||||||
form of a separately written license, or stated as exceptions;
|
|
||||||
the above requirements apply either way.
|
|
||||||
|
|
||||||
8. Termination.
|
|
||||||
|
|
||||||
You may not propagate or modify a covered work except as expressly
|
|
||||||
provided under this License. Any attempt otherwise to propagate or
|
|
||||||
modify it is void, and will automatically terminate your rights under
|
|
||||||
this License (including any patent licenses granted under the third
|
|
||||||
paragraph of section 11).
|
|
||||||
|
|
||||||
However, if you cease all violation of this License, then your
|
|
||||||
license from a particular copyright holder is reinstated (a)
|
|
||||||
provisionally, unless and until the copyright holder explicitly and
|
|
||||||
finally terminates your license, and (b) permanently, if the copyright
|
|
||||||
holder fails to notify you of the violation by some reasonable means
|
|
||||||
prior to 60 days after the cessation.
|
|
||||||
|
|
||||||
Moreover, your license from a particular copyright holder is
|
|
||||||
reinstated permanently if the copyright holder notifies you of the
|
|
||||||
violation by some reasonable means, this is the first time you have
|
|
||||||
received notice of violation of this License (for any work) from that
|
|
||||||
copyright holder, and you cure the violation prior to 30 days after
|
|
||||||
your receipt of the notice.
|
|
||||||
|
|
||||||
Termination of your rights under this section does not terminate the
|
|
||||||
licenses of parties who have received copies or rights from you under
|
|
||||||
this License. If your rights have been terminated and not permanently
|
|
||||||
reinstated, you do not qualify to receive new licenses for the same
|
|
||||||
material under section 10.
|
|
||||||
|
|
||||||
9. Acceptance Not Required for Having Copies.
|
|
||||||
|
|
||||||
You are not required to accept this License in order to receive or
|
|
||||||
run a copy of the Program. Ancillary propagation of a covered work
|
|
||||||
occurring solely as a consequence of using peer-to-peer transmission
|
|
||||||
to receive a copy likewise does not require acceptance. However,
|
|
||||||
nothing other than this License grants you permission to propagate or
|
|
||||||
modify any covered work. These actions infringe copyright if you do
|
|
||||||
not accept this License. Therefore, by modifying or propagating a
|
|
||||||
covered work, you indicate your acceptance of this License to do so.
|
|
||||||
|
|
||||||
10. Automatic Licensing of Downstream Recipients.
|
|
||||||
|
|
||||||
Each time you convey a covered work, the recipient automatically
|
|
||||||
receives a license from the original licensors, to run, modify and
|
|
||||||
propagate that work, subject to this License. You are not responsible
|
|
||||||
for enforcing compliance by third parties with this License.
|
|
||||||
|
|
||||||
An "entity transaction" is a transaction transferring control of an
|
|
||||||
organization, or substantially all assets of one, or subdividing an
|
|
||||||
organization, or merging organizations. If propagation of a covered
|
|
||||||
work results from an entity transaction, each party to that
|
|
||||||
transaction who receives a copy of the work also receives whatever
|
|
||||||
licenses to the work the party's predecessor in interest had or could
|
|
||||||
give under the previous paragraph, plus a right to possession of the
|
|
||||||
Corresponding Source of the work from the predecessor in interest, if
|
|
||||||
the predecessor has it or can get it with reasonable efforts.
|
|
||||||
|
|
||||||
You may not impose any further restrictions on the exercise of the
|
|
||||||
rights granted or affirmed under this License. For example, you may
|
|
||||||
not impose a license fee, royalty, or other charge for exercise of
|
|
||||||
rights granted under this License, and you may not initiate litigation
|
|
||||||
(including a cross-claim or counterclaim in a lawsuit) alleging that
|
|
||||||
any patent claim is infringed by making, using, selling, offering for
|
|
||||||
sale, or importing the Program or any portion of it.
|
|
||||||
|
|
||||||
11. Patents.
|
|
||||||
|
|
||||||
A "contributor" is a copyright holder who authorizes use under this
|
|
||||||
License of the Program or a work on which the Program is based. The
|
|
||||||
work thus licensed is called the contributor's "contributor version".
|
|
||||||
|
|
||||||
A contributor's "essential patent claims" are all patent claims
|
|
||||||
owned or controlled by the contributor, whether already acquired or
|
|
||||||
hereafter acquired, that would be infringed by some manner, permitted
|
|
||||||
by this License, of making, using, or selling its contributor version,
|
|
||||||
but do not include claims that would be infringed only as a
|
|
||||||
consequence of further modification of the contributor version. For
|
|
||||||
purposes of this definition, "control" includes the right to grant
|
|
||||||
patent sublicenses in a manner consistent with the requirements of
|
|
||||||
this License.
|
|
||||||
|
|
||||||
Each contributor grants you a non-exclusive, worldwide, royalty-free
|
|
||||||
patent license under the contributor's essential patent claims, to
|
|
||||||
make, use, sell, offer for sale, import and otherwise run, modify and
|
|
||||||
propagate the contents of its contributor version.
|
|
||||||
|
|
||||||
In the following three paragraphs, a "patent license" is any express
|
|
||||||
agreement or commitment, however denominated, not to enforce a patent
|
|
||||||
(such as an express permission to practice a patent or covenant not to
|
|
||||||
sue for patent infringement). To "grant" such a patent license to a
|
|
||||||
party means to make such an agreement or commitment not to enforce a
|
|
||||||
patent against the party.
|
|
||||||
|
|
||||||
If you convey a covered work, knowingly relying on a patent license,
|
|
||||||
and the Corresponding Source of the work is not available for anyone
|
|
||||||
to copy, free of charge and under the terms of this License, through a
|
|
||||||
publicly available network server or other readily accessible means,
|
|
||||||
then you must either (1) cause the Corresponding Source to be so
|
|
||||||
available, or (2) arrange to deprive yourself of the benefit of the
|
|
||||||
patent license for this particular work, or (3) arrange, in a manner
|
|
||||||
consistent with the requirements of this License, to extend the patent
|
|
||||||
license to downstream recipients. "Knowingly relying" means you have
|
|
||||||
actual knowledge that, but for the patent license, your conveying the
|
|
||||||
covered work in a country, or your recipient's use of the covered work
|
|
||||||
in a country, would infringe one or more identifiable patents in that
|
|
||||||
country that you have reason to believe are valid.
|
|
||||||
|
|
||||||
If, pursuant to or in connection with a single transaction or
|
|
||||||
arrangement, you convey, or propagate by procuring conveyance of, a
|
|
||||||
covered work, and grant a patent license to some of the parties
|
|
||||||
receiving the covered work authorizing them to use, propagate, modify
|
|
||||||
or convey a specific copy of the covered work, then the patent license
|
|
||||||
you grant is automatically extended to all recipients of the covered
|
|
||||||
work and works based on it.
|
|
||||||
|
|
||||||
A patent license is "discriminatory" if it does not include within
|
|
||||||
the scope of its coverage, prohibits the exercise of, or is
|
|
||||||
conditioned on the non-exercise of one or more of the rights that are
|
|
||||||
specifically granted under this License. You may not convey a covered
|
|
||||||
work if you are a party to an arrangement with a third party that is
|
|
||||||
in the business of distributing software, under which you make payment
|
|
||||||
to the third party based on the extent of your activity of conveying
|
|
||||||
the work, and under which the third party grants, to any of the
|
|
||||||
parties who would receive the covered work from you, a discriminatory
|
|
||||||
patent license (a) in connection with copies of the covered work
|
|
||||||
conveyed by you (or copies made from those copies), or (b) primarily
|
|
||||||
for and in connection with specific products or compilations that
|
|
||||||
contain the covered work, unless you entered into that arrangement,
|
|
||||||
or that patent license was granted, prior to 28 March 2007.
|
|
||||||
|
|
||||||
Nothing in this License shall be construed as excluding or limiting
|
|
||||||
any implied license or other defenses to infringement that may
|
|
||||||
otherwise be available to you under applicable patent law.
|
|
||||||
|
|
||||||
12. No Surrender of Others' Freedom.
|
|
||||||
|
|
||||||
If conditions are imposed on you (whether by court order, agreement or
|
|
||||||
otherwise) that contradict the conditions of this License, they do not
|
|
||||||
excuse you from the conditions of this License. If you cannot convey a
|
|
||||||
covered work so as to satisfy simultaneously your obligations under this
|
|
||||||
License and any other pertinent obligations, then as a consequence you may
|
|
||||||
not convey it at all. For example, if you agree to terms that obligate you
|
|
||||||
to collect a royalty for further conveying from those to whom you convey
|
|
||||||
the Program, the only way you could satisfy both those terms and this
|
|
||||||
License would be to refrain entirely from conveying the Program.
|
|
||||||
|
|
||||||
13. Use with the GNU Affero General Public License.
|
|
||||||
|
|
||||||
Notwithstanding any other provision of this License, you have
|
|
||||||
permission to link or combine any covered work with a work licensed
|
|
||||||
under version 3 of the GNU Affero General Public License into a single
|
|
||||||
combined work, and to convey the resulting work. The terms of this
|
|
||||||
License will continue to apply to the part which is the covered work,
|
|
||||||
but the special requirements of the GNU Affero General Public License,
|
|
||||||
section 13, concerning interaction through a network will apply to the
|
|
||||||
combination as such.
|
|
||||||
|
|
||||||
14. Revised Versions of this License.
|
|
||||||
|
|
||||||
The Free Software Foundation may publish revised and/or new versions of
|
|
||||||
the GNU General Public License from time to time. Such new versions will
|
|
||||||
be similar in spirit to the present version, but may differ in detail to
|
|
||||||
address new problems or concerns.
|
|
||||||
|
|
||||||
Each version is given a distinguishing version number. If the
|
|
||||||
Program specifies that a certain numbered version of the GNU General
|
|
||||||
Public License "or any later version" applies to it, you have the
|
|
||||||
option of following the terms and conditions either of that numbered
|
|
||||||
version or of any later version published by the Free Software
|
|
||||||
Foundation. If the Program does not specify a version number of the
|
|
||||||
GNU General Public License, you may choose any version ever published
|
|
||||||
by the Free Software Foundation.
|
|
||||||
|
|
||||||
If the Program specifies that a proxy can decide which future
|
|
||||||
versions of the GNU General Public License can be used, that proxy's
|
|
||||||
public statement of acceptance of a version permanently authorizes you
|
|
||||||
to choose that version for the Program.
|
|
||||||
|
|
||||||
Later license versions may give you additional or different
|
|
||||||
permissions. However, no additional obligations are imposed on any
|
|
||||||
author or copyright holder as a result of your choosing to follow a
|
|
||||||
later version.
|
|
||||||
|
|
||||||
15. Disclaimer of Warranty.
|
|
||||||
|
|
||||||
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
|
|
||||||
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
|
|
||||||
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
|
|
||||||
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
|
|
||||||
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
|
||||||
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
|
|
||||||
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
|
|
||||||
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
|
|
||||||
|
|
||||||
16. Limitation of Liability.
|
|
||||||
|
|
||||||
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
|
||||||
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
|
|
||||||
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
|
|
||||||
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
|
|
||||||
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
|
|
||||||
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
|
|
||||||
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
|
|
||||||
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
|
|
||||||
SUCH DAMAGES.
|
|
||||||
|
|
||||||
17. Interpretation of Sections 15 and 16.
|
|
||||||
|
|
||||||
If the disclaimer of warranty and limitation of liability provided
|
|
||||||
above cannot be given local legal effect according to their terms,
|
|
||||||
reviewing courts shall apply local law that most closely approximates
|
|
||||||
an absolute waiver of all civil liability in connection with the
|
|
||||||
Program, unless a warranty or assumption of liability accompanies a
|
|
||||||
copy of the Program in return for a fee.
|
|
||||||
|
|
||||||
END OF TERMS AND CONDITIONS
|
|
||||||
|
|
||||||
How to Apply These Terms to Your New Programs
|
|
||||||
|
|
||||||
If you develop a new program, and you want it to be of the greatest
|
|
||||||
possible use to the public, the best way to achieve this is to make it
|
|
||||||
free software which everyone can redistribute and change under these terms.
|
|
||||||
|
|
||||||
To do so, attach the following notices to the program. It is safest
|
|
||||||
to attach them to the start of each source file to most effectively
|
|
||||||
state the exclusion of warranty; and each file should have at least
|
|
||||||
the "copyright" line and a pointer to where the full notice is found.
|
|
||||||
|
|
||||||
cdist
|
|
||||||
Copyright (C) 2019 ungleich-public
|
|
||||||
|
|
||||||
This program is free software: you can redistribute it and/or modify
|
|
||||||
it under the terms of the GNU General Public License as published by
|
|
||||||
the Free Software Foundation, either version 3 of the License, or
|
|
||||||
(at your option) any later version.
|
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
GNU General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU General Public License
|
|
||||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
Also add information on how to contact you by electronic and paper mail.
|
|
||||||
|
|
||||||
If the program does terminal interaction, make it output a short
|
|
||||||
notice like this when it starts in an interactive mode:
|
|
||||||
|
|
||||||
cdist Copyright (C) 2019 ungleich-public
|
|
||||||
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
|
||||||
This is free software, and you are welcome to redistribute it
|
|
||||||
under certain conditions; type `show c' for details.
|
|
||||||
|
|
||||||
The hypothetical commands `show w' and `show c' should show the appropriate
|
|
||||||
parts of the General Public License. Of course, your program's commands
|
|
||||||
might be different; for a GUI interface, you would use an "about box".
|
|
||||||
|
|
||||||
You should also get your employer (if you work as a programmer) or school,
|
|
||||||
if any, to sign a "copyright disclaimer" for the program, if necessary.
|
|
||||||
For more information on this, and how to apply and follow the GNU GPL, see
|
|
||||||
<http://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
The GNU General Public License does not permit incorporating your program
|
|
||||||
into proprietary programs. If your program is a subroutine library, you
|
|
||||||
may consider it more useful to permit linking proprietary applications with
|
|
||||||
the library. If this is what you want to do, use the GNU Lesser General
|
|
||||||
Public License instead of this License. But first, please read
|
|
||||||
<http://www.gnu.org/philosophy/why-not-lgpl.html>.
|
|
||||||
178
Makefile
178
Makefile
|
|
@ -18,27 +18,25 @@
|
||||||
#
|
#
|
||||||
#
|
#
|
||||||
|
|
||||||
.PHONY: help
|
helper=./bin/build-helper
|
||||||
help:
|
|
||||||
@echo "Please use \`make <target>' where <target> is one of"
|
|
||||||
@echo "man build only man user documentation"
|
|
||||||
@echo "html build only html user documentation"
|
|
||||||
@echo "docs build both man and html user documentation"
|
|
||||||
@echo "dotman build man pages for types in your ~/.cdist directory"
|
|
||||||
@echo "speeches build speeches pdf files"
|
|
||||||
@echo "install install in the system site-packages directory"
|
|
||||||
@echo "install-user install in the user site-packages directory"
|
|
||||||
@echo "docs-clean clean documentation"
|
|
||||||
@echo "clean clean"
|
|
||||||
|
|
||||||
DOCS_SRC_DIR=./docs/src
|
DOCS_SRC_DIR=docs/src
|
||||||
SPEECHDIR=./docs/speeches
|
SPEECHDIR=docs/speeches
|
||||||
TYPEDIR=./cdist/conf/type
|
TYPEDIR=cdist/conf/type
|
||||||
|
|
||||||
|
CHANGELOG_VERSION=$(shell $(helper) changelog-version)
|
||||||
|
CHANGELOG_FILE=docs/changelog
|
||||||
|
|
||||||
|
PYTHON_VERSION=cdist/version.py
|
||||||
|
|
||||||
SPHINXM=make -C $(DOCS_SRC_DIR) man
|
SPHINXM=make -C $(DOCS_SRC_DIR) man
|
||||||
SPHINXH=make -C $(DOCS_SRC_DIR) html
|
SPHINXH=make -C $(DOCS_SRC_DIR) html
|
||||||
SPHINXC=make -C $(DOCS_SRC_DIR) clean
|
SPHINXC=make -C $(DOCS_SRC_DIR) clean
|
||||||
|
|
||||||
|
SHELLCHECKCMD=shellcheck -s sh -f gcc -x
|
||||||
|
# Skip SC2154 for variables starting with __ since such variables are cdist
|
||||||
|
# environment variables.
|
||||||
|
SHELLCHECK_SKIP=grep -v ': __.*is referenced but not assigned.*\[SC2154\]'
|
||||||
################################################################################
|
################################################################################
|
||||||
# Manpages
|
# Manpages
|
||||||
#
|
#
|
||||||
|
|
@ -63,28 +61,11 @@ DOCSREFSH=$(DOCS_SRC_DIR)/cdist-reference.rst.sh
|
||||||
$(DOCSREF): $(DOCSREFSH)
|
$(DOCSREF): $(DOCSREFSH)
|
||||||
$(DOCSREFSH)
|
$(DOCSREFSH)
|
||||||
|
|
||||||
# Html types list with references
|
|
||||||
DOCSTYPESREF=$(MAN7DSTDIR)/cdist-types.rst
|
|
||||||
DOCSTYPESREFSH=$(DOCS_SRC_DIR)/cdist-types.rst.sh
|
|
||||||
|
|
||||||
$(DOCSTYPESREF): $(DOCSTYPESREFSH)
|
|
||||||
$(DOCSTYPESREFSH)
|
|
||||||
|
|
||||||
DOCSCFGSKEL=./configuration/cdist.cfg.skeleton
|
|
||||||
|
|
||||||
configskel: $(DOCSCFGSKEL)
|
|
||||||
cp -f "$(DOCSCFGSKEL)" "$(DOCS_SRC_DIR)/"
|
|
||||||
|
|
||||||
version:
|
|
||||||
@[ -f "cdist/version.py" ] || { \
|
|
||||||
printf "Missing 'cdist/version.py', please generate it first.\n" && exit 1; \
|
|
||||||
}
|
|
||||||
|
|
||||||
# Manpages #3: generic part
|
# Manpages #3: generic part
|
||||||
man: version configskel $(MANTYPES) $(DOCSREF) $(DOCSTYPESREF)
|
man: $(MANTYPES) $(DOCSREF) $(PYTHON_VERSION)
|
||||||
$(SPHINXM)
|
$(SPHINXM)
|
||||||
|
|
||||||
html: version configskel $(MANTYPES) $(DOCSREF) $(DOCSTYPESREF)
|
html: $(MANTYPES) $(DOCSREF) $(PYTHON_VERSION)
|
||||||
$(SPHINXH)
|
$(SPHINXH)
|
||||||
|
|
||||||
docs: man html
|
docs: man html
|
||||||
|
|
@ -104,7 +85,7 @@ DOTMANTYPES=$(subst /man.rst,.rst,$(DOTMANTYPEPREFIX))
|
||||||
$(DOTMAN7DSTDIR)/cdist-type%.rst: $(DOTTYPEDIR)/%/man.rst
|
$(DOTMAN7DSTDIR)/cdist-type%.rst: $(DOTTYPEDIR)/%/man.rst
|
||||||
ln -sf "$^" $@
|
ln -sf "$^" $@
|
||||||
|
|
||||||
dotman: version configskel $(DOTMANTYPES) $(DOCSREF) $(DOCSTYPESREF)
|
dotman: $(DOTMANTYPES)
|
||||||
$(SPHINXM)
|
$(SPHINXM)
|
||||||
|
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
@ -122,27 +103,132 @@ $(SPEECHDIR)/%.pdf: $(SPEECHDIR)/%.tex
|
||||||
speeches: $(SPEECHES)
|
speeches: $(SPEECHES)
|
||||||
|
|
||||||
################################################################################
|
################################################################################
|
||||||
# Misc
|
# Release: Mailinglist
|
||||||
#
|
#
|
||||||
clean: docs-clean
|
ML_FILE=.lock-ml
|
||||||
|
|
||||||
|
# Only send mail once - lock until new changelog things happened
|
||||||
|
$(ML_FILE): $(CHANGELOG_FILE)
|
||||||
|
$(helper) ml-release $(CHANGELOG_VERSION)
|
||||||
|
touch $@
|
||||||
|
|
||||||
|
ml-release: $(ML_FILE)
|
||||||
|
|
||||||
|
|
||||||
|
################################################################################
|
||||||
|
# pypi
|
||||||
|
#
|
||||||
|
PYPI_FILE=.pypi-release
|
||||||
|
$(PYPI_FILE): man $(PYTHON_VERSION)
|
||||||
|
python3 setup.py sdist upload
|
||||||
|
touch $@
|
||||||
|
|
||||||
|
pypi-release: $(PYPI_FILE)
|
||||||
|
################################################################################
|
||||||
|
# archlinux
|
||||||
|
#
|
||||||
|
ARCHLINUX_FILE=.lock-archlinux
|
||||||
|
ARCHLINUXTAR=cdist-$(CHANGELOG_VERSION)-1.src.tar.gz
|
||||||
|
|
||||||
|
$(ARCHLINUXTAR): PKGBUILD
|
||||||
|
umask 022; mkaurball
|
||||||
|
|
||||||
|
PKGBUILD: PKGBUILD.in $(PYTHON_VERSION)
|
||||||
|
./PKGBUILD.in $(CHANGELOG_VERSION)
|
||||||
|
|
||||||
|
$(ARCHLINUX_FILE): $(ARCHLINUXTAR) $(PYTHON_VERSION)
|
||||||
|
burp -c system $(ARCHLINUXTAR)
|
||||||
|
touch $@
|
||||||
|
|
||||||
|
archlinux-release: $(ARCHLINUX_FILE)
|
||||||
|
|
||||||
|
################################################################################
|
||||||
|
# Release
|
||||||
|
#
|
||||||
|
|
||||||
|
$(PYTHON_VERSION) version: .git/refs/heads/master
|
||||||
|
$(helper) version
|
||||||
|
|
||||||
|
# Code that is better handled in a shell script
|
||||||
|
check-%:
|
||||||
|
$(helper) $@
|
||||||
|
|
||||||
|
release:
|
||||||
|
$(helper) $@
|
||||||
|
|
||||||
|
################################################################################
|
||||||
|
# Cleanup
|
||||||
|
#
|
||||||
|
|
||||||
|
clean:
|
||||||
rm -f $(DOCS_SRC_DIR)/cdist-reference.rst
|
rm -f $(DOCS_SRC_DIR)/cdist-reference.rst
|
||||||
rm -f $(DOCS_SRC_DIR)/cdist-types.rst
|
|
||||||
rm -f $(DOCS_SRC_DIR)/cdist.cfg.skeleton
|
|
||||||
|
|
||||||
find "$(DOCS_SRC_DIR)" -mindepth 2 -type l \
|
find "$(DOCS_SRC_DIR)" -mindepth 2 -type l \
|
||||||
| xargs rm -f
|
| xargs rm -f
|
||||||
|
|
||||||
|
make -C $(DOCS_SRC_DIR) clean
|
||||||
|
|
||||||
find * -name __pycache__ | xargs rm -rf
|
find * -name __pycache__ | xargs rm -rf
|
||||||
|
|
||||||
# distutils
|
# Archlinux
|
||||||
rm -rf ./build
|
rm -f cdist-*.pkg.tar.xz cdist-*.tar.gz
|
||||||
|
rm -rf pkg/ src/
|
||||||
|
|
||||||
|
rm -f MANIFEST PKGBUILD
|
||||||
|
rm -rf dist/
|
||||||
|
|
||||||
|
# Signed release
|
||||||
|
rm -f cdist-*.tar.gz
|
||||||
|
rm -f cdist-*.tar.gz.asc
|
||||||
|
|
||||||
|
# Temp files
|
||||||
|
rm -f *.tmp
|
||||||
|
|
||||||
|
distclean: clean
|
||||||
|
rm -f cdist/version.py
|
||||||
|
|
||||||
################################################################################
|
################################################################################
|
||||||
# install
|
# Misc
|
||||||
#
|
#
|
||||||
|
|
||||||
install:
|
# The pub is Nico's "push to all git remotes" way ("make pub")
|
||||||
python3 setup.py install
|
pub:
|
||||||
|
git push --mirror
|
||||||
|
|
||||||
install-user:
|
test:
|
||||||
python3 setup.py install --user
|
$(helper) $@
|
||||||
|
|
||||||
|
test-remote:
|
||||||
|
$(helper) $@
|
||||||
|
|
||||||
|
pycodestyle pep8:
|
||||||
|
$(helper) $@
|
||||||
|
|
||||||
|
shellcheck-global-explorers:
|
||||||
|
@find cdist/conf/explorer -type f -exec $(SHELLCHECKCMD) {} + | $(SHELLCHECK_SKIP) || exit 0
|
||||||
|
|
||||||
|
shellcheck-type-explorers:
|
||||||
|
@find cdist/conf/type -type f -path "*/explorer/*" -exec $(SHELLCHECKCMD) {} + | $(SHELLCHECK_SKIP) || exit 0
|
||||||
|
|
||||||
|
shellcheck-manifests:
|
||||||
|
@find cdist/conf/type -type f -name manifest -exec $(SHELLCHECKCMD) {} + | $(SHELLCHECK_SKIP) || exit 0
|
||||||
|
|
||||||
|
shellcheck-local-gencodes:
|
||||||
|
@find cdist/conf/type -type f -name gencode-local -exec $(SHELLCHECKCMD) {} + | $(SHELLCHECK_SKIP) || exit 0
|
||||||
|
|
||||||
|
shellcheck-remote-gencodes:
|
||||||
|
@find cdist/conf/type -type f -name gencode-remote -exec $(SHELLCHECKCMD) {} + | $(SHELLCHECK_SKIP) || exit 0
|
||||||
|
|
||||||
|
shellcheck-scripts:
|
||||||
|
@$(SHELLCHECKCMD) scripts/cdist-dump || exit 0
|
||||||
|
|
||||||
|
shellcheck-gencodes: shellcheck-local-gencodes shellcheck-remote-gencodes
|
||||||
|
|
||||||
|
shellcheck-types: shellcheck-type-explorers shellcheck-manifests shellcheck-gencodes
|
||||||
|
|
||||||
|
shellcheck: shellcheck-global-explorers shellcheck-types shellcheck-scripts
|
||||||
|
|
||||||
|
shellcheck-type-files:
|
||||||
|
@find cdist/conf/type -type f -path "*/files/*" -exec $(SHELLCHECKCMD) {} + | $(SHELLCHECK_SKIP) || exit 0
|
||||||
|
|
||||||
|
shellcheck-with-files: shellcheck shellcheck-type-files
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,7 @@ pkgver=$version
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
pkgdesc='A Usable Configuration Management System"'
|
pkgdesc='A Usable Configuration Management System"'
|
||||||
arch=('any')
|
arch=('any')
|
||||||
url='https://www.cdi.st/'
|
url='http://www.nico.schottelius.org/software/cdist/'
|
||||||
license=('GPL3')
|
license=('GPL3')
|
||||||
depends=('python>=3.2.0')
|
depends=('python>=3.2.0')
|
||||||
source=("http://pypi.python.org/packages/source/c/cdist/cdist-\${pkgver}.tar.gz")
|
source=("http://pypi.python.org/packages/source/c/cdist/cdist-\${pkgver}.tar.gz")
|
||||||
|
|
|
||||||
7
README
Normal file
7
README
Normal file
|
|
@ -0,0 +1,7 @@
|
||||||
|
cdist
|
||||||
|
-----
|
||||||
|
|
||||||
|
cdist is a usable configuration management system.
|
||||||
|
|
||||||
|
For the web documentation have a look at https://www.cdi.st/
|
||||||
|
or at docs/src for reStructuredText manual.
|
||||||
|
|
@ -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).
|
|
||||||
31
README.md
31
README.md
|
|
@ -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`` @ freenode
|
|
||||||
|
|
||||||
Matrix: ``#cdist:ungleich.ch``
|
|
||||||
|
|
||||||
Mattermost: https://chat.ungleich.ch/ungleich/channels/cdist
|
|
||||||
|
|
@ -22,65 +22,47 @@
|
||||||
# This file contains the heavy lifting found usually in the Makefile.
|
# This file contains the heavy lifting found usually in the Makefile.
|
||||||
#
|
#
|
||||||
|
|
||||||
usage() {
|
# vars for make
|
||||||
printf "usage: %s TARGET [TARGET-ARGS...]
|
helper=$0
|
||||||
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##*/}"
|
basedir=${0%/*}/../
|
||||||
|
# run_as is used to check how the script is called (by $0 value)
|
||||||
|
# currently supported sufixes for $0 are:
|
||||||
|
# .darko - run as darko
|
||||||
|
basename=${0##*/}
|
||||||
|
run_as=${basename#*.}
|
||||||
|
|
||||||
if [ $# -lt 1 ]
|
to_a=cdist-configuration-management
|
||||||
then
|
to_d=googlegroups.com
|
||||||
usage "${basename}"
|
case "$run_as" in
|
||||||
exit 1
|
darko)
|
||||||
fi
|
from_a=darko.poljak
|
||||||
|
from_d=gmail.com
|
||||||
|
ml_name="Darko Poljak"
|
||||||
|
ml_sig_name="Darko"
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
from_a=nico.schottelius
|
||||||
|
from_d=ungleich.ch
|
||||||
|
ml_name="Nico Schottelius"
|
||||||
|
ml_sig_name="Nico"
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
# Change to checkout directory
|
||||||
|
cd "$basedir"
|
||||||
|
|
||||||
|
version=$(git describe)
|
||||||
|
|
||||||
option=$1; shift
|
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
|
case "$option" in
|
||||||
|
print-make-vars)
|
||||||
|
printf "helper: ${helper}\n"
|
||||||
|
;;
|
||||||
|
print-runas)
|
||||||
|
printf "run_as: $run_as\n"
|
||||||
|
;;
|
||||||
changelog-changes)
|
changelog-changes)
|
||||||
if [ "$#" -eq 1 ]; then
|
if [ "$#" -eq 1 ]; then
|
||||||
start=$1
|
start=$1
|
||||||
|
|
@ -100,7 +82,7 @@ case "$option" in
|
||||||
if (\$0 ~ /^$end/) {
|
if (\$0 ~ /^$end/) {
|
||||||
exit
|
exit
|
||||||
} else {
|
} else {
|
||||||
print \$0
|
print \$0
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}" "$basedir/docs/changelog"
|
}" "$basedir/docs/changelog"
|
||||||
|
|
@ -117,8 +99,8 @@ case "$option" in
|
||||||
date_changelog=$(grep '^[[:digit:]]' "$basedir/docs/changelog" | head -n1 | sed 's/.*: //')
|
date_changelog=$(grep '^[[:digit:]]' "$basedir/docs/changelog" | head -n1 | sed 's/.*: //')
|
||||||
|
|
||||||
if [ "$date_today" != "$date_changelog" ]; then
|
if [ "$date_today" != "$date_changelog" ]; then
|
||||||
printf "Date in changelog is not today\n"
|
echo "Date in changelog is not today"
|
||||||
printf "Changelog date: %s\n" "${date_changelog}"
|
echo "Changelog: $date_changelog"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
|
|
@ -129,14 +111,19 @@ case "$option" in
|
||||||
|
|
||||||
ml-release)
|
ml-release)
|
||||||
if [ $# -ne 1 ]; then
|
if [ $# -ne 1 ]; then
|
||||||
printf "%s ml-release version\n" "$0" >&2
|
echo "$0 ml-release version" >&2
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
version=$1; shift
|
version=$1; shift
|
||||||
|
|
||||||
(
|
to=${to_a}@${to_d}
|
||||||
|
from=${from_a}@${from_d}
|
||||||
|
|
||||||
|
(
|
||||||
cat << eof
|
cat << eof
|
||||||
|
From: ${ml_name} <$from>
|
||||||
|
To: cdist mailing list <$to>
|
||||||
Subject: cdist $version has been released
|
Subject: cdist $version has been released
|
||||||
|
|
||||||
Hello .*,
|
Hello .*,
|
||||||
|
|
@ -148,41 +135,28 @@ eof
|
||||||
"$0" changelog-changes "$version"
|
"$0" changelog-changes "$version"
|
||||||
cat << eof
|
cat << eof
|
||||||
|
|
||||||
|
Cheers,
|
||||||
|
${ml_sig_name}
|
||||||
|
|
||||||
|
--
|
||||||
|
Automatisation at its best level. With cdist.
|
||||||
eof
|
eof
|
||||||
) > mailinglist.tmp
|
) > mailinglist.tmp
|
||||||
;;
|
|
||||||
|
|
||||||
archlinux-release)
|
if [ "$run_as" = "build-helper" ]
|
||||||
if [ $# -ne 1 ]; then
|
then
|
||||||
printf "%s archlinux-release version\n" "$0" >&2
|
/usr/sbin/sendmail -f "$from" "$to" < mailinglist.tmp && rm -f mailinglist.tmp
|
||||||
exit 1
|
|
||||||
fi
|
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)
|
release-git-tag)
|
||||||
target_version=$($0 changelog-version)
|
target_version=$($0 changelog-version)
|
||||||
if git rev-parse --verify "refs/tags/${target_version}" 2>/dev/null; then
|
if git rev-parse --verify refs/tags/$target_version 2>/dev/null; then
|
||||||
printf "Tag for %s exists, aborting\n" "${target_version}"
|
echo "Tag for $target_version exists, aborting"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
printf "Enter tag description for %s: " "${target_version}"
|
printf "Enter tag description for ${target_version}: "
|
||||||
read -r tagmessage
|
read tagmessage
|
||||||
|
|
||||||
# setup for signed tags:
|
# setup for signed tags:
|
||||||
# gpg --fulL-gen-key
|
# gpg --fulL-gen-key
|
||||||
|
|
@ -200,8 +174,7 @@ eof
|
||||||
# gpg --verify <asc-file> <file>
|
# gpg --verify <asc-file> <file>
|
||||||
# gpg --no-default-keyring --keyring <pubkey.gpg> --verify <asc-file> <file>
|
# gpg --no-default-keyring --keyring <pubkey.gpg> --verify <asc-file> <file>
|
||||||
# Ensure gpg-agent is running.
|
# Ensure gpg-agent is running.
|
||||||
GPG_TTY=$(tty)
|
export GPG_TTY=$(tty)
|
||||||
export GPG_TTY
|
|
||||||
gpg-agent
|
gpg-agent
|
||||||
|
|
||||||
git tag -s "$target_version" -m "$tagmessage"
|
git tag -s "$target_version" -m "$tagmessage"
|
||||||
|
|
@ -211,14 +184,14 @@ eof
|
||||||
sign-git-release)
|
sign-git-release)
|
||||||
if [ $# -lt 2 ]
|
if [ $# -lt 2 ]
|
||||||
then
|
then
|
||||||
printf "usage: %s sign-git-release TAG TOKEN [ARCHIVE]\n" "$0"
|
printf "usage: $0 sign-git-release TAG TOKEN [ARCHIVE]\n"
|
||||||
printf " if ARCHIVE is not specified then it is created\n"
|
printf " if ARCHIVE is not specified then it is created\n"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
tag="$1"
|
tag="$1"
|
||||||
if ! git rev-parse -q --verify "${tag}" >/dev/null 2>&1
|
if ! git rev-parse -q --verify "${tag}" >/dev/null 2>&1
|
||||||
then
|
then
|
||||||
printf "Tag \"%s\" not found.\n" "${tag}"
|
printf "Tag \"${tag}\" not found.\n"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
token="$2"
|
token="$2"
|
||||||
|
|
@ -262,8 +235,8 @@ eof
|
||||||
# make release
|
# make release
|
||||||
changelog=$("$0" changelog-changes "$1" | sed 's/^[[:space:]]*//')
|
changelog=$("$0" changelog-changes "$1" | sed 's/^[[:space:]]*//')
|
||||||
release_notes=$(
|
release_notes=$(
|
||||||
printf "%s\n\n%s\n\n**Changelog**\n\n%s\n" \
|
printf "Release %s\n\n%s\n\n%s\n\n**Changelog**\n\n%s\n" \
|
||||||
"${response_archive}" "${response_archive_sig}" "${changelog}"
|
"${tag}" "${response_archive}" "${response_archive_sig}" "${changelog}"
|
||||||
)
|
)
|
||||||
curl -f -X POST \
|
curl -f -X POST \
|
||||||
-H "PRIVATE-TOKEN: ${token}" \
|
-H "PRIVATE-TOKEN: ${token}" \
|
||||||
|
|
@ -284,30 +257,30 @@ eof
|
||||||
target_version=$($0 changelog-version)
|
target_version=$($0 changelog-version)
|
||||||
target_branch=$($0 version-branch)
|
target_branch=$($0 version-branch)
|
||||||
|
|
||||||
printf "Beginning release process for %s\n" "${target_version}"
|
echo "Beginning release process for $target_version"
|
||||||
|
|
||||||
# First check everything is sane
|
# First check everything is sane
|
||||||
"$0" check-date
|
"$0" check-date
|
||||||
"$0" check-unittest
|
"$0" check-unittest
|
||||||
"$0" check-pycodestyle
|
"$0" check-pycodestyle
|
||||||
"$0" check-shellcheck
|
"$0" shellcheck
|
||||||
|
|
||||||
# Generate version file to be included in packaging
|
# Generate version file to be included in packaging
|
||||||
"$0" target-version
|
"$0" target-version
|
||||||
|
|
||||||
# Ensure the git status is clean, else abort
|
# Ensure the git status is clean, else abort
|
||||||
if ! git diff-index --name-only --exit-code HEAD ; then
|
if ! git diff-index --name-only --exit-code HEAD ; then
|
||||||
printf "Unclean tree, see files above, aborting.\n"
|
echo "Unclean tree, see files above, aborting"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Ensure we are on the master branch
|
# Ensure we are on the master branch
|
||||||
masterbranch=yes
|
masterbranch=yes
|
||||||
if [ "$(git rev-parse --abbrev-ref HEAD)" != "master" ]; then
|
if [ "$(git rev-parse --abbrev-ref HEAD)" != "master" ]; then
|
||||||
printf "Releases are happening from the master branch, aborting.\n"
|
echo "Releases are happening from the master branch, aborting"
|
||||||
|
|
||||||
printf "Enter the magic word to release anyway:"
|
echo "Enter the magic word to release anyway"
|
||||||
read -r magicword
|
read magicword
|
||||||
|
|
||||||
if [ "$magicword" = "iknowwhatido" ]; then
|
if [ "$magicword" = "iknowwhatido" ]; then
|
||||||
masterbranch=no
|
masterbranch=no
|
||||||
|
|
@ -318,7 +291,7 @@ eof
|
||||||
|
|
||||||
if [ "$masterbranch" = yes ]; then
|
if [ "$masterbranch" = yes ]; then
|
||||||
# Ensure version branch exists
|
# Ensure version branch exists
|
||||||
if ! git rev-parse --verify "refs/heads/${target_branch}" 2>/dev/null; then
|
if ! git rev-parse --verify refs/heads/$target_branch 2>/dev/null; then
|
||||||
git branch "$target_branch"
|
git branch "$target_branch"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
@ -333,10 +306,10 @@ eof
|
||||||
|
|
||||||
# Generate documentation (man and html)
|
# Generate documentation (man and html)
|
||||||
# First, clean old generated docs
|
# First, clean old generated docs
|
||||||
make docs-clean
|
make helper=${helper} docs-clean
|
||||||
make docs
|
make helper=${helper} docs
|
||||||
|
|
||||||
#############################################################
|
#############################################################
|
||||||
# Everything green, let's do the release
|
# Everything green, let's do the release
|
||||||
|
|
||||||
# Tag the current commit
|
# Tag the current commit
|
||||||
|
|
@ -349,40 +322,45 @@ eof
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Publish git changes
|
# Publish git changes
|
||||||
# if you want to have mirror locally then uncomment this and comment below
|
if [ "$run_as" = "build-helper" ]
|
||||||
# git push --mirror
|
then
|
||||||
|
make helper=${helper} pub
|
||||||
|
else
|
||||||
|
# if we are not Nico :) then just push, no mirror
|
||||||
git push
|
git push
|
||||||
# push also new branch and set up tracking
|
# push also new branch and set up tracking
|
||||||
git push -u origin "${target_branch}"
|
git push -u origin "${target_branch}"
|
||||||
# fi
|
fi
|
||||||
|
|
||||||
|
# Ensure that pypi release has the right version
|
||||||
|
"$0" version
|
||||||
|
|
||||||
# Create and publish package for pypi
|
# Create and publish package for pypi
|
||||||
"$0" pypi-release
|
make helper=${helper} pypi-release
|
||||||
|
|
||||||
|
if [ "$run_as" = "build-helper" ]
|
||||||
|
then
|
||||||
|
# Archlinux release is based on pypi
|
||||||
|
make helper=${helper} archlinux-release
|
||||||
|
fi
|
||||||
|
|
||||||
# sign git tag
|
# sign git tag
|
||||||
printf "Enter upstream repository authentication token: "
|
printf "Enter upstream repository authentication token: "
|
||||||
read -r token
|
read token
|
||||||
"$0" sign-git-release "${target_version}" "${token}"
|
"$0" sign-git-release "${target_version}" "${token}"
|
||||||
|
|
||||||
# Announce change on ML
|
# Announce change on ML
|
||||||
"$0" ml-release "${target_version}"
|
make helper=${helper} ml-release
|
||||||
|
|
||||||
cat << eof
|
cat << eof
|
||||||
Manual steps post release:
|
Manual steps post release:
|
||||||
- cdist-web
|
- cdist-web
|
||||||
- send generated mailinglist.tmp mail
|
- twitter
|
||||||
eof
|
eof
|
||||||
;;
|
;;
|
||||||
|
|
||||||
test)
|
test)
|
||||||
if [ ! -f "cdist/version.py" ]
|
export PYTHONPATH="$(pwd -P)"
|
||||||
then
|
|
||||||
printf "cdist/version.py is missing, generate it first.\n"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
PYTHONPATH="$(pwd -P)"
|
|
||||||
export PYTHONPATH
|
|
||||||
|
|
||||||
if [ $# -lt 1 ]; then
|
if [ $# -lt 1 ]; then
|
||||||
python3 -m cdist.test
|
python3 -m cdist.test
|
||||||
|
|
@ -392,20 +370,12 @@ eof
|
||||||
;;
|
;;
|
||||||
|
|
||||||
test-remote)
|
test-remote)
|
||||||
if [ ! -f "cdist/version.py" ]
|
export PYTHONPATH="$(pwd -P)"
|
||||||
then
|
|
||||||
printf "cdist/version.py is missing, generate it first.\n"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
PYTHONPATH="$(pwd -P)"
|
|
||||||
export PYTHONPATH
|
|
||||||
|
|
||||||
python3 -m cdist.test.exec.remote
|
python3 -m cdist.test.exec.remote
|
||||||
;;
|
;;
|
||||||
|
|
||||||
pycodestyle|pep8)
|
pycodestyle|pep8)
|
||||||
pycodestyle "${basedir}" "${basedir}/bin/cdist"
|
pycodestyle "${basedir}" "${basedir}/scripts/cdist" | less
|
||||||
;;
|
;;
|
||||||
|
|
||||||
check-pycodestyle)
|
check-pycodestyle)
|
||||||
|
|
@ -413,9 +383,9 @@ eof
|
||||||
printf "\\nPlease review pycodestyle report.\\n"
|
printf "\\nPlease review pycodestyle report.\\n"
|
||||||
while true
|
while true
|
||||||
do
|
do
|
||||||
printf "Continue (yes/no)?\n"
|
echo "Continue (yes/no)?"
|
||||||
any=
|
any=
|
||||||
read -r any
|
read any
|
||||||
case "$any" in
|
case "$any" in
|
||||||
yes)
|
yes)
|
||||||
break
|
break
|
||||||
|
|
@ -424,97 +394,20 @@ eof
|
||||||
exit 1
|
exit 1
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
printf "Please answer with 'yes' or 'no' explicitly.\n"
|
echo "Please answer with 'yes' or 'no' explicitly."
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
done
|
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)
|
shellcheck)
|
||||||
errors=false
|
make helper=${helper} shellcheck
|
||||||
"$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"
|
printf "\\nPlease review shellcheck report.\\n"
|
||||||
while true
|
while true
|
||||||
do
|
do
|
||||||
printf "Continue (yes/no)?\n"
|
echo "Continue (yes/no)?"
|
||||||
any=
|
any=
|
||||||
read -r any
|
read any
|
||||||
case "$any" in
|
case "$any" in
|
||||||
yes)
|
yes)
|
||||||
break
|
break
|
||||||
|
|
@ -523,7 +416,7 @@ eof
|
||||||
exit 1
|
exit 1
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
printf "Please answer with 'yes' or 'no' explicitly.\n"
|
echo "Please answer with 'yes' or 'no' explicitly."
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
|
|
@ -534,40 +427,16 @@ eof
|
||||||
;;
|
;;
|
||||||
|
|
||||||
version)
|
version)
|
||||||
printf "VERSION = \"%s\"\n" "$(git describe)" > cdist/version.py
|
echo "VERSION = \"$(git describe)\"" > cdist/version.py
|
||||||
;;
|
;;
|
||||||
|
|
||||||
target-version)
|
target-version)
|
||||||
target_version=$($0 changelog-version)
|
target_version=$($0 changelog-version)
|
||||||
printf "VERSION = \"%s\"\n" "${target_version}" > cdist/version.py
|
echo "VERSION = \"${target_version}\"" > cdist/version.py
|
||||||
;;
|
;;
|
||||||
|
|
||||||
clean)
|
|
||||||
make clean
|
|
||||||
|
|
||||||
# Archlinux
|
|
||||||
rm -f cdist-*.pkg.tar.xz cdist-*.tar.gz
|
|
||||||
rm -rf pkg/ src/
|
|
||||||
|
|
||||||
rm -f MANIFEST PKGBUILD
|
|
||||||
rm -rf dist/
|
|
||||||
|
|
||||||
# Signed release
|
|
||||||
rm -f cdist-*.tar.gz
|
|
||||||
rm -f cdist-*.tar.gz.asc
|
|
||||||
|
|
||||||
# Temp files
|
|
||||||
rm -f ./*.tmp
|
|
||||||
rm -f ./.*.tmp
|
|
||||||
;;
|
|
||||||
|
|
||||||
distclean)
|
|
||||||
"$0" clean
|
|
||||||
rm -f cdist/version.py
|
|
||||||
;;
|
|
||||||
*)
|
*)
|
||||||
printf "Unknown target: '%s'.\n" "${option}" >&2
|
echo "Unknown helper target $@ - aborting"
|
||||||
usage "${basename}"
|
|
||||||
exit 1
|
exit 1
|
||||||
;;
|
;;
|
||||||
|
|
||||||
1
bin/build-helper.darko
Symbolic link
1
bin/build-helper.darko
Symbolic link
|
|
@ -0,0 +1 @@
|
||||||
|
build-helper
|
||||||
88
bin/cdist
88
bin/cdist
|
|
@ -1,8 +1,7 @@
|
||||||
#!/usr/bin/env python3
|
#!/bin/sh
|
||||||
# -*- coding: utf-8 -*-
|
# -*- coding: utf-8 -*-
|
||||||
#
|
#
|
||||||
# 2010-2016 Nico Schottelius (nico-cdist at schottelius.org)
|
# 2012 Nico Schottelius (nico-cdist at schottelius.org)
|
||||||
# 2016 Darko Poljak (darko.poljak at gmail.com)
|
|
||||||
#
|
#
|
||||||
# This file is part of cdist.
|
# This file is part of cdist.
|
||||||
#
|
#
|
||||||
|
|
@ -21,81 +20,14 @@
|
||||||
#
|
#
|
||||||
#
|
#
|
||||||
|
|
||||||
import logging
|
# Wrapper for real script to allow execution from checkout
|
||||||
import os
|
dir=${0%/*}
|
||||||
import sys
|
|
||||||
|
|
||||||
# See if this file's parent is cdist module
|
# Ensure version is present - the bundled/shipped version contains a static version,
|
||||||
# and if so add it to module search path.
|
# the git version contains a dynamic version
|
||||||
cdist_dir = os.path.realpath(
|
"$dir/build-helper" version
|
||||||
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)
|
|
||||||
|
|
||||||
import cdist # noqa 402
|
libdir=$(cd "${dir}/../" && pwd -P)
|
||||||
import cdist.argparse # noqa 402
|
export PYTHONPATH="${libdir}"
|
||||||
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
|
|
||||||
|
|
||||||
|
"$dir/../scripts/cdist" "$@"
|
||||||
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 < cdist.MIN_SUPPORTED_PYTHON_VERSION:
|
|
||||||
print('Python >= {} is required on the source host.'.format(
|
|
||||||
cdist.MIN_SUPPORTED_PYTHON_VERSIO), 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)
|
|
||||||
|
|
|
||||||
|
|
@ -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 <http://www.gnu.org/licenses/>.
|
|
||||||
#
|
|
||||||
"
|
|
||||||
|
|
||||||
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"
|
|
||||||
|
|
@ -22,27 +22,11 @@
|
||||||
|
|
||||||
import os
|
import os
|
||||||
import hashlib
|
import hashlib
|
||||||
import subprocess
|
|
||||||
|
|
||||||
import cdist.log
|
import cdist.log
|
||||||
|
import cdist.version
|
||||||
|
|
||||||
|
VERSION = cdist.version.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
|
|
||||||
|
|
||||||
BANNER = """
|
BANNER = """
|
||||||
.. . .x+=:. s
|
.. . .x+=:. s
|
||||||
|
|
@ -64,9 +48,6 @@ REMOTE_EXEC = "ssh -o User=root"
|
||||||
REMOTE_CMDS_CLEANUP_PATTERN = "ssh -o User=root -O exit -S {}"
|
REMOTE_CMDS_CLEANUP_PATTERN = "ssh -o User=root -O exit -S {}"
|
||||||
|
|
||||||
|
|
||||||
MIN_SUPPORTED_PYTHON_VERSION = '3.5'
|
|
||||||
|
|
||||||
|
|
||||||
class Error(Exception):
|
class Error(Exception):
|
||||||
"""Base exception class for this project"""
|
"""Base exception class for this project"""
|
||||||
pass
|
pass
|
||||||
|
|
|
||||||
|
|
@ -5,26 +5,21 @@ import logging
|
||||||
import collections
|
import collections
|
||||||
import functools
|
import functools
|
||||||
import cdist.configuration
|
import cdist.configuration
|
||||||
import cdist.log
|
|
||||||
import cdist.preos
|
|
||||||
import cdist.info
|
|
||||||
import cdist.scan.commandline
|
|
||||||
|
|
||||||
|
|
||||||
# set of beta sub-commands
|
# set of beta sub-commands
|
||||||
BETA_COMMANDS = set(('install', 'inventory', 'scan', ))
|
BETA_COMMANDS = set(('install', 'inventory', ))
|
||||||
# set of beta arguments for sub-commands
|
# set of beta arguments for sub-commands
|
||||||
BETA_ARGS = {
|
BETA_ARGS = {
|
||||||
'config': set(('tag', 'all_tagged_hosts', 'use_archiving', )),
|
'config': set(('tag', 'all_tagged_hosts', 'use_archiving', )),
|
||||||
}
|
}
|
||||||
EPILOG = "Get cdist at https://code.ungleich.ch/ungleich-public/cdist"
|
EPILOG = "Get cdist at http://www.nico.schottelius.org/software/cdist/"
|
||||||
# Parser others can reuse
|
# Parser others can reuse
|
||||||
parser = None
|
parser = None
|
||||||
|
|
||||||
|
|
||||||
_verbosity_level_off = -2
|
_verbosity_level_off = -2
|
||||||
_verbosity_level = {
|
_verbosity_level = {
|
||||||
None: logging.WARNING,
|
|
||||||
_verbosity_level_off: logging.OFF,
|
_verbosity_level_off: logging.OFF,
|
||||||
-1: logging.ERROR,
|
-1: logging.ERROR,
|
||||||
0: logging.WARNING,
|
0: logging.WARNING,
|
||||||
|
|
@ -106,7 +101,7 @@ def get_parsers():
|
||||||
name="log level"),
|
name="log level"),
|
||||||
help=('Set the specified verbosity level. '
|
help=('Set the specified verbosity level. '
|
||||||
'The levels, in order from the lowest to the highest, are: '
|
'The levels, in order from the lowest to the highest, are: '
|
||||||
'ERROR (-1), WARNING (0), INFO (1), VERBOSE (2), DEBUG (3), '
|
'ERROR (-1), WARNING (0), INFO (1), VERBOSE (2), DEBUG (3) '
|
||||||
'TRACE (4 or higher). If used along with -v then -v '
|
'TRACE (4 or higher). If used along with -v then -v '
|
||||||
'increases last set value and -l overwrites last set '
|
'increases last set value and -l overwrites last set '
|
||||||
'value.'),
|
'value.'),
|
||||||
|
|
@ -127,14 +122,6 @@ def get_parsers():
|
||||||
'value.'),
|
'value.'),
|
||||||
action='count', default=None)
|
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'] = argparse.ArgumentParser(add_help=False)
|
||||||
parser['beta'].add_argument(
|
parser['beta'].add_argument(
|
||||||
'-b', '--beta',
|
'-b', '--beta',
|
||||||
|
|
@ -207,13 +194,6 @@ def get_parsers():
|
||||||
'supported. Without argument CPU count is used by default. '),
|
'supported. Without argument CPU count is used by default. '),
|
||||||
action='store', dest='jobs',
|
action='store', dest='jobs',
|
||||||
const=multiprocessing.cpu_count())
|
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(
|
parser['config_main'].add_argument(
|
||||||
'-n', '--dry-run',
|
'-n', '--dry-run',
|
||||||
help='Do not execute code.', action='store_true')
|
help='Do not execute code.', action='store_true')
|
||||||
|
|
@ -274,7 +254,8 @@ def get_parsers():
|
||||||
'-f', '--file',
|
'-f', '--file',
|
||||||
help=('Read specified file for a list of additional hosts to '
|
help=('Read specified file for a list of additional hosts to '
|
||||||
'operate on or if \'-\' is given, read stdin (one host per '
|
'operate on or if \'-\' is given, read stdin (one host per '
|
||||||
'line).'),
|
'line). If no host or host file is specified then, by '
|
||||||
|
'default, read hosts from stdin.'),
|
||||||
dest='hostfile', required=False)
|
dest='hostfile', required=False)
|
||||||
parser['config_args'].add_argument(
|
parser['config_args'].add_argument(
|
||||||
'-p', '--parallel', nargs='?', metavar='HOST_MAX',
|
'-p', '--parallel', nargs='?', metavar='HOST_MAX',
|
||||||
|
|
@ -299,7 +280,6 @@ def get_parsers():
|
||||||
'host', nargs='*', help='Host(s) to operate on.')
|
'host', nargs='*', help='Host(s) to operate on.')
|
||||||
parser['config'] = parser['sub'].add_parser(
|
parser['config'] = parser['sub'].add_parser(
|
||||||
'config', parents=[parser['loglevel'], parser['beta'],
|
'config', parents=[parser['loglevel'], parser['beta'],
|
||||||
parser['colored_output'],
|
|
||||||
parser['common'],
|
parser['common'],
|
||||||
parser['config_main'],
|
parser['config_main'],
|
||||||
parser['inventory_common'],
|
parser['inventory_common'],
|
||||||
|
|
@ -318,7 +298,6 @@ def get_parsers():
|
||||||
|
|
||||||
parser['add-host'] = parser['invsub'].add_parser(
|
parser['add-host'] = parser['invsub'].add_parser(
|
||||||
'add-host', parents=[parser['loglevel'], parser['beta'],
|
'add-host', parents=[parser['loglevel'], parser['beta'],
|
||||||
parser['colored_output'],
|
|
||||||
parser['common'],
|
parser['common'],
|
||||||
parser['inventory_common']])
|
parser['inventory_common']])
|
||||||
parser['add-host'].add_argument(
|
parser['add-host'].add_argument(
|
||||||
|
|
@ -326,12 +305,13 @@ def get_parsers():
|
||||||
parser['add-host'].add_argument(
|
parser['add-host'].add_argument(
|
||||||
'-f', '--file',
|
'-f', '--file',
|
||||||
help=('Read additional hosts to add from specified file '
|
help=('Read additional hosts to add from specified file '
|
||||||
'or from stdin if \'-\' (each host on separate line). '),
|
'or from stdin if \'-\' (each host on separate line). '
|
||||||
|
'If no host or host file is specified then, by default, '
|
||||||
|
'read from stdin.'),
|
||||||
dest='hostfile', required=False)
|
dest='hostfile', required=False)
|
||||||
|
|
||||||
parser['add-tag'] = parser['invsub'].add_parser(
|
parser['add-tag'] = parser['invsub'].add_parser(
|
||||||
'add-tag', parents=[parser['loglevel'], parser['beta'],
|
'add-tag', parents=[parser['loglevel'], parser['beta'],
|
||||||
parser['colored_output'],
|
|
||||||
parser['common'],
|
parser['common'],
|
||||||
parser['inventory_common']])
|
parser['inventory_common']])
|
||||||
parser['add-tag'].add_argument(
|
parser['add-tag'].add_argument(
|
||||||
|
|
@ -340,12 +320,20 @@ def get_parsers():
|
||||||
parser['add-tag'].add_argument(
|
parser['add-tag'].add_argument(
|
||||||
'-f', '--file',
|
'-f', '--file',
|
||||||
help=('Read additional hosts to add tags from specified file '
|
help=('Read additional hosts to add tags from specified file '
|
||||||
'or from stdin if \'-\' (each host on separate line). '),
|
'or from stdin if \'-\' (each host on separate line). '
|
||||||
|
'If no host or host file is specified then, by default, '
|
||||||
|
'read from stdin. If no tags/tagfile nor hosts/hostfile'
|
||||||
|
' are specified then tags are read from stdin and are'
|
||||||
|
' added to all hosts.'),
|
||||||
dest='hostfile', required=False)
|
dest='hostfile', required=False)
|
||||||
parser['add-tag'].add_argument(
|
parser['add-tag'].add_argument(
|
||||||
'-T', '--tag-file',
|
'-T', '--tag-file',
|
||||||
help=('Read additional tags to add from specified file '
|
help=('Read additional tags to add from specified file '
|
||||||
'or from stdin if \'-\' (each tag on separate line). '),
|
'or from stdin if \'-\' (each tag on separate line). '
|
||||||
|
'If no tag or tag file is specified then, by default, '
|
||||||
|
'read from stdin. If no tags/tagfile nor hosts/hostfile'
|
||||||
|
' are specified then tags are read from stdin and are'
|
||||||
|
' added to all hosts.'),
|
||||||
dest='tagfile', required=False)
|
dest='tagfile', required=False)
|
||||||
parser['add-tag'].add_argument(
|
parser['add-tag'].add_argument(
|
||||||
'-t', '--taglist',
|
'-t', '--taglist',
|
||||||
|
|
@ -355,7 +343,6 @@ def get_parsers():
|
||||||
|
|
||||||
parser['del-host'] = parser['invsub'].add_parser(
|
parser['del-host'] = parser['invsub'].add_parser(
|
||||||
'del-host', parents=[parser['loglevel'], parser['beta'],
|
'del-host', parents=[parser['loglevel'], parser['beta'],
|
||||||
parser['colored_output'],
|
|
||||||
parser['common'],
|
parser['common'],
|
||||||
parser['inventory_common']])
|
parser['inventory_common']])
|
||||||
parser['del-host'].add_argument(
|
parser['del-host'].add_argument(
|
||||||
|
|
@ -366,12 +353,13 @@ def get_parsers():
|
||||||
parser['del-host'].add_argument(
|
parser['del-host'].add_argument(
|
||||||
'-f', '--file',
|
'-f', '--file',
|
||||||
help=('Read additional hosts to delete from specified file '
|
help=('Read additional hosts to delete from specified file '
|
||||||
'or from stdin if \'-\' (each host on separate line). '),
|
'or from stdin if \'-\' (each host on separate line). '
|
||||||
|
'If no host or host file is specified then, by default, '
|
||||||
|
'read from stdin.'),
|
||||||
dest='hostfile', required=False)
|
dest='hostfile', required=False)
|
||||||
|
|
||||||
parser['del-tag'] = parser['invsub'].add_parser(
|
parser['del-tag'] = parser['invsub'].add_parser(
|
||||||
'del-tag', parents=[parser['loglevel'], parser['beta'],
|
'del-tag', parents=[parser['loglevel'], parser['beta'],
|
||||||
parser['colored_output'],
|
|
||||||
parser['common'],
|
parser['common'],
|
||||||
parser['inventory_common']])
|
parser['inventory_common']])
|
||||||
parser['del-tag'].add_argument(
|
parser['del-tag'].add_argument(
|
||||||
|
|
@ -384,13 +372,20 @@ def get_parsers():
|
||||||
parser['del-tag'].add_argument(
|
parser['del-tag'].add_argument(
|
||||||
'-f', '--file',
|
'-f', '--file',
|
||||||
help=('Read additional hosts to delete tags for from specified '
|
help=('Read additional hosts to delete tags for from specified '
|
||||||
'file or from stdin if \'-\' (each host on separate '
|
'file or from stdin if \'-\' (each host on separate line). '
|
||||||
'line). '),
|
'If no host or host file is specified then, by default, '
|
||||||
|
'read from stdin. If no tags/tagfile nor hosts/hostfile'
|
||||||
|
' are specified then tags are read from stdin and are'
|
||||||
|
' deleted from all hosts.'),
|
||||||
dest='hostfile', required=False)
|
dest='hostfile', required=False)
|
||||||
parser['del-tag'].add_argument(
|
parser['del-tag'].add_argument(
|
||||||
'-T', '--tag-file',
|
'-T', '--tag-file',
|
||||||
help=('Read additional tags from specified file '
|
help=('Read additional tags from specified file '
|
||||||
'or from stdin if \'-\' (each tag on separate line). '),
|
'or from stdin if \'-\' (each tag on separate line). '
|
||||||
|
'If no tag or tag file is specified then, by default, '
|
||||||
|
'read from stdin. If no tags/tagfile nor'
|
||||||
|
' hosts/hostfile are specified then tags are read from'
|
||||||
|
' stdin and are added to all hosts.'),
|
||||||
dest='tagfile', required=False)
|
dest='tagfile', required=False)
|
||||||
parser['del-tag'].add_argument(
|
parser['del-tag'].add_argument(
|
||||||
'-t', '--taglist',
|
'-t', '--taglist',
|
||||||
|
|
@ -400,7 +395,6 @@ def get_parsers():
|
||||||
|
|
||||||
parser['list'] = parser['invsub'].add_parser(
|
parser['list'] = parser['invsub'].add_parser(
|
||||||
'list', parents=[parser['loglevel'], parser['beta'],
|
'list', parents=[parser['loglevel'], parser['beta'],
|
||||||
parser['colored_output'],
|
|
||||||
parser['common'],
|
parser['common'],
|
||||||
parser['inventory_common']])
|
parser['inventory_common']])
|
||||||
parser['list'].add_argument(
|
parser['list'].add_argument(
|
||||||
|
|
@ -428,78 +422,15 @@ def get_parsers():
|
||||||
parser['inventory'].set_defaults(
|
parser['inventory'].set_defaults(
|
||||||
func=cdist.inventory.Inventory.commandline)
|
func=cdist.inventory.Inventory.commandline)
|
||||||
|
|
||||||
# PreOS
|
|
||||||
parser['preos'] = parser['sub'].add_parser('preos', add_help=False)
|
|
||||||
|
|
||||||
# Shell
|
# Shell
|
||||||
parser['shell'] = parser['sub'].add_parser(
|
parser['shell'] = parser['sub'].add_parser(
|
||||||
'shell', parents=[parser['loglevel'], parser['colored_output']])
|
'shell', parents=[parser['loglevel']])
|
||||||
parser['shell'].add_argument(
|
parser['shell'].add_argument(
|
||||||
'-s', '--shell',
|
'-s', '--shell',
|
||||||
help=('Select shell to use, defaults to current shell. Used shell'
|
help=('Select shell to use, defaults to current shell. Used shell'
|
||||||
' should be POSIX compatible shell.'))
|
' should be POSIX compatible shell.'))
|
||||||
parser['shell'].set_defaults(func=cdist.shell.Shell.commandline)
|
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'])
|
|
||||||
parser['scan'].add_argument(
|
|
||||||
'--config',
|
|
||||||
action='store_true',
|
|
||||||
help='Try to configure detected hosts')
|
|
||||||
parser['scan'].add_argument(
|
|
||||||
'-I', '--interfaces',
|
|
||||||
action='append', default=[],
|
|
||||||
help='On which interfaces to scan/trigger')
|
|
||||||
parser['scan'].add_argument(
|
|
||||||
'-d', '--delay',
|
|
||||||
action='store', default=3600,
|
|
||||||
help='How long to wait before reconfiguring after last try')
|
|
||||||
parser['scan'].set_defaults(func=cdist.scan.commandline.commandline)
|
|
||||||
|
|
||||||
for p in parser:
|
for p in parser:
|
||||||
parser[p].epilog = EPILOG
|
parser[p].epilog = EPILOG
|
||||||
|
|
||||||
|
|
@ -510,12 +441,7 @@ def handle_loglevel(args):
|
||||||
if hasattr(args, 'quiet') and args.quiet:
|
if hasattr(args, 'quiet') and args.quiet:
|
||||||
args.verbose = _verbosity_level_off
|
args.verbose = _verbosity_level_off
|
||||||
|
|
||||||
logging.getLogger().setLevel(_verbosity_level[args.verbose])
|
logging.root.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):
|
def parse_and_configure(argv, singleton=True):
|
||||||
|
|
@ -529,7 +455,6 @@ def parse_and_configure(argv, singleton=True):
|
||||||
raise cdist.Error(str(e))
|
raise cdist.Error(str(e))
|
||||||
# Loglevels are handled globally in here
|
# Loglevels are handled globally in here
|
||||||
handle_loglevel(args)
|
handle_loglevel(args)
|
||||||
handle_log_colors(args)
|
|
||||||
|
|
||||||
log = logging.getLogger("cdist")
|
log = logging.getLogger("cdist")
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -32,11 +32,6 @@ case "$os" in
|
||||||
sysctl -n hw.ncpuonline
|
sysctl -n hw.ncpuonline
|
||||||
;;
|
;;
|
||||||
|
|
||||||
"freebsd"|"netbsd")
|
|
||||||
PATH=$(getconf PATH)
|
|
||||||
sysctl -n hw.ncpu
|
|
||||||
;;
|
|
||||||
|
|
||||||
*)
|
*)
|
||||||
if [ -r /proc/cpuinfo ]; then
|
if [ -r /proc/cpuinfo ]; then
|
||||||
cores="$(grep "core id" /proc/cpuinfo | sort | uniq | wc -l)"
|
cores="$(grep "core id" /proc/cpuinfo | sort | uniq | wc -l)"
|
||||||
|
|
|
||||||
|
|
@ -1,66 +1,27 @@
|
||||||
#!/bin/sh -e
|
#!/bin/sh
|
||||||
#
|
|
||||||
# based on previous work by other people, modified by:
|
|
||||||
# 2020 Dennis Camera <dennis.camera at ssrq-sds-fds.ch>
|
|
||||||
#
|
|
||||||
# This file is part of cdist.
|
|
||||||
#
|
|
||||||
# cdist is free software: you can redistribute it and/or modify
|
|
||||||
# it under the terms of the GNU General Public License as published by
|
|
||||||
# the Free Software Foundation, either version 3 of the License, or
|
|
||||||
# (at your option) any later version.
|
|
||||||
#
|
|
||||||
# cdist is distributed in the hope that it will be useful,
|
|
||||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
# GNU General Public License for more details.
|
|
||||||
#
|
|
||||||
# You should have received a copy of the GNU General Public License
|
|
||||||
# along with cdist. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
#
|
|
||||||
# Finds disks of the system (excl. ram disks, floppy, cdrom)
|
|
||||||
|
|
||||||
uname_s="$(uname -s)"
|
uname_s="$(uname -s)"
|
||||||
|
|
||||||
case $uname_s in
|
case "${uname_s}" in
|
||||||
FreeBSD)
|
FreeBSD)
|
||||||
sysctl -n kern.disks
|
sysctl -n kern.disks
|
||||||
;;
|
;;
|
||||||
OpenBSD)
|
OpenBSD|NetBSD)
|
||||||
sysctl -n hw.disknames | grep -Eo '[lsw]d[0-9]+'
|
sysctl -n hw.disknames | grep -Eo '[lsw]d[0-9]+' | xargs
|
||||||
;;
|
|
||||||
NetBSD)
|
|
||||||
PATH=$(getconf PATH)
|
|
||||||
sysctl -n hw.disknames | awk -v RS=' ' '/^[lsw]d[0-9]+/'
|
|
||||||
;;
|
;;
|
||||||
Linux)
|
Linux)
|
||||||
# list of major device numbers toexclude:
|
if command -v lsblk > /dev/null
|
||||||
# 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
|
then
|
||||||
lsblk -e "$(echo "$ign_majors" | tr ' ' ',')" -dno name
|
# exclude ram disks, floppies and cdroms
|
||||||
elif test -d /sys/block/
|
# https://www.kernel.org/doc/Documentation/admin-guide/devices.txt
|
||||||
then
|
lsblk -e 1,2,11 -dno name | xargs
|
||||||
# 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
|
else
|
||||||
echo "Don't know how to list disks on Linux without lsblk and sysfs." >&2
|
printf "Don't know how to list disks for %s operating system without lsblk, if you can please submit a patch\n" "${uname_s}" >&2
|
||||||
echo 'If you can, please submit a patch.'>&2
|
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
printf "Don't know how to list disks for %s operating system.\n" "${uname_s}" >&2
|
printf "Don't know how to list disks for %s operating system, if you can please submit a patch\n" "${uname_s}" >&2
|
||||||
printf 'If you can please submit a patch\n' >&2
|
|
||||||
;;
|
;;
|
||||||
esac \
|
esac
|
||||||
| xargs
|
|
||||||
|
exit 0
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
#!/bin/sh
|
#!/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.
|
# This file is part of cdist.
|
||||||
#
|
#
|
||||||
|
|
@ -18,12 +19,7 @@
|
||||||
# along with cdist. If not, see <http://www.gnu.org/licenses/>.
|
# along with cdist. If not, see <http://www.gnu.org/licenses/>.
|
||||||
#
|
#
|
||||||
#
|
#
|
||||||
# Retrieve the running hostname
|
|
||||||
#
|
|
||||||
|
|
||||||
if command -v hostname >/dev/null
|
if command -v uname >/dev/null; then
|
||||||
then
|
uname -n
|
||||||
hostname
|
|
||||||
else
|
|
||||||
uname -n
|
|
||||||
fi
|
fi
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,7 @@
|
||||||
#!/bin/sh -e
|
#!/bin/sh
|
||||||
#
|
#
|
||||||
# 2016 Daniel Heule (hda at sfs.biz)
|
# 2016 Daniel Heule (hda at sfs.biz)
|
||||||
# Copyright 2017, Philippe Gregoire <pg@pgregoire.xyz>
|
# Copyright 2017, Philippe Gregoire <pg@pgregoire.xyz>
|
||||||
# 2020 Dennis Camera (dennis.camera at ssrq-sds-fds.ch)
|
|
||||||
#
|
#
|
||||||
# This file is part of cdist.
|
# This file is part of cdist.
|
||||||
#
|
#
|
||||||
|
|
@ -20,423 +19,21 @@
|
||||||
# along with cdist. If not, see <http://www.gnu.org/licenses/>.
|
# along with cdist. If not, see <http://www.gnu.org/licenses/>.
|
||||||
#
|
#
|
||||||
#
|
#
|
||||||
# Returns the name of the init system (PID 1)
|
# Returns the process name of pid 1 ( normaly the init system )
|
||||||
|
# for example at linux this value is "init" or "systemd" in most cases
|
||||||
# Expected values:
|
|
||||||
# Linux:
|
|
||||||
# Adélie Linux:
|
|
||||||
# sysvinit+openrc
|
|
||||||
# Alpine Linux:
|
|
||||||
# busybox-init+openrc
|
|
||||||
# ArchLinux:
|
|
||||||
# systemd, sysvinit
|
|
||||||
# CRUX:
|
|
||||||
# sysvinit
|
|
||||||
# Debian:
|
|
||||||
# systemd, upstart, sysvinit, openrc, ???
|
|
||||||
# Devuan:
|
|
||||||
# sysvinit, sysvinit+openrc
|
|
||||||
# Gentoo:
|
|
||||||
# sysvinit+openrc, openrc-init, systemd
|
|
||||||
# OpenBMC:
|
|
||||||
# systemd
|
|
||||||
# OpenWrt:
|
|
||||||
# procd, init???
|
|
||||||
# RedHat (RHEL, CentOS, Fedora, RedHat Linux, ...):
|
|
||||||
# systemd, upstart, upstart-legacy, sysvinit
|
|
||||||
# Slackware:
|
|
||||||
# sysvinit
|
|
||||||
# SuSE:
|
|
||||||
# systemd, sysvinit
|
|
||||||
# Ubuntu:
|
|
||||||
# systemd, upstart, upstart-legacy, sysvinit
|
|
||||||
# VoidLinux:
|
|
||||||
# runit
|
|
||||||
#
|
#
|
||||||
# GNU:
|
|
||||||
# Debian:
|
|
||||||
# sysvinit, hurd-init
|
|
||||||
#
|
|
||||||
# BSD:
|
|
||||||
# {Free,Open,Net}BSD:
|
|
||||||
# init
|
|
||||||
#
|
|
||||||
# Mac OS X:
|
|
||||||
# launchd, init+SystemStarter
|
|
||||||
#
|
|
||||||
# Solaris/Illumos:
|
|
||||||
# smf, init???
|
|
||||||
|
|
||||||
# NOTE: init systems can be stacked. This is popular to run OpenRC on top of
|
uname_s="$(uname -s)"
|
||||||
# sysvinit (Gentoo) or busybox-init (Alpine), but can also be used to run runit
|
|
||||||
# as a systemd service. This makes init system detection very complicated
|
|
||||||
# (which result is expected?) This script tries to untangle some combinations,
|
|
||||||
# OpenRC on top of sysv or busybox (X+openrc), but will ignore others (runit as
|
|
||||||
# a systemd service)
|
|
||||||
|
|
||||||
# NOTE: When we have no idea, nothing will be printed!
|
case "$uname_s" in
|
||||||
|
Linux)
|
||||||
# NOTE:
|
(pgrep -P0 -l | awk '/^1[ \t]/ {print $2;}') || true
|
||||||
# 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
|
FreeBSD|OpenBSD)
|
||||||
# of the system which we don't want (e.g. embedded systems).
|
ps -o comm= -p 1 || true
|
||||||
|
;;
|
||||||
|
*)
|
||||||
set -e
|
# return a empty string as unknown value
|
||||||
|
echo ""
|
||||||
KERNEL_NAME=$(uname -s)
|
;;
|
||||||
|
esac
|
||||||
KNOWN_INIT_SYSTEMS=$(cat <<EOF
|
|
||||||
systemd
|
|
||||||
sysvinit
|
|
||||||
upstart
|
|
||||||
runit
|
|
||||||
procd
|
|
||||||
smf
|
|
||||||
launchd
|
|
||||||
init
|
|
||||||
hurd_init
|
|
||||||
systemstarter
|
|
||||||
EOF
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
common_candidates_by_kernel() {
|
|
||||||
case $KERNEL_NAME
|
|
||||||
in
|
|
||||||
FreeBSD|NetBSD|OpenBSD)
|
|
||||||
echo init
|
|
||||||
;;
|
|
||||||
Linux)
|
|
||||||
echo systemd
|
|
||||||
echo sysvinit
|
|
||||||
echo upstart
|
|
||||||
;;
|
|
||||||
GNU)
|
|
||||||
echo sysvinit
|
|
||||||
echo hurd-init
|
|
||||||
;;
|
|
||||||
Darwin)
|
|
||||||
echo launchd
|
|
||||||
echo systemstarter
|
|
||||||
;;
|
|
||||||
SunOS)
|
|
||||||
echo smf
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
## Helpers
|
|
||||||
|
|
||||||
trim() {
|
|
||||||
sed -e 's/^[[:blank:]]*//' -e 's/[[:blank:]]*$//' -e '/^[[:blank:]]*$/d'
|
|
||||||
}
|
|
||||||
|
|
||||||
unique() {
|
|
||||||
# Delete duplicate lines (keeping input order)
|
|
||||||
# NOTE: Solaris AWK breaks without if/print construct.
|
|
||||||
awk '{ if (!x[$0]++) print }'
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
## Check functions
|
|
||||||
# These functions are used to verify if a guess is correct by checking some
|
|
||||||
# common property of a running system (presence of a directory in /run etc.)
|
|
||||||
|
|
||||||
check_busybox_init() (
|
|
||||||
busybox_path=${1:-/bin/busybox}
|
|
||||||
test -x "${busybox_path}" || return 1
|
|
||||||
grep -q 'BusyBox v[0-9]' "${busybox_path}" || return 1
|
|
||||||
|
|
||||||
# It is quite common to use Busybox init to stack other init systemd
|
|
||||||
# (like OpenRC) on top of it. So we check for that, too.
|
|
||||||
if stacked=$(check_openrc)
|
|
||||||
then
|
|
||||||
echo "busybox-init+${stacked}"
|
|
||||||
else
|
|
||||||
echo busybox-init
|
|
||||||
fi
|
|
||||||
)
|
|
||||||
|
|
||||||
check_hurd_init() (
|
|
||||||
init_exe=${1:-/hurd/init}
|
|
||||||
test -x "${init_exe}" || return 1
|
|
||||||
grep -q 'GNU Hurd' "${init_exe}" || return 1
|
|
||||||
echo hurd-init
|
|
||||||
)
|
|
||||||
|
|
||||||
check_init() {
|
|
||||||
# Checks for various BSD inits...
|
|
||||||
test -x /sbin/init || return 1
|
|
||||||
|
|
||||||
if grep -q -E '(Free|Net|Open)BSD' /sbin/init
|
|
||||||
then
|
|
||||||
echo init
|
|
||||||
return 0
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
check_launchd() {
|
|
||||||
command -v launchctl >/dev/null 2>&1 || return 1
|
|
||||||
launchctl getenv PATH >/dev/null || return 1
|
|
||||||
echo launchd
|
|
||||||
}
|
|
||||||
|
|
||||||
check_openrc() {
|
|
||||||
test -f /run/openrc/softlevel || return 1
|
|
||||||
echo openrc
|
|
||||||
}
|
|
||||||
|
|
||||||
check_procd() (
|
|
||||||
procd_path=${1:-/sbin/procd}
|
|
||||||
test -x "${procd_path}" || return 1
|
|
||||||
grep -q 'procd' "${procd_path}" || return 1
|
|
||||||
echo procd
|
|
||||||
)
|
|
||||||
|
|
||||||
check_runit() {
|
|
||||||
test -d /run/runit || return 1
|
|
||||||
echo runit
|
|
||||||
}
|
|
||||||
|
|
||||||
check_smf() {
|
|
||||||
# XXX: Is this the correct way??
|
|
||||||
test -f /etc/svc/volatile/svc_nonpersist.db || return 1
|
|
||||||
echo smf
|
|
||||||
}
|
|
||||||
|
|
||||||
check_systemd() {
|
|
||||||
# NOTE: sd_booted(3)
|
|
||||||
test -d /run/systemd/system/ || return 1
|
|
||||||
# systemctl --version | sed -e '/^systemd/!d;s/^systemd //'
|
|
||||||
echo systemd
|
|
||||||
}
|
|
||||||
|
|
||||||
check_systemstarter() {
|
|
||||||
test -d /System/Library/StartupItems/ || return 1
|
|
||||||
test -f /System/Library/StartupItems/LoginWindow/StartupParameters.plist || return 1
|
|
||||||
echo init+SystemStarter
|
|
||||||
}
|
|
||||||
|
|
||||||
check_sysvinit() (
|
|
||||||
init_path=${1:-/sbin/init}
|
|
||||||
test -x "${init_path}" || return 1
|
|
||||||
grep -q 'INIT_VERSION=sysvinit-[0-9.]*' "${init_path}" || return 1
|
|
||||||
|
|
||||||
# It is quite common to use SysVinit to stack other init systemd
|
|
||||||
# (like OpenRC) on top of it. So we check for that, too.
|
|
||||||
if stacked=$(check_openrc)
|
|
||||||
then
|
|
||||||
echo "sysvinit+${stacked}"
|
|
||||||
else
|
|
||||||
echo sysvinit
|
|
||||||
fi
|
|
||||||
unset stacked
|
|
||||||
)
|
|
||||||
|
|
||||||
check_upstart() {
|
|
||||||
test -x "$(command -v initctl)" || return 1
|
|
||||||
case $(initctl version)
|
|
||||||
in
|
|
||||||
*'(upstart '*')')
|
|
||||||
if test -d /etc/init
|
|
||||||
then
|
|
||||||
# modern (DBus-based?) upstart >= 0.5
|
|
||||||
echo upstart
|
|
||||||
elif test -d /etc/event.d
|
|
||||||
then
|
|
||||||
# ancient upstart
|
|
||||||
echo upstart-legacy
|
|
||||||
else
|
|
||||||
# whatever...
|
|
||||||
echo upstart
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
return 1
|
|
||||||
;;
|
|
||||||
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
|
|
||||||
|
|
|
||||||
|
|
@ -18,11 +18,13 @@
|
||||||
# along with cdist. If not, see <http://www.gnu.org/licenses/>.
|
# along with cdist. If not, see <http://www.gnu.org/licenses/>.
|
||||||
#
|
#
|
||||||
|
|
||||||
if command -v ip >/dev/null
|
if command -v ip > /dev/null
|
||||||
then
|
then
|
||||||
ip -o link show | sed -n 's/^[0-9]\+: \(.\+\): <.*/\1/p'
|
ip -o link show | sed -n 's/^[0-9]\+: \(.\+\): <.*/\1/p'
|
||||||
elif command -v ifconfig >/dev/null
|
|
||||||
|
elif command -v ifconfig > /dev/null
|
||||||
then
|
then
|
||||||
ifconfig -a | sed -n -E 's/^(.*)(:[[:space:]]*flags=|Link encap).*/\1/p'
|
ifconfig -a \
|
||||||
fi \
|
| sed -n -E 's/^(.*)(:[[:space:]]*flags=|Link encap).*/\1/p' \
|
||||||
| sort -u
|
| sort -u
|
||||||
|
fi
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,6 @@
|
||||||
#
|
#
|
||||||
# 2014 Daniel Heule (hda at sfs.biz)
|
# 2014 Daniel Heule (hda at sfs.biz)
|
||||||
# 2014 Thomas Oettli (otho at sfs.biz)
|
# 2014 Thomas Oettli (otho at sfs.biz)
|
||||||
# 2020 Evilham (contact at evilham.com)
|
|
||||||
#
|
#
|
||||||
# This file is part of cdist.
|
# This file is part of cdist.
|
||||||
#
|
#
|
||||||
|
|
@ -19,91 +18,63 @@
|
||||||
# You should have received a copy of the GNU General Public License
|
# You should have received a copy of the GNU General Public License
|
||||||
# along with cdist. If not, see <http://www.gnu.org/licenses/>.
|
# along with cdist. If not, see <http://www.gnu.org/licenses/>.
|
||||||
#
|
#
|
||||||
|
#
|
||||||
|
|
||||||
os=$("$__explorer/os")
|
# FIXME: other system types (not linux ...)
|
||||||
|
|
||||||
vendor_string_to_machine_type() {
|
if [ -d "/proc/vz" ] && [ ! -d "/proc/bc" ]; then
|
||||||
for vendor in vmware bochs kvm qemu virtualbox bhyve; do
|
echo openvz
|
||||||
if echo "${1}" | grep -q -i "${vendor}"; then
|
exit
|
||||||
if [ "${vendor}" = "bochs" ] || [ "${vendor}" = "qemu" ]; then
|
fi
|
||||||
vendor="kvm"
|
|
||||||
|
if [ -e "/proc/1/environ" ] &&
|
||||||
|
tr '\000' '\n' < "/proc/1/environ" | grep -Eiq '^container='; then
|
||||||
|
echo lxc
|
||||||
|
exit
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ -r /proc/cpuinfo ]; then
|
||||||
|
# this should only exist on virtual guest machines,
|
||||||
|
# tested on vmware, xen, kvm
|
||||||
|
if grep -q "hypervisor" /proc/cpuinfo; then
|
||||||
|
# this file is aviable in xen guest systems
|
||||||
|
if [ -r /sys/hypervisor/type ]; then
|
||||||
|
if grep -q -i "xen" /sys/hypervisor/type; then
|
||||||
|
echo virtual_by_xen
|
||||||
|
exit
|
||||||
fi
|
fi
|
||||||
echo "virtual_by_${vendor}"
|
else
|
||||||
exit
|
if [ -r /sys/class/dmi/id/product_name ]; then
|
||||||
fi
|
if grep -q -i 'vmware' /sys/class/dmi/id/product_name; then
|
||||||
done
|
echo "virtual_by_vmware"
|
||||||
}
|
exit
|
||||||
|
elif grep -q -i 'bochs' /sys/class/dmi/id/product_name; then
|
||||||
case "$os" in
|
echo "virtual_by_kvm"
|
||||||
"freebsd")
|
exit
|
||||||
# FreeBSD does not have /proc/cpuinfo even when procfs is used.
|
elif grep -q -i 'virtualbox' /sys/class/dmi/id/product_name; then
|
||||||
# Instead there is a sysctl kern.vm_guest.
|
echo "virtual_by_virtualbox"
|
||||||
# Which is 'none' if physical, else the virtualisation.
|
exit
|
||||||
vm_guest="$(sysctl -n kern.vm_guest 2>/dev/null || true)"
|
|
||||||
if [ -n "${vm_guest}" ]; then
|
|
||||||
if [ "${vm_guest}" = "none" ]; then
|
|
||||||
echo "physical"
|
|
||||||
exit
|
|
||||||
fi
|
|
||||||
echo "virtual_by_${vm_guest}"
|
|
||||||
exit
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
|
|
||||||
"openbsd")
|
|
||||||
# OpenBSD can also use the sysctl's: hw.vendor or hw.product.
|
|
||||||
# Note we can be reasonably sure about a machine being virtualised
|
|
||||||
# as long as we can identify the virtualisation technology.
|
|
||||||
# But not so much about it being physical...
|
|
||||||
# Patches are welcome / reach out if you have better ideas.
|
|
||||||
for sysctl in hw.vendor hw.product; do
|
|
||||||
# This exits if we can make a reasonable judgement
|
|
||||||
vendor_string_to_machine_type "$(sysctl -n "${sysctl}")"
|
|
||||||
done
|
|
||||||
;;
|
|
||||||
|
|
||||||
*)
|
|
||||||
# Defaulting to linux for compatibility with previous cdist behaviour
|
|
||||||
|
|
||||||
if [ -d "/proc/vz" ] && [ ! -d "/proc/bc" ]; then
|
|
||||||
echo openvz
|
|
||||||
exit
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -e "/proc/1/environ" ] &&
|
|
||||||
tr '\000' '\n' < "/proc/1/environ" | grep -Eiq '^container='; then
|
|
||||||
echo lxc
|
|
||||||
exit
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -r /proc/cpuinfo ]; then
|
|
||||||
# this should only exist on virtual guest machines,
|
|
||||||
# tested on vmware, xen, kvm, bhyve
|
|
||||||
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
|
|
||||||
for vendor_file in /sys/class/dmi/id/product_name \
|
|
||||||
/sys/class/dmi/id/sys_vendor \
|
|
||||||
/sys/class/dmi/id/chasis_vendor; do
|
|
||||||
if [ -r ${vendor_file} ]; then
|
|
||||||
# This exits if we can make a reasonable judgement
|
|
||||||
vendor_string_to_machine_type "$(cat "${vendor_file}")"
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
fi
|
fi
|
||||||
echo "virtual_by_unknown"
|
|
||||||
exit
|
|
||||||
else
|
|
||||||
echo "physical"
|
|
||||||
exit
|
|
||||||
fi
|
fi
|
||||||
fi
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
echo "unknown"
|
if [ -r /sys/class/dmi/id/sys_vendor ]; then
|
||||||
|
if grep -q -i 'qemu' /sys/class/dmi/id/sys_vendor; then
|
||||||
|
echo "virtual_by_kvm"
|
||||||
|
exit
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ -r /sys/class/dmi/id/chassis_vendor ]; then
|
||||||
|
if grep -q -i 'qemu' /sys/class/dmi/id/chassis_vendor; then
|
||||||
|
echo "virtual_by_kvm"
|
||||||
|
exit
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
echo "virtual_by_unknown"
|
||||||
|
else
|
||||||
|
echo "physical"
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
echo "unknown"
|
||||||
|
fi
|
||||||
|
|
|
||||||
|
|
@ -29,8 +29,7 @@ case "$os" in
|
||||||
echo "$(sysctl -n hw.memsize)/1024" | bc
|
echo "$(sysctl -n hw.memsize)/1024" | bc
|
||||||
;;
|
;;
|
||||||
|
|
||||||
*"bsd")
|
"openbsd")
|
||||||
PATH=$(getconf PATH)
|
|
||||||
echo "$(sysctl -n hw.physmem) / 1048576" | bc
|
echo "$(sysctl -n hw.physmem) / 1048576" | bc
|
||||||
;;
|
;;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -143,16 +143,9 @@ case "$uname_s" in
|
||||||
esac
|
esac
|
||||||
|
|
||||||
if [ -f /etc/os-release ]; then
|
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:
|
# already lowercase, according to:
|
||||||
# https://www.freedesktop.org/software/systemd/man/os-release.html
|
# https://www.freedesktop.org/software/systemd/man/os-release.html
|
||||||
awk -F= '/^ID=/ { if ($2 ~ /^'"'"'(.*)'"'"'$/ || $2 ~ /^"(.*)"$/) { print substr($2, 2, length($2) - 2) } else { print $2 } }' /etc/os-release
|
awk -F= '/^ID=/ {print $2;}' /etc/os-release
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
#
|
#
|
||||||
# 2018 Adam Dej (dejko.a at gmail.com)
|
# 2018 Adam Dej (dejko.a at gmail.com)
|
||||||
# 2020 Dennis Camera (dennis.camera at ssrq-sds-fds.ch)
|
|
||||||
#
|
#
|
||||||
# This file is part of cdist.
|
# This file is part of cdist.
|
||||||
#
|
#
|
||||||
|
|
@ -22,17 +21,6 @@
|
||||||
|
|
||||||
# See os-release(5) and http://0pointer.de/blog/projects/os-release
|
# See os-release(5) and http://0pointer.de/blog/projects/os-release
|
||||||
|
|
||||||
if test -f /etc/os-release
|
set +e
|
||||||
then
|
|
||||||
# Linux and FreeBSD (usually a symlink)
|
|
||||||
cat /etc/os-release
|
|
||||||
elif test -f /usr/lib/os-release
|
|
||||||
then
|
|
||||||
# systemd
|
|
||||||
cat /usr/lib/os-release
|
|
||||||
elif test -f /var/run/os-release
|
|
||||||
then
|
|
||||||
# FreeBSD (created by os-release service)
|
|
||||||
cat /var/run/os-release
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
cat /etc/os-release || cat /usr/lib/os-release || true
|
||||||
|
|
|
||||||
|
|
@ -31,32 +31,7 @@ case "$("$__explorer/os")" in
|
||||||
cat /etc/arch-release
|
cat /etc/arch-release
|
||||||
;;
|
;;
|
||||||
debian)
|
debian)
|
||||||
debian_version=$(cat /etc/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
|
|
||||||
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 ;;
|
|
||||||
*) exit 1
|
|
||||||
esac
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
echo "$debian_version"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
;;
|
;;
|
||||||
devuan)
|
devuan)
|
||||||
cat /etc/devuan_version
|
cat /etc/devuan_version
|
||||||
|
|
@ -70,11 +45,6 @@ case "$("$__explorer/os")" in
|
||||||
macosx)
|
macosx)
|
||||||
sw_vers -productVersion
|
sw_vers -productVersion
|
||||||
;;
|
;;
|
||||||
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
|
|
||||||
freebsd-version
|
|
||||||
;;
|
|
||||||
*bsd|solaris)
|
*bsd|solaris)
|
||||||
uname -r
|
uname -r
|
||||||
;;
|
;;
|
||||||
|
|
@ -100,7 +70,4 @@ case "$("$__explorer/os")" in
|
||||||
ubuntu)
|
ubuntu)
|
||||||
lsb_release -sr
|
lsb_release -sr
|
||||||
;;
|
;;
|
||||||
alpine)
|
|
||||||
cat /etc/alpine-release
|
|
||||||
;;
|
|
||||||
esac
|
esac
|
||||||
|
|
|
||||||
|
|
@ -1,4 +0,0 @@
|
||||||
#!/bin/sh -e
|
|
||||||
|
|
||||||
getent passwd | awk -F: '{print "user:"$1}'
|
|
||||||
getent group | awk -F: '{print "group:"$1}'
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
#!/bin/sh -e
|
#!/bin/sh -e
|
||||||
#
|
#
|
||||||
# 2020 Ander Punnar (ander-at-kvlt-dot-ee)
|
# 2019 Ander Punnar (ander-at-kvlt-dot-ee)
|
||||||
#
|
#
|
||||||
# This file is part of cdist.
|
# This file is part of cdist.
|
||||||
#
|
#
|
||||||
|
|
@ -18,23 +18,30 @@
|
||||||
# along with cdist. If not, see <http://www.gnu.org/licenses/>.
|
# along with cdist. If not, see <http://www.gnu.org/licenses/>.
|
||||||
#
|
#
|
||||||
|
|
||||||
privileges="$( cat "$__object/parameter/privileges" )"
|
[ ! -e "/$__object_id" ] && exit 0
|
||||||
|
|
||||||
database="$( cat "$__object/parameter/database" )"
|
for parameter in user group
|
||||||
|
do
|
||||||
|
if [ ! -f "$__object/parameter/$parameter" ]
|
||||||
|
then
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
|
||||||
table="$( cat "$__object/parameter/table" )"
|
while read -r acl
|
||||||
|
do
|
||||||
|
check="$( echo "$acl" | awk -F: '{print $1}' )"
|
||||||
|
|
||||||
user="$( cat "$__object/parameter/user" )"
|
if [ "$parameter" = 'user' ]
|
||||||
|
then
|
||||||
|
getent_db=passwd
|
||||||
|
else
|
||||||
|
getent_db="$parameter"
|
||||||
|
fi
|
||||||
|
|
||||||
host="$( cat "$__object/parameter/host" )"
|
if ! getent "$getent_db" "$check" > /dev/null
|
||||||
|
then
|
||||||
check_privileges="$(
|
echo "missing $parameter '$check'"
|
||||||
mysql -B -N -e "show grants for '$user'@'$host'" \
|
fi
|
||||||
| grep -Ei "^grant $privileges on .$database.\..?$table.? to " || true )"
|
done \
|
||||||
|
< "$__object/parameter/$parameter"
|
||||||
if [ -n "$check_privileges" ]
|
done
|
||||||
then
|
|
||||||
echo 'present'
|
|
||||||
else
|
|
||||||
echo 'absent'
|
|
||||||
fi
|
|
||||||
|
|
@ -20,82 +20,59 @@
|
||||||
|
|
||||||
file_is="$( cat "$__object/explorer/file_is" )"
|
file_is="$( cat "$__object/explorer/file_is" )"
|
||||||
|
|
||||||
if [ "$file_is" = 'missing' ] \
|
[ "$file_is" = 'missing' ] && exit 0
|
||||||
&& [ -z "$__cdist_dry_run" ] \
|
|
||||||
&& [ ! -f "$__object/parameter/file" ] \
|
missing_users_groups="$( cat "$__object/explorer/missing_users_groups" )"
|
||||||
&& [ ! -f "$__object/parameter/directory" ]
|
|
||||||
|
if [ -n "$missing_users_groups" ]
|
||||||
then
|
then
|
||||||
exit 0
|
echo "$missing_users_groups" >&2
|
||||||
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
os="$( cat "$__global/explorer/os" )"
|
os="$( cat "$__global/explorer/os" )"
|
||||||
|
|
||||||
acl_path="/$__object_id"
|
|
||||||
|
|
||||||
acl_is="$( cat "$__object/explorer/acl_is" )"
|
acl_is="$( cat "$__object/explorer/acl_is" )"
|
||||||
|
|
||||||
if [ -f "$__object/parameter/source" ]
|
acl_path="/$__object_id"
|
||||||
then
|
|
||||||
acl_source="$( cat "$__object/parameter/source" )"
|
|
||||||
|
|
||||||
if [ "$acl_source" = '-' ]
|
if [ -f "$__object/parameter/default" ] && [ "$file_is" = 'directory' ]
|
||||||
then
|
|
||||||
acl_should="$( cat "$__object/stdin" )"
|
|
||||||
else
|
|
||||||
acl_should="$( grep -Ev '^#|^$' "$acl_source" )"
|
|
||||||
fi
|
|
||||||
elif [ -f "$__object/parameter/entry" ]
|
|
||||||
then
|
then
|
||||||
acl_should="$( cat "$__object/parameter/entry" )"
|
set_default=1
|
||||||
else
|
else
|
||||||
echo 'no parameters set' >&2
|
set_default=0
|
||||||
exit 1
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# instead of setfacl's non-helpful message "Option -m: Invalid argument near character X"
|
acl_should="$( for parameter in user group mask other
|
||||||
# let's check if target has necessary users and groups, since mistyped or missing
|
do
|
||||||
# users/groups in target is most common reason.
|
if [ ! -f "$__object/parameter/$parameter" ]
|
||||||
echo "$acl_should" \
|
then
|
||||||
| grep -Po '(user|group):[^:]+' \
|
continue
|
||||||
| sort -u \
|
fi
|
||||||
| while read -r l
|
|
||||||
|
while read -r acl
|
||||||
do
|
do
|
||||||
if ! grep "$l" -Fxq "$__object/explorer/getent"
|
if echo "$acl" | awk -F: '{ print $NF }' | grep -Fq 'X'
|
||||||
then
|
then
|
||||||
echo "no $l' in target" | sed "s/:/ '/" >&2
|
[ "$file_is" = 'directory' ] && rep=x || rep=-
|
||||||
exit 1
|
|
||||||
|
acl="$( echo "$acl" | sed "s/\(.*\)X/\1$rep/" )"
|
||||||
fi
|
fi
|
||||||
done
|
|
||||||
|
|
||||||
if [ -f "$__object/parameter/default" ]
|
echo "$parameter" | grep -Eq '(mask|other)' && sep=:: || sep=:
|
||||||
then
|
|
||||||
acl_should="$( echo "$acl_should" \
|
|
||||||
| sed 's/^default://' \
|
|
||||||
| sort -u \
|
|
||||||
| sed 's/\(.*\)/default:\1\n\1/' )"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "$file_is" = 'regular' ] \
|
echo "$parameter$sep$acl"
|
||||||
&& 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'
|
[ "$set_default" = '1' ] && echo "default:$parameter$sep$acl"
|
||||||
then
|
done \
|
||||||
[ "$file_is" = 'directory' ] && rep=x || rep=-
|
< "$__object/parameter/$parameter"
|
||||||
|
done )"
|
||||||
acl_should="$( echo "$acl_should" | sed "s/\\(.*\\)X/\\1$rep/" )"
|
|
||||||
fi
|
|
||||||
|
|
||||||
setfacl_exec='setfacl'
|
setfacl_exec='setfacl'
|
||||||
|
|
||||||
if [ -f "$__object/parameter/recursive" ]
|
if [ -f "$__object/parameter/recursive" ]
|
||||||
then
|
then
|
||||||
if echo "$os" | grep -Fq 'freebsd'
|
if echo "$os" | grep -Eq 'macosx|freebsd'
|
||||||
then
|
then
|
||||||
echo "$os setfacl do not support recursive operations" >&2
|
echo "$os setfacl do not support recursive operations" >&2
|
||||||
else
|
else
|
||||||
|
|
@ -105,36 +82,44 @@ fi
|
||||||
|
|
||||||
if [ -f "$__object/parameter/remove" ]
|
if [ -f "$__object/parameter/remove" ]
|
||||||
then
|
then
|
||||||
echo "$acl_is" | while read -r acl
|
if echo "$os" | grep -Fq 'solaris'
|
||||||
do
|
then
|
||||||
# skip wanted ACL entries which already exist
|
# Solaris setfacl behaves differently.
|
||||||
# and skip mask and other entries, because we
|
# We will not support Solaris for now, because no way to test it.
|
||||||
# can't actually remove them, but only change.
|
# But adding support should be easy (use -s instead of -m on modify).
|
||||||
if echo "$acl_should" | grep -Eq "^$acl" \
|
echo "$os setfacl do not support -x flag for ACL remove" >&2
|
||||||
|| echo "$acl" | grep -Eq '^(default:)?(mask|other)'
|
else
|
||||||
then continue
|
echo "$acl_is" | while read -r acl
|
||||||
fi
|
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'
|
if echo "$os" | grep -Eq 'macosx|freebsd'
|
||||||
then
|
then
|
||||||
remove="$acl"
|
remove="$acl"
|
||||||
else
|
else
|
||||||
remove="$( echo "$acl" | sed 's/:...$//' )"
|
remove="$( echo "$acl" | sed 's/:...$//' )"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "$setfacl_exec -x \"$remove\" \"$acl_path\""
|
echo "$setfacl_exec -x \"$remove\" \"$acl_path\""
|
||||||
echo "removed '$remove'" >> "$__messages_out"
|
echo "removed '$remove'" >> "$__messages_out"
|
||||||
done
|
done
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
for acl in $acl_should
|
for acl in $acl_should
|
||||||
do
|
do
|
||||||
if ! echo "$acl_is" | grep -Eq "^$acl"
|
if ! echo "$acl_is" | grep -Eq "^$acl"
|
||||||
then
|
then
|
||||||
if echo "$os" | grep -Fq 'freebsd' \
|
if echo "$os" | grep -Eq 'macosx|freebsd' \
|
||||||
&& echo "$acl" | grep -Eq '^default:'
|
&& echo "$acl" | grep -Eq '^default:'
|
||||||
then
|
then
|
||||||
echo "setting default ACL in $os is currently not supported" >&2
|
echo "setting default ACL in $os is currently not supported. sorry :(" >&2
|
||||||
else
|
else
|
||||||
echo "$setfacl_exec -m \"$acl\" \"$acl_path\""
|
echo "$setfacl_exec -m \"$acl\" \"$acl_path\""
|
||||||
echo "added '$acl'" >> "$__messages_out"
|
echo "added '$acl'" >> "$__messages_out"
|
||||||
|
|
|
||||||
|
|
@ -8,48 +8,46 @@ cdist-type__acl - Set ACL entries
|
||||||
|
|
||||||
DESCRIPTION
|
DESCRIPTION
|
||||||
-----------
|
-----------
|
||||||
Fully supported and tested on Linux (ext4 filesystem), partial support for FreeBSD.
|
ACL must be defined as 3-symbol combination, using ``r``, ``w``, ``x`` and ``-``.
|
||||||
|
|
||||||
|
Fully supported on Linux (tested on Debian and CentOS).
|
||||||
|
|
||||||
|
Partial support for FreeBSD, OSX and Solaris.
|
||||||
|
|
||||||
|
OpenBSD and NetBSD support is not possible.
|
||||||
|
|
||||||
See ``setfacl`` and ``acl`` manpages for more details.
|
See ``setfacl`` and ``acl`` manpages for more details.
|
||||||
|
|
||||||
One of ``--entry`` or ``--source`` must be used.
|
|
||||||
|
|
||||||
|
|
||||||
OPTIONAL MULTIPLE PARAMETERS
|
OPTIONAL MULTIPLE PARAMETERS
|
||||||
----------------------------
|
----------------------------
|
||||||
entry
|
user
|
||||||
Set ACL entry following ``getfacl`` output syntax.
|
Add user ACL entry.
|
||||||
Must be used if ``--source`` is not used.
|
|
||||||
|
group
|
||||||
|
Add group ACL entry.
|
||||||
|
|
||||||
|
|
||||||
OPTIONAL PARAMETERS
|
OPTIONAL PARAMETERS
|
||||||
-------------------
|
-------------------
|
||||||
source
|
mask
|
||||||
Read ACL entries from stdin or file.
|
Add mask ACL entry.
|
||||||
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
|
other
|
||||||
Create/change file with ``__file`` using ``user:group:mode`` pattern.
|
Add other ACL entry.
|
||||||
|
|
||||||
directory
|
|
||||||
Create/change directory with ``__directory`` using ``user:group:mode`` pattern.
|
|
||||||
|
|
||||||
|
|
||||||
BOOLEAN PARAMETERS
|
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
|
recursive
|
||||||
Make ``setfacl`` recursive (Linux only), but not ``getfacl`` in explorer.
|
Make ``setfacl`` recursive (Linux only), but not ``getfacl`` in explorer.
|
||||||
|
|
||||||
|
default
|
||||||
|
Add default ACL entries (FreeBSD not supported).
|
||||||
|
|
||||||
remove
|
remove
|
||||||
Remove undefined ACL entries.
|
Remove undefined ACL entries (Solaris not supported).
|
||||||
``mask`` and ``other`` entries can't be removed, but only changed.
|
ACL entries for ``mask`` and ``other`` can't be removed.
|
||||||
|
|
||||||
|
|
||||||
EXAMPLES
|
EXAMPLES
|
||||||
|
|
@ -58,41 +56,15 @@ EXAMPLES
|
||||||
.. code-block:: sh
|
.. code-block:: sh
|
||||||
|
|
||||||
__acl /srv/project \
|
__acl /srv/project \
|
||||||
--default \
|
|
||||||
--recursive \
|
--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 \
|
--default \
|
||||||
--remove \
|
--remove \
|
||||||
--entry group:secret-project:rwx \
|
--user alice:rwx \
|
||||||
--entry user:alice:r-x
|
--user bob:r-x \
|
||||||
|
--group project-group:rwx \
|
||||||
# read acl from stdin
|
--group some-other-group:r-x \
|
||||||
echo 'user:alice:rwx' \
|
--mask r-x \
|
||||||
| __acl /path/to/directory --source -
|
--other r-x
|
||||||
|
|
||||||
# create/change directory too
|
|
||||||
__acl /path/to/directory \
|
|
||||||
--default \
|
|
||||||
--remove \
|
|
||||||
--directory root:root:770 \
|
|
||||||
--entry user:nobody:rwx
|
|
||||||
|
|
||||||
|
|
||||||
AUTHORS
|
AUTHORS
|
||||||
|
|
|
||||||
|
|
@ -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
|
|
||||||
|
|
@ -1,3 +1,2 @@
|
||||||
source
|
mask
|
||||||
file
|
other
|
||||||
directory
|
|
||||||
|
|
|
||||||
|
|
@ -1 +1,2 @@
|
||||||
entry
|
user
|
||||||
|
group
|
||||||
|
|
|
||||||
|
|
@ -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 <https://backports.debian.org/>`_
|
|
||||||
|
|
||||||
:strong:`cdist-type__apt_source`\ (7)
|
|
||||||
|
|
||||||
|
|
||||||
AUTHORS
|
|
||||||
-------
|
|
||||||
Matthias Stecher <matthiasstecher at gmx.de>
|
|
||||||
|
|
||||||
|
|
||||||
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.
|
|
||||||
|
|
@ -1,81 +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 <http://www.gnu.org/licenses/>.
|
|
||||||
#
|
|
||||||
#
|
|
||||||
# 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
|
|
||||||
. "$__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"
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
present
|
|
||||||
|
|
@ -1,2 +0,0 @@
|
||||||
state
|
|
||||||
mirror
|
|
||||||
|
|
@ -27,18 +27,6 @@ else
|
||||||
keyid="$__object_id"
|
keyid="$__object_id"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
keydir="$(cat "$__object/parameter/keydir")"
|
apt-key export "$keyid" | head -n 1 | grep -Fqe "BEGIN PGP PUBLIC KEY BLOCK" \
|
||||||
keyfile="$keydir/$__object_id.gpg"
|
&& echo present \
|
||||||
|
|| echo absent
|
||||||
if [ -d "$keydir" ]
|
|
||||||
then
|
|
||||||
if [ -f "$keyfile" ]
|
|
||||||
then echo present
|
|
||||||
else echo absent
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
# fallback to deprecated apt-key
|
|
||||||
apt-key export "$keyid" | head -n 1 | grep -Fqe "BEGIN PGP PUBLIC KEY BLOCK" \
|
|
||||||
&& echo present \
|
|
||||||
|| echo absent
|
|
||||||
fi
|
|
||||||
|
|
|
||||||
|
|
@ -31,82 +31,12 @@ if [ "$state_should" = "$state_is" ]; then
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
keydir="$(cat "$__object/parameter/keydir")"
|
|
||||||
keyfile="$keydir/$__object_id.gpg"
|
|
||||||
|
|
||||||
case "$state_should" in
|
case "$state_should" in
|
||||||
present)
|
present)
|
||||||
keyserver="$(cat "$__object/parameter/keyserver")"
|
keyserver="$(cat "$__object/parameter/keyserver")"
|
||||||
|
echo "apt-key adv --keyserver \"$keyserver\" --recv-keys \"$keyid\""
|
||||||
if [ -f "$__object/parameter/uri" ]; then
|
|
||||||
uri="$(cat "$__object/parameter/uri")"
|
|
||||||
|
|
||||||
if [ -d "$keydir" ]; then
|
|
||||||
cat << EOF
|
|
||||||
|
|
||||||
curl -s -L \\
|
|
||||||
-o "$keyfile" \\
|
|
||||||
"$uri"
|
|
||||||
|
|
||||||
key="\$( cat "$keyfile" )"
|
|
||||||
|
|
||||||
if echo "\$key" | grep -Fq 'BEGIN PGP PUBLIC KEY BLOCK'
|
|
||||||
then
|
|
||||||
echo "\$key" | gpg --dearmor > "$keyfile"
|
|
||||||
fi
|
|
||||||
|
|
||||||
EOF
|
|
||||||
else
|
|
||||||
# fallback to deprecated apt-key
|
|
||||||
echo "curl -s -L '$uri' | apt-key add -"
|
|
||||||
fi
|
|
||||||
elif [ -d "$keydir" ]; then
|
|
||||||
# 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"
|
|
||||||
;;
|
;;
|
||||||
absent)
|
absent)
|
||||||
if [ -f "$keyfile" ]; then
|
echo "apt-key del \"$keyid\""
|
||||||
echo "rm '$keyfile'"
|
|
||||||
else
|
|
||||||
# fallback to deprecated apt-key
|
|
||||||
echo "apt-key del \"$keyid\""
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "removed '$keyid'" >> "$__messages_out"
|
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
|
||||||
|
|
@ -28,12 +28,6 @@ keyserver
|
||||||
the keyserver from which to fetch the key. If omitted the default set
|
the keyserver from which to fetch the key. If omitted the default set
|
||||||
in ./parameter/default/keyserver is used.
|
in ./parameter/default/keyserver is used.
|
||||||
|
|
||||||
keydir
|
|
||||||
key save location, defaults to ``/etc/apt/trusted.pgp.d``
|
|
||||||
|
|
||||||
uri
|
|
||||||
the URI from which to download the key
|
|
||||||
|
|
||||||
|
|
||||||
EXAMPLES
|
EXAMPLES
|
||||||
--------
|
--------
|
||||||
|
|
@ -53,20 +47,15 @@ EXAMPLES
|
||||||
# same thing with other keyserver
|
# same thing with other keyserver
|
||||||
__apt_key UbuntuArchiveKey --keyid 437D05B5 --keyserver keyserver.ubuntu.com
|
__apt_key UbuntuArchiveKey --keyid 437D05B5 --keyserver keyserver.ubuntu.com
|
||||||
|
|
||||||
# download key from the internet
|
|
||||||
__apt_key rabbitmq \
|
|
||||||
--uri http://www.rabbitmq.com/rabbitmq-signing-key-public.asc
|
|
||||||
|
|
||||||
|
|
||||||
AUTHORS
|
AUTHORS
|
||||||
-------
|
-------
|
||||||
Steven Armstrong <steven-cdist--@--armstrong.cc>
|
Steven Armstrong <steven-cdist--@--armstrong.cc>
|
||||||
Ander Punnar <ander-at-kvlt-dot-ee>
|
|
||||||
|
|
||||||
|
|
||||||
COPYING
|
COPYING
|
||||||
-------
|
-------
|
||||||
Copyright \(C) 2011-2019 Steven Armstrong and Ander Punnar. You can
|
Copyright \(C) 2011-2014 Steven Armstrong. You can redistribute it
|
||||||
redistribute it and/or modify it under the terms of the GNU General Public
|
and/or modify it under the terms of the GNU General Public License as
|
||||||
License as published by the Free Software Foundation, either version 3 of the
|
published by the Free Software Foundation, either version 3 of the
|
||||||
License, or (at your option) any later version.
|
License, or (at your option) any later version.
|
||||||
|
|
|
||||||
|
|
@ -1,8 +0,0 @@
|
||||||
#!/bin/sh -e
|
|
||||||
|
|
||||||
__package gnupg
|
|
||||||
|
|
||||||
if [ -f "$__object/parameter/uri" ]
|
|
||||||
then __package curl
|
|
||||||
else __package dirmngr
|
|
||||||
fi
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
/etc/apt/trusted.gpg.d
|
|
||||||
|
|
@ -1,5 +1,3 @@
|
||||||
state
|
state
|
||||||
keyid
|
keyid
|
||||||
keyserver
|
keyserver
|
||||||
keydir
|
|
||||||
uri
|
|
||||||
|
|
|
||||||
|
|
@ -32,12 +32,11 @@ EXAMPLES
|
||||||
AUTHORS
|
AUTHORS
|
||||||
-------
|
-------
|
||||||
Steven Armstrong <steven-cdist--@--armstrong.cc>
|
Steven Armstrong <steven-cdist--@--armstrong.cc>
|
||||||
Dennis Camera <dennis.camera--@--ssrq-sds-fds.ch>
|
|
||||||
|
|
||||||
|
|
||||||
COPYING
|
COPYING
|
||||||
-------
|
-------
|
||||||
Copyright \(C) 2014 Steven Armstrong, 2020 Dennis Camera.
|
Copyright \(C) 2014 Steven Armstrong. You can redistribute it
|
||||||
You can redistribute it and/or modify it under the terms of the GNU General
|
and/or modify it under the terms of the GNU General Public License as
|
||||||
Public License as published by the Free Software Foundation, either version 3 of
|
published by the Free Software Foundation, either version 3 of the
|
||||||
the License, or (at your option) any later version.
|
License, or (at your option) any later version.
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
#!/bin/sh -e
|
#!/bin/sh -e
|
||||||
#
|
#
|
||||||
# 2014 Steven Armstrong (steven-cdist at armstrong.cc)
|
# 2014 Steven Armstrong (steven-cdist at armstrong.cc)
|
||||||
# 2020 Dennis Camera (dennis.camera at ssrq-sds-fds.ch)
|
|
||||||
#
|
#
|
||||||
# This file is part of cdist.
|
# This file is part of cdist.
|
||||||
#
|
#
|
||||||
|
|
@ -20,28 +19,26 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
|
|
||||||
os=$(cat "${__global:?}/explorer/os")
|
os=$(cat "$__global/explorer/os")
|
||||||
|
|
||||||
case ${os}
|
case "$os" in
|
||||||
in
|
ubuntu|debian|devuan)
|
||||||
(ubuntu|debian|devuan)
|
# No stinking recommends thank you very much.
|
||||||
__file /etc/apt/apt.conf.d/00InstallRecommends --state present \
|
# If I want something installed I will do so myself.
|
||||||
--owner root --group root --mode 0644 --source - <<-'EOF'
|
__file /etc/apt/apt.conf.d/99-no-recommends \
|
||||||
APT::Install-Recommends "false";
|
--owner root --group root --mode 644 \
|
||||||
APT::Install-Suggests "false";
|
--source - << DONE
|
||||||
APT::AutoRemove::RecommendsImportant "false";
|
APT::Install-Recommends "0";
|
||||||
APT::AutoRemove::SuggestsImportant "false";
|
APT::Install-Suggests "0";
|
||||||
EOF
|
APT::AutoRemove::RecommendsImportant "0";
|
||||||
|
APT::AutoRemove::SuggestsImportant "0";
|
||||||
# TODO: Remove the following object after some time
|
DONE
|
||||||
require=__file/etc/apt/apt.conf.d/00InstallRecommends \
|
;;
|
||||||
__file /etc/apt/apt.conf.d/99-no-recommends --state absent
|
*)
|
||||||
;;
|
cat >&2 << DONE
|
||||||
(*)
|
|
||||||
cat >&2 <<EOF
|
|
||||||
The developer of this type (${__type##*/}) did not think your operating system
|
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.
|
($os) would have any use for it. If you think otherwise please submit a patch.
|
||||||
EOF
|
DONE
|
||||||
exit 1
|
exit 1
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
|
||||||
|
|
@ -1,68 +0,0 @@
|
||||||
cdist-type__apt_unattended_upgrades(7)
|
|
||||||
======================================
|
|
||||||
|
|
||||||
NAME
|
|
||||||
----
|
|
||||||
cdist-type__apt_unattended_upgrades - automatic installation of updates
|
|
||||||
|
|
||||||
|
|
||||||
DESCRIPTION
|
|
||||||
-----------
|
|
||||||
|
|
||||||
Install and configure unattended-upgrades package.
|
|
||||||
|
|
||||||
For more information see https://wiki.debian.org/UnattendedUpgrades.
|
|
||||||
|
|
||||||
|
|
||||||
OPTIONAL MULTIPLE PARAMETERS
|
|
||||||
----------------------------
|
|
||||||
option
|
|
||||||
Set options for unattended-upgrades. See examples.
|
|
||||||
|
|
||||||
Supported options with default values (as of 2020-01-17) are:
|
|
||||||
|
|
||||||
- AutoFixInterruptedDpkg, default is "true"
|
|
||||||
- MinimalSteps, default is "true"
|
|
||||||
- InstallOnShutdown, default is "false"
|
|
||||||
- Mail, default is "" (empty)
|
|
||||||
- MailOnlyOnError, default is "false"
|
|
||||||
- Remove-Unused-Kernel-Packages, default is "true"
|
|
||||||
- Remove-New-Unused-Dependencies, default is "true"
|
|
||||||
- Remove-Unused-Dependencies, default is "false"
|
|
||||||
- Automatic-Reboot, default is "false"
|
|
||||||
- Automatic-Reboot-WithUsers, default is "true"
|
|
||||||
- Automatic-Reboot-Time, default is "02:00"
|
|
||||||
- SyslogEnable, default is "false"
|
|
||||||
- SyslogFacility, default is "daemon"
|
|
||||||
- OnlyOnACPower, default is "true"
|
|
||||||
- Skip-Updates-On-Metered-Connections, default is "true"
|
|
||||||
- Verbose, default is "false"
|
|
||||||
- Debug, default is "false"
|
|
||||||
|
|
||||||
blacklist
|
|
||||||
Python regular expressions, matching packages to exclude from upgrading.
|
|
||||||
|
|
||||||
|
|
||||||
EXAMPLES
|
|
||||||
--------
|
|
||||||
|
|
||||||
.. code-block:: sh
|
|
||||||
|
|
||||||
__apt_unattended_upgrades \
|
|
||||||
--option Mail=root \
|
|
||||||
--option MailOnlyOnError=true \
|
|
||||||
--blacklist multipath-tools \
|
|
||||||
--blacklist open-iscsi
|
|
||||||
|
|
||||||
|
|
||||||
AUTHORS
|
|
||||||
-------
|
|
||||||
Ander Punnar <ander-at-kvlt-dot-ee>
|
|
||||||
|
|
||||||
|
|
||||||
COPYING
|
|
||||||
-------
|
|
||||||
Copyright \(C) 2020 Ander Punnar. You can redistribute it and/or modify it
|
|
||||||
under the terms of the GNU General Public License as published by the Free
|
|
||||||
Software Foundation, either version 3 of the License, or (at your option) any
|
|
||||||
later version.
|
|
||||||
|
|
@ -1,80 +0,0 @@
|
||||||
#!/bin/sh -e
|
|
||||||
#
|
|
||||||
# 2020 Ander Punnar (ander-at-kvlt-dot-ee)
|
|
||||||
#
|
|
||||||
# This file is part of cdist.
|
|
||||||
#
|
|
||||||
# cdist is free software: you can redistribute it and/or modify
|
|
||||||
# it under the terms of the GNU General Public License as published by
|
|
||||||
# the Free Software Foundation, either version 3 of the License, or
|
|
||||||
# (at your option) any later version.
|
|
||||||
#
|
|
||||||
# cdist is distributed in the hope that it will be useful,
|
|
||||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
# GNU General Public License for more details.
|
|
||||||
#
|
|
||||||
# You should have received a copy of the GNU General Public License
|
|
||||||
# along with cdist. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
#
|
|
||||||
|
|
||||||
__package unattended-upgrades
|
|
||||||
|
|
||||||
export require='__package/unattended-upgrades'
|
|
||||||
|
|
||||||
# in normal circumstances 20auto-upgrades is managed
|
|
||||||
# by debconf and it can only contain these lines
|
|
||||||
|
|
||||||
__file /etc/apt/apt.conf.d/20auto-upgrades \
|
|
||||||
--owner root \
|
|
||||||
--group root \
|
|
||||||
--mode 644 \
|
|
||||||
--source - << EOF
|
|
||||||
APT::Periodic::Update-Package-Lists "1";
|
|
||||||
APT::Periodic::Unattended-Upgrade "1";
|
|
||||||
EOF
|
|
||||||
|
|
||||||
# lets not write into upstream 50unattended-upgrades file,
|
|
||||||
# but use our own config file to avoid clashes
|
|
||||||
|
|
||||||
conf_file='/etc/apt/apt.conf.d/51unattended-upgrades-cdist'
|
|
||||||
|
|
||||||
conf='# this file is managed by cdist'
|
|
||||||
|
|
||||||
if [ -f "$__object/parameter/option" ]
|
|
||||||
then
|
|
||||||
o=''
|
|
||||||
|
|
||||||
while read -r l
|
|
||||||
do
|
|
||||||
o="$( printf '%s\nUnattended-Upgrade::%s "%s";\n' "$o" "${l%%=*}" "${l#*=}" )"
|
|
||||||
done \
|
|
||||||
< "$__object/parameter/option"
|
|
||||||
|
|
||||||
conf="$( printf '%s\n%s\n' "$conf" "$o" )"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -f "$__object/parameter/blacklist" ]
|
|
||||||
then
|
|
||||||
b='Unattended-Upgrade::Package-Blacklist {'
|
|
||||||
|
|
||||||
while read -r l
|
|
||||||
do
|
|
||||||
b="$( printf '%s\n"%s";\n' "$b" "$l" )"
|
|
||||||
done \
|
|
||||||
< "$__object/parameter/blacklist"
|
|
||||||
|
|
||||||
conf="$( printf '%s\n%s\n}\n' "$conf" "$b" )"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "$( echo "$conf" | wc -l )" -gt 1 ]
|
|
||||||
then
|
|
||||||
echo "$conf" \
|
|
||||||
| __file "$conf_file" \
|
|
||||||
--owner root \
|
|
||||||
--group root \
|
|
||||||
--mode 644 \
|
|
||||||
--source -
|
|
||||||
else
|
|
||||||
__file "$conf_file" --state absent
|
|
||||||
fi
|
|
||||||
|
|
@ -1,2 +0,0 @@
|
||||||
option
|
|
||||||
blacklist
|
|
||||||
|
|
@ -46,29 +46,28 @@ fi
|
||||||
|
|
||||||
remove_block() {
|
remove_block() {
|
||||||
cat << DONE
|
cat << DONE
|
||||||
tmpfile=\$(mktemp ${quoted_file}.cdist.XXXXXXXXXX)
|
tmpfile=\$(mktemp ${file}.cdist.XXXXXXXXXX)
|
||||||
# preserve ownership and permissions of existing file
|
# preserve ownership and permissions of existing file
|
||||||
if [ -f $quoted_file ]; then
|
if [ -f "$file" ]; then
|
||||||
cp -p $quoted_file "\$tmpfile"
|
cp -p "$file" "\$tmpfile"
|
||||||
fi
|
fi
|
||||||
awk -v prefix=$(quote "$prefix") -v suffix=$(quote "$suffix") '
|
awk -v prefix=^$(quote "$prefix")\$ -v suffix=^$(quote "$suffix")\$ '
|
||||||
{
|
{
|
||||||
if (\$0 == prefix) {
|
if (match(\$0,prefix)) {
|
||||||
triggered=1
|
triggered=1
|
||||||
}
|
}
|
||||||
if (triggered) {
|
if (triggered) {
|
||||||
if (\$0 == suffix) {
|
if (match(\$0,suffix)) {
|
||||||
triggered=0
|
triggered=0
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
print
|
print
|
||||||
}
|
}
|
||||||
}' $quoted_file > "\$tmpfile"
|
}' "$file" > "\$tmpfile"
|
||||||
mv -f "\$tmpfile" $quoted_file
|
mv -f "\$tmpfile" "$file"
|
||||||
DONE
|
DONE
|
||||||
}
|
}
|
||||||
|
|
||||||
quoted_file="$(quote "$file")"
|
|
||||||
case "$state_should" in
|
case "$state_should" in
|
||||||
present)
|
present)
|
||||||
if [ "$state_is" = "changed" ]; then
|
if [ "$state_is" = "changed" ]; then
|
||||||
|
|
@ -78,7 +77,7 @@ case "$state_should" in
|
||||||
echo add >> "$__messages_out"
|
echo add >> "$__messages_out"
|
||||||
fi
|
fi
|
||||||
cat << DONE
|
cat << DONE
|
||||||
cat >> $quoted_file << '${__type##*/}_DONE'
|
cat >> "$file" << ${__type##*/}_DONE
|
||||||
$(cat "$block")
|
$(cat "$block")
|
||||||
${__type##*/}_DONE
|
${__type##*/}_DONE
|
||||||
DONE
|
DONE
|
||||||
|
|
|
||||||
|
|
@ -30,7 +30,7 @@ username
|
||||||
|
|
||||||
source
|
source
|
||||||
Select the source from which to clone cdist from.
|
Select the source from which to clone cdist from.
|
||||||
Defaults to "git@code.ungleich.ch:ungleich-public/cdist.git".
|
Defaults to "git://code.ungleich.ch/ungleich-public/cdist.git".
|
||||||
|
|
||||||
|
|
||||||
branch
|
branch
|
||||||
|
|
@ -47,7 +47,7 @@ EXAMPLES
|
||||||
__cdist /home/cdist/cdist
|
__cdist /home/cdist/cdist
|
||||||
|
|
||||||
# Use alternative source
|
# Use alternative source
|
||||||
__cdist --source "git@code.ungleich.ch:ungleich-public/cdist.git" /home/cdist/cdist
|
__cdist --source "git://code.ungleich.ch/ungleich-public/cdist" /home/cdist/cdist
|
||||||
|
|
||||||
|
|
||||||
AUTHORS
|
AUTHORS
|
||||||
|
|
|
||||||
|
|
@ -37,7 +37,6 @@ source="$(cat "$__object/parameter/source")"
|
||||||
# out of it
|
# out of it
|
||||||
home=/home/$username
|
home=/home/$username
|
||||||
|
|
||||||
# shellcheck disable=SC2086
|
|
||||||
__user "$username" --home "$home" $shell
|
__user "$username" --home "$home" $shell
|
||||||
|
|
||||||
require="__user/$username" __directory "$home" \
|
require="__user/$username" __directory "$home" \
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
git@code.ungleich.ch:ungleich-public/cdist.git
|
git://code.ungleich.ch/ungleich-public/cdist.git
|
||||||
|
|
|
||||||
|
|
@ -18,12 +18,7 @@
|
||||||
# along with cdist. If not, see <http://www.gnu.org/licenses/>.
|
# along with cdist. If not, see <http://www.gnu.org/licenses/>.
|
||||||
#
|
#
|
||||||
|
|
||||||
if [ -f "$__object/parameter/path" ]
|
path="/$__object_id"
|
||||||
then
|
|
||||||
path="$( cat "$__object/parameter/path" )"
|
|
||||||
else
|
|
||||||
path="/$__object_id"
|
|
||||||
fi
|
|
||||||
|
|
||||||
[ ! -d "$path" ] && exit 0
|
[ ! -d "$path" ] && exit 0
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -20,12 +20,7 @@
|
||||||
|
|
||||||
[ ! -s "$__object/explorer/list" ] && exit 0
|
[ ! -s "$__object/explorer/list" ] && exit 0
|
||||||
|
|
||||||
if [ -f "$__object/parameter/path" ]
|
path="/$__object_id"
|
||||||
then
|
|
||||||
path="$( cat "$__object/parameter/path" )"
|
|
||||||
else
|
|
||||||
path="/$__object_id"
|
|
||||||
fi
|
|
||||||
|
|
||||||
pattern="$( cat "$__object/parameter/pattern" )"
|
pattern="$( cat "$__object/parameter/pattern" )"
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,7 @@ DESCRIPTION
|
||||||
-----------
|
-----------
|
||||||
Remove files and directories which match the pattern.
|
Remove files and directories which match the pattern.
|
||||||
|
|
||||||
Provided path must be a directory.
|
Provided path (as __object_id) must be a directory.
|
||||||
|
|
||||||
Patterns are passed to ``find``'s ``-regex`` - see ``find(1)`` for more details.
|
Patterns are passed to ``find``'s ``-regex`` - see ``find(1)`` for more details.
|
||||||
|
|
||||||
|
|
@ -29,9 +29,6 @@ pattern
|
||||||
|
|
||||||
OPTIONAL PARAMETERS
|
OPTIONAL PARAMETERS
|
||||||
-------------------
|
-------------------
|
||||||
path
|
|
||||||
Path which will be cleaned. Defaults to ``$__object_id``.
|
|
||||||
|
|
||||||
exclude
|
exclude
|
||||||
Pattern of files which are excluded from removal.
|
Pattern of files which are excluded from removal.
|
||||||
|
|
||||||
|
|
@ -49,11 +46,6 @@ EXAMPLES
|
||||||
--exclude '.+\(charset\.conf\|security\.conf\)' \
|
--exclude '.+\(charset\.conf\|security\.conf\)' \
|
||||||
--onchange 'service apache2 restart'
|
--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
|
AUTHORS
|
||||||
-------
|
-------
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,2 @@
|
||||||
exclude
|
exclude
|
||||||
onchange
|
onchange
|
||||||
path
|
|
||||||
|
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
886614099 103959898 consul
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
https://releases.hashicorp.com/consul/1.5.0/consul_1.5.0_linux_amd64.zip
|
|
||||||
|
|
@ -42,7 +42,7 @@ source_file_name="${source##*/}"
|
||||||
cksum_should=$(cut -d' ' -f1,2 "$version_dir/cksum")
|
cksum_should=$(cut -d' ' -f1,2 "$version_dir/cksum")
|
||||||
|
|
||||||
cat << eof
|
cat << eof
|
||||||
tmpdir=\$(mktemp -d -p /tmp "${__type##*/}.XXXXXXXXXX")
|
tmpdir=\$(mktemp -d --tmpdir="/tmp" "${__type##*/}.XXXXXXXXXX")
|
||||||
curl -s -L "$source" > "\$tmpdir/$source_file_name"
|
curl -s -L "$source" > "\$tmpdir/$source_file_name"
|
||||||
unzip -p "\$tmpdir/$source_file_name" > "${destination}.tmp"
|
unzip -p "\$tmpdir/$source_file_name" > "${destination}.tmp"
|
||||||
rm -rf "\$tmpdir"
|
rm -rf "\$tmpdir"
|
||||||
|
|
|
||||||
|
|
@ -24,7 +24,7 @@
|
||||||
os=$(cat "$__global/explorer/os")
|
os=$(cat "$__global/explorer/os")
|
||||||
|
|
||||||
case "$os" in
|
case "$os" in
|
||||||
alpine|scientific|centos|redhat|ubuntu|debian|devuan|archlinux|gentoo)
|
scientific|centos|redhat|ubuntu|debian|devuan|archlinux|gentoo)
|
||||||
# any linux should work
|
# any linux should work
|
||||||
:
|
:
|
||||||
;;
|
;;
|
||||||
|
|
@ -47,7 +47,6 @@ fi
|
||||||
|
|
||||||
if [ -f "$__object/parameter/direct" ]; then
|
if [ -f "$__object/parameter/direct" ]; then
|
||||||
__package unzip
|
__package unzip
|
||||||
__package curl
|
|
||||||
else
|
else
|
||||||
__staged_file /usr/local/bin/consul \
|
__staged_file /usr/local/bin/consul \
|
||||||
--source "$(cat "$version_dir/source")" \
|
--source "$(cat "$version_dir/source")" \
|
||||||
|
|
|
||||||
|
|
@ -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 $?
|
|
||||||
}
|
|
||||||
|
|
@ -116,9 +116,6 @@ verify-incoming
|
||||||
verify-outgoing
|
verify-outgoing
|
||||||
enforce the use of TLS and verify the peers authenticity on outgoing connections
|
enforce the use of TLS and verify the peers authenticity on outgoing connections
|
||||||
|
|
||||||
use-distribution-package
|
|
||||||
uses distribution package instead of upstream binary
|
|
||||||
|
|
||||||
|
|
||||||
EXAMPLES
|
EXAMPLES
|
||||||
--------
|
--------
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,7 @@
|
||||||
#!/bin/sh -e
|
#!/bin/sh -e
|
||||||
#
|
#
|
||||||
# 2015 Steven Armstrong (steven-cdist at armstrong.cc)
|
# 2015 Steven Armstrong (steven-cdist at armstrong.cc)
|
||||||
# 2015-2020 Nico Schottelius (nico-cdist at schottelius.org)
|
# 2015 Nico Schottelius (nico-cdist at schottelius.org)
|
||||||
# 2019 Timothée Floure (timothee.floure at ungleich.ch)
|
|
||||||
#
|
#
|
||||||
# This file is part of cdist.
|
# This file is part of cdist.
|
||||||
#
|
#
|
||||||
|
|
@ -20,87 +19,133 @@
|
||||||
# along with cdist. If not, see <http://www.gnu.org/licenses/>.
|
# along with cdist. If not, see <http://www.gnu.org/licenses/>.
|
||||||
#
|
#
|
||||||
|
|
||||||
|
|
||||||
os=$(cat "$__global/explorer/os")
|
os=$(cat "$__global/explorer/os")
|
||||||
|
|
||||||
###
|
case "$os" in
|
||||||
# Type parameters.
|
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
|
||||||
|
|
||||||
state="$(cat "$__object/parameter/state")"
|
state="$(cat "$__object/parameter/state")"
|
||||||
user="$(cat "$__object/parameter/user")"
|
user="$(cat "$__object/parameter/user")"
|
||||||
group="$(cat "$__object/parameter/group")"
|
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"
|
data_dir="/var/lib/consul"
|
||||||
|
conf_dir="/etc/consul/conf.d"
|
||||||
|
conf_file="config.json"
|
||||||
|
|
||||||
|
# FIXME: there has got to be a better way to handle the dependencies in this case
|
||||||
|
case "$state" in
|
||||||
tls_dir="$conf_dir/tls"
|
present)
|
||||||
|
__group "$group" --system --state "$state"
|
||||||
case "$os" in
|
require="__group/$group" \
|
||||||
alpine)
|
__user "$user" --system --gid "$group" \
|
||||||
conf_dir="/etc/consul"
|
--home "$data_dir" --state "$state"
|
||||||
conf_file="server.json"
|
export require="__user/consul"
|
||||||
;;
|
;;
|
||||||
*)
|
absent)
|
||||||
conf_dir="/etc/consul/conf.d"
|
echo "Sorry, state=absent currently not supported :-(" >&2
|
||||||
conf_file="config.json"
|
exit 1
|
||||||
;;
|
require="$__object_name" \
|
||||||
|
__user "$user" --system --gid "$group" --state "$state"
|
||||||
|
require="__user/$user" \
|
||||||
|
__group "$group" --system --state "$state"
|
||||||
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
###
|
__directory /etc/consul \
|
||||||
# Sane deployment, based on distribution package when available.
|
--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 () {
|
if [ -f "$__object/parameter/ca-file-source" ] || [ -f "$__object/parameter/cert-file-source" ] || [ -f "$__object/parameter/key-file-source" ]; then
|
||||||
case "$os" in
|
# create directory for ssl certs
|
||||||
debian)
|
require="__directory/etc/consul" \
|
||||||
# consul is only available starting Debian 10 (buster).
|
__directory /etc/consul/ssl \
|
||||||
# See https://packages.debian.org/buster/consul
|
--owner root --group "$group" --mode 750 --state "$state"
|
||||||
if [ "$release" -lt 10 ]; then
|
fi
|
||||||
echo "Consul is not available for your debian release." >&2
|
|
||||||
echo "Please use the 'manual' (i.e. non-package) installation or \
|
|
||||||
upgrade the target system." >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Override previously defined environment to match debian packaging.
|
__directory "$data_dir" \
|
||||||
conf_dir='/etc/consul.d'
|
--owner "$user" --group "$group" --mode 770 --state "$state"
|
||||||
user='consul'
|
|
||||||
group='consul'
|
|
||||||
;;
|
|
||||||
alpine)
|
|
||||||
# consul is only available starting Alpine 3.12 (= edge during the 3.11 cycle).
|
|
||||||
# See https://pkgs.alpinelinux.org/packages?name=consul&branch=edge
|
|
||||||
|
|
||||||
# Override previously defined environment to match alpine packaging.
|
|
||||||
conf_dir='/etc/consul'
|
|
||||||
conf_file='server.json'
|
|
||||||
data_dir='/var/consul'
|
|
||||||
user='consul'
|
|
||||||
group='consul'
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
echo "Your operating system ($os) is currently not supported with the \
|
|
||||||
--use-distribution-package flag (${__type##*/})." >&2
|
|
||||||
echo "Please use non-package installation or contribute an \
|
|
||||||
implementation for if you can." >&2
|
|
||||||
exit 1
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
# Install consul package.
|
# Generate json config file
|
||||||
__package consul --state "$state"
|
(
|
||||||
|
echo "{"
|
||||||
|
|
||||||
export config_deployment_requires="__package/consul"
|
# parameters we define ourself
|
||||||
}
|
printf ' "data_dir": "%s"\n' "$data_dir"
|
||||||
|
|
||||||
###
|
cd "$__object/parameter/"
|
||||||
# LEGACY manual deployment, kept for compatibility reasons.
|
for param in *; 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|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 "}"
|
||||||
|
) | \
|
||||||
|
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()
|
init_sysvinit()
|
||||||
{
|
{
|
||||||
|
|
@ -134,186 +179,48 @@ init_upstart()
|
||||||
require="__file/etc/init/consul.conf" __start_on_boot consul
|
require="__file/etc/init/consul.conf" __start_on_boot consul
|
||||||
}
|
}
|
||||||
|
|
||||||
manual_setup () {
|
# Install init script to start on boot
|
||||||
case "$os" in
|
case "$os" in
|
||||||
alpine|scientific|centos|debian|devuan|redhat|ubuntu)
|
centos|redhat)
|
||||||
# whitelist safeguard
|
os_version="$(sed 's/[^0-9.]//g' "$__global/explorer/os_version")"
|
||||||
:
|
major_version="${os_version%%.*}"
|
||||||
;;
|
case "$major_version" in
|
||||||
*)
|
[456])
|
||||||
echo "Your operating system ($os) is currently not supported by this \
|
init_sysvinit redhat
|
||||||
type (${__type##*/})." >&2
|
;;
|
||||||
echo "Please contribute an implementation for it if you can." >&2
|
7)
|
||||||
exit 1
|
init_systemd
|
||||||
;;
|
;;
|
||||||
esac
|
*)
|
||||||
|
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
|
debian)
|
||||||
case "$state" in
|
os_version=$(cat "$__global/explorer/os_version")
|
||||||
present)
|
major_version="${os_version%%.*}"
|
||||||
__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
|
|
||||||
|
|
||||||
# Create data directory.
|
case "$major_version" in
|
||||||
require="__user/consul" __directory "$data_dir" \
|
[567])
|
||||||
--owner "$user" --group "$group" --mode 770 --state "$state"
|
init_sysvinit debian
|
||||||
|
;;
|
||||||
|
[89])
|
||||||
|
init_systemd
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
echo "Unsupported Debian version $os_version" >&2
|
||||||
|
exit 1
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
;;
|
||||||
|
|
||||||
# Create config directory.
|
devuan)
|
||||||
require="__user/consul" __directory "$conf_dir" \
|
init_sysvinit debian
|
||||||
--parents --owner root --group "$group" --mode 750 --state "$state"
|
;;
|
||||||
|
|
||||||
# Install init script to start on boot
|
ubuntu)
|
||||||
case "$os" in
|
init_upstart
|
||||||
devuan)
|
;;
|
||||||
init_sysvinit debian
|
esac
|
||||||
;;
|
|
||||||
centos|redhat)
|
|
||||||
os_version="$(sed 's/[^0-9.]//g' "$__global/explorer/os_version")"
|
|
||||||
major_version="${os_version%%.*}"
|
|
||||||
case "$major_version" in
|
|
||||||
[456])
|
|
||||||
init_sysvinit redhat
|
|
||||||
;;
|
|
||||||
7)
|
|
||||||
init_systemd
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
echo "Unsupported CentOS/Redhat version: $os_version" >&2
|
|
||||||
exit 1
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
;;
|
|
||||||
|
|
||||||
debian)
|
|
||||||
os_version=$(cat "$__global/explorer/os_version")
|
|
||||||
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
|
|
||||||
|
|
|
||||||
|
|
@ -6,4 +6,3 @@ server
|
||||||
enable-syslog
|
enable-syslog
|
||||||
verify-incoming
|
verify-incoming
|
||||||
verify-outgoing
|
verify-outgoing
|
||||||
use-distribution-package
|
|
||||||
|
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
../../__consul_service/explorer/conf-dir
|
|
||||||
|
|
@ -19,7 +19,7 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
name="$(cat "$__object/parameter/name" 2>/dev/null || echo "$__object_id")"
|
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"
|
conf_file="check_${name}.json"
|
||||||
state="$(cat "$__object/parameter/state")"
|
state="$(cat "$__object/parameter/state")"
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -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
|
|
||||||
|
|
@ -19,7 +19,7 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
name="$(cat "$__object/parameter/name" 2>/dev/null || echo "$__object_id")"
|
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"
|
conf_file="service_${name}.json"
|
||||||
state="$(cat "$__object/parameter/state")"
|
state="$(cat "$__object/parameter/state")"
|
||||||
|
|
||||||
|
|
@ -45,7 +45,7 @@ printf ' "name": "%s"\n' "$name"
|
||||||
cd "$__object/parameter/"
|
cd "$__object/parameter/"
|
||||||
for param in *; do
|
for param in *; do
|
||||||
case "$param" in
|
case "$param" in
|
||||||
state|name|check-interval|conf-dir) continue ;;
|
state|name|check-interval) continue ;;
|
||||||
check-script)
|
check-script)
|
||||||
printf ' ,"check": {\n'
|
printf ' ,"check": {\n'
|
||||||
printf ' "script": "%s"\n' "$(cat "$__object/parameter/check-script")"
|
printf ' "script": "%s"\n' "$(cat "$__object/parameter/check-script")"
|
||||||
|
|
@ -86,6 +86,7 @@ echo " }"
|
||||||
# end json file
|
# end json file
|
||||||
echo "}"
|
echo "}"
|
||||||
) | \
|
) | \
|
||||||
|
require="__directory${conf_dir}" \
|
||||||
__config_file "${conf_dir}/${conf_file}" \
|
__config_file "${conf_dir}/${conf_file}" \
|
||||||
--owner root --group consul --mode 640 \
|
--owner root --group consul --mode 640 \
|
||||||
--state "$state" \
|
--state "$state" \
|
||||||
|
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
../../__consul_service/explorer/conf-dir
|
|
||||||
|
|
@ -20,7 +20,7 @@
|
||||||
|
|
||||||
cdist_type="${__type##*/}"
|
cdist_type="${__type##*/}"
|
||||||
watch_type="${cdist_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"
|
conf_file="watch_${watch_type}_${__object_id}.json"
|
||||||
state="$(cat "$__object/parameter/state")"
|
state="$(cat "$__object/parameter/state")"
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
../../__consul_service/explorer/conf-dir
|
|
||||||
|
|
@ -20,7 +20,7 @@
|
||||||
|
|
||||||
cdist_type="${__type##*/}"
|
cdist_type="${__type##*/}"
|
||||||
watch_type="${cdist_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"
|
conf_file="watch_${watch_type}_${__object_id}.json"
|
||||||
state="$(cat "$__object/parameter/state")"
|
state="$(cat "$__object/parameter/state")"
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
../../__consul_service/explorer/conf-dir
|
|
||||||
|
|
@ -20,7 +20,7 @@
|
||||||
|
|
||||||
cdist_type="${__type##*/}"
|
cdist_type="${__type##*/}"
|
||||||
watch_type="${cdist_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"
|
conf_file="watch_${watch_type}_${__object_id}.json"
|
||||||
state="$(cat "$__object/parameter/state")"
|
state="$(cat "$__object/parameter/state")"
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
../../__consul_service/explorer/conf-dir
|
|
||||||
|
|
@ -20,7 +20,7 @@
|
||||||
|
|
||||||
cdist_type="${__type##*/}"
|
cdist_type="${__type##*/}"
|
||||||
watch_type="${cdist_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"
|
conf_file="watch_${watch_type}_${__object_id}.json"
|
||||||
state="$(cat "$__object/parameter/state")"
|
state="$(cat "$__object/parameter/state")"
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
../../__consul_service/explorer/conf-dir
|
|
||||||
|
|
@ -20,7 +20,7 @@
|
||||||
|
|
||||||
cdist_type="${__type##*/}"
|
cdist_type="${__type##*/}"
|
||||||
watch_type="${cdist_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"
|
conf_file="watch_${watch_type}_${__object_id}.json"
|
||||||
state="$(cat "$__object/parameter/state")"
|
state="$(cat "$__object/parameter/state")"
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
../../__consul_service/explorer/conf-dir
|
|
||||||
|
|
@ -20,7 +20,7 @@
|
||||||
|
|
||||||
cdist_type="${__type##*/}"
|
cdist_type="${__type##*/}"
|
||||||
watch_type="${cdist_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"
|
conf_file="watch_${watch_type}_${__object_id}.json"
|
||||||
state="$(cat "$__object/parameter/state")"
|
state="$(cat "$__object/parameter/state")"
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
../../__consul_service/explorer/conf-dir
|
|
||||||
|
|
@ -20,7 +20,7 @@
|
||||||
|
|
||||||
cdist_type="${__type##*/}"
|
cdist_type="${__type##*/}"
|
||||||
watch_type="${cdist_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"
|
conf_file="watch_${watch_type}_${__object_id}.json"
|
||||||
state="$(cat "$__object/parameter/state")"
|
state="$(cat "$__object/parameter/state")"
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -31,28 +31,24 @@ if [ -f "$__object/parameter/raw" ]; then
|
||||||
elif [ -f "$__object/parameter/raw_command" ]; then
|
elif [ -f "$__object/parameter/raw_command" ]; then
|
||||||
entry="$command"
|
entry="$command"
|
||||||
else
|
else
|
||||||
minute="$(cat "$__object/parameter/minute")"
|
minute="$(cat "$__object/parameter/minute" 2>/dev/null || echo "*")"
|
||||||
hour="$(cat "$__object/parameter/hour")"
|
hour="$(cat "$__object/parameter/hour" 2>/dev/null || echo "*")"
|
||||||
day_of_month="$(cat "$__object/parameter/day_of_month")"
|
day_of_month="$(cat "$__object/parameter/day_of_month" 2>/dev/null || echo "*")"
|
||||||
month="$(cat "$__object/parameter/month")"
|
month="$(cat "$__object/parameter/month" 2>/dev/null || echo "*")"
|
||||||
day_of_week="$(cat "$__object/parameter/day_of_week")"
|
day_of_week="$(cat "$__object/parameter/day_of_week" 2>/dev/null || echo "*")"
|
||||||
entry="$minute $hour $day_of_month $month $day_of_week $command # $name"
|
entry="$minute $hour $day_of_month $month $day_of_week $command # $name"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
mkdir "$__object/files"
|
mkdir "$__object/files"
|
||||||
echo "$entry" > "$__object/files/entry"
|
echo "$entry" > "$__object/files/entry"
|
||||||
|
|
||||||
if [ -s "$__object/explorer/entry" ]; then
|
if diff -q "$__object/files/entry" "$__object/explorer/entry" >/dev/null; then
|
||||||
if diff -q "$__object/files/entry" "$__object/explorer/entry" >/dev/null; then
|
state_is=present
|
||||||
state_is=present
|
|
||||||
else
|
|
||||||
state_is=modified
|
|
||||||
fi
|
|
||||||
else
|
else
|
||||||
state_is=absent
|
state_is=absent
|
||||||
fi
|
fi
|
||||||
|
|
||||||
state_should="$(cat "$__object/parameter/state")"
|
state_should="$(cat "$__object/parameter/state" 2>/dev/null || echo "present")"
|
||||||
|
|
||||||
[ "$state_is" = "$state_should" ] && exit 0
|
[ "$state_is" = "$state_should" ] && exit 0
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -21,11 +21,6 @@ command
|
||||||
|
|
||||||
OPTIONAL PARAMETERS
|
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
|
state
|
||||||
Either present or absent. Defaults to present.
|
Either present or absent. Defaults to present.
|
||||||
minute
|
minute
|
||||||
|
|
|
||||||
|
|
@ -22,12 +22,3 @@ if [ -f "$__object/parameter/raw" ] && [ -f "$__object/parameter/raw_command" ];
|
||||||
echo "ERROR: both raw and raw_command specified" >&2
|
echo "ERROR: both raw and raw_command specified" >&2
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
case "$(cat "$__object/parameter/state")" in
|
|
||||||
present) ;;
|
|
||||||
absent) ;;
|
|
||||||
|
|
||||||
*)
|
|
||||||
echo "ERROR: unkown cron state" >&2
|
|
||||||
exit 2
|
|
||||||
esac
|
|
||||||
|
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
*
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
*
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
*
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
*
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
*
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
present
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
#
|
#
|
||||||
# 2013 Steven Armstrong (steven-cdist armstrong.cc)
|
# 2013 Steven Armstrong (steven-cdist armstrong.cc)
|
||||||
# 2020 Dennis Camera (dennis.camera at ssrq-sds-fds.ch)
|
|
||||||
#
|
#
|
||||||
# This file is part of cdist.
|
# This file is part of cdist.
|
||||||
#
|
#
|
||||||
|
|
@ -21,51 +20,59 @@
|
||||||
|
|
||||||
destination="/$__object_id"
|
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
|
# nothing to work with, nothing we could do
|
||||||
[ -e "$destination" ] || exit 0
|
[ -e "$destination" ] || exit 0
|
||||||
|
|
||||||
command -v stat >/dev/null 2>&1 || {
|
os=$("$__explorer/os")
|
||||||
fallback
|
case "$os" in
|
||||||
exit
|
"freebsd"|"netbsd"|"openbsd"|"macosx")
|
||||||
}
|
stat -f "type: %HT
|
||||||
|
|
||||||
case $("$__explorer/os")
|
|
||||||
in
|
|
||||||
freebsd|netbsd|openbsd|macosx)
|
|
||||||
stat -f 'type: %HT
|
|
||||||
owner: %Du %Su
|
owner: %Du %Su
|
||||||
group: %Dg %Sg
|
group: %Dg %Sg
|
||||||
mode: %Mp%03Lp %Sp
|
mode: %Lp %Sp
|
||||||
' "$destination" | awk '/^type/ { print tolower($0); next } { print }'
|
" "$destination" | awk '/^type/ { print tolower($0); next; } { print; }'
|
||||||
;;
|
;;
|
||||||
*)
|
alpine)
|
||||||
# NOTE: Do not use --printf here as it is not supported by BusyBox stat.
|
stat -c "type: %F
|
||||||
# NOTE: BusyBox's stat might not support the "-c" option, in which case
|
|
||||||
# we fall through to the shell fallback.
|
|
||||||
stat -c 'type: %F
|
|
||||||
owner: %u %U
|
owner: %u %U
|
||||||
group: %g %G
|
group: %g %G
|
||||||
mode: %04a %A' "$destination" 2>/dev/null || fallback
|
mode: %a %A
|
||||||
|
" "$destination"
|
||||||
;;
|
;;
|
||||||
|
solaris)
|
||||||
|
ls1="$( ls -ld "$destination" )"
|
||||||
|
ls2="$( ls -ldn "$destination" )"
|
||||||
|
|
||||||
|
if [ -f "$__object/parameter/mode" ]
|
||||||
|
then mode_should="$( cat "$__object/parameter/mode" )"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# yes, it is ugly hack, but if you know better way...
|
||||||
|
if [ -z "$( find "$destination" -perm "$mode_should" )" ]
|
||||||
|
then octets=888
|
||||||
|
else octets="$( echo "$mode_should" | sed 's/^0//' )"
|
||||||
|
fi
|
||||||
|
|
||||||
|
case "$( echo "$ls1" | cut -c1-1 )" in
|
||||||
|
-) echo 'type: regular file' ;;
|
||||||
|
d) echo 'type: directory' ;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
echo "owner: $( echo "$ls2" \
|
||||||
|
| awk '{print $3}' ) $( echo "$ls1" \
|
||||||
|
| awk '{print $3}' )"
|
||||||
|
|
||||||
|
echo "group: $( echo "$ls2" \
|
||||||
|
| awk '{print $4}' ) $( echo "$ls1" \
|
||||||
|
| awk '{print $4}' )"
|
||||||
|
|
||||||
|
echo "mode: $octets $( echo "$ls1" | awk '{print $1}' )"
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
stat --printf="type: %F
|
||||||
|
owner: %u %U
|
||||||
|
group: %g %G
|
||||||
|
mode: %a %A
|
||||||
|
" "$destination"
|
||||||
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,6 @@
|
||||||
# 2011-2013 Nico Schottelius (nico-cdist at schottelius.org)
|
# 2011-2013 Nico Schottelius (nico-cdist at schottelius.org)
|
||||||
# 2013 Steven Armstrong (steven-cdist armstrong.cc)
|
# 2013 Steven Armstrong (steven-cdist armstrong.cc)
|
||||||
# 2014 Daniel Heule (hda at sfs.biz)
|
# 2014 Daniel Heule (hda at sfs.biz)
|
||||||
# 2020 Dennis Camera (dennis.camera at ssrq-sds-fds.ch)
|
|
||||||
#
|
#
|
||||||
# This file is part of cdist.
|
# This file is part of cdist.
|
||||||
#
|
#
|
||||||
|
|
@ -22,8 +21,8 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
destination="/$__object_id"
|
destination="/$__object_id"
|
||||||
state_should=$(cat "$__object/parameter/state")
|
state_should="$(cat "$__object/parameter/state")"
|
||||||
type=$(cat "$__object/explorer/type")
|
type="$(cat "$__object/explorer/type")"
|
||||||
stat_file="$__object/explorer/stat"
|
stat_file="$__object/explorer/stat"
|
||||||
|
|
||||||
# variable to keep track if we have to set directory attributes
|
# variable to keep track if we have to set directory attributes
|
||||||
|
|
@ -73,7 +72,7 @@ set_mode() {
|
||||||
}
|
}
|
||||||
|
|
||||||
case "$state_should" in
|
case "$state_should" in
|
||||||
present|exists)
|
present)
|
||||||
if [ "$type" != "directory" ]; then
|
if [ "$type" != "directory" ]; then
|
||||||
set_attributes=1
|
set_attributes=1
|
||||||
if [ "$type" != "none" ]; then
|
if [ "$type" != "none" ]; then
|
||||||
|
|
@ -84,10 +83,6 @@ case "$state_should" in
|
||||||
fi
|
fi
|
||||||
echo "mkdir $mkdiropt '$destination'"
|
echo "mkdir $mkdiropt '$destination'"
|
||||||
echo "create" >> "$__messages_out"
|
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
|
fi
|
||||||
|
|
||||||
# Note: Mode - needs to happen last as a chown/chgrp can alter mode by
|
# 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_should="$(cat "$__object/parameter/$attribute")"
|
||||||
value_is="$(get_current_value "$attribute" "$value_should")"
|
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
|
if [ "$attribute" = mode ]; then
|
||||||
# Convert to four-digit octal number (printf interprets
|
value_should="$(echo "$value_should" | sed 's/^0\(...\)/\1/')"
|
||||||
# strings with leading 0s as octal!)
|
|
||||||
value_should=$(printf '%04o' "0${value_should}")
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$set_attributes" = 1 ] || [ "$value_should" != "$value_is" ]; then
|
if [ "$set_attributes" = 1 ] || [ "$value_should" != "$value_is" ]; then
|
||||||
|
|
@ -110,26 +103,6 @@ case "$state_should" in
|
||||||
fi
|
fi
|
||||||
done
|
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)
|
absent)
|
||||||
if [ "$type" = "directory" ]; then
|
if [ "$type" = "directory" ]; then
|
||||||
echo "rm -rf '$destination'"
|
echo "rm -rf '$destination'"
|
||||||
|
|
|
||||||
|
|
@ -19,18 +19,7 @@ None.
|
||||||
OPTIONAL PARAMETERS
|
OPTIONAL PARAMETERS
|
||||||
-------------------
|
-------------------
|
||||||
state
|
state
|
||||||
'present', 'absent', 'exists' or 'pre-exists', defaults to 'present' where:
|
'present' or 'absent', defaults to 'present'
|
||||||
|
|
||||||
present
|
|
||||||
the directory exists and the given attributes are set.
|
|
||||||
absent
|
|
||||||
the directory does not exist.
|
|
||||||
exists
|
|
||||||
the directory exists, but its attributes are not altered if it already
|
|
||||||
existed.
|
|
||||||
pre-exists
|
|
||||||
check that the directory exists and is indeed a directory, but do not
|
|
||||||
create or modify it.
|
|
||||||
|
|
||||||
group
|
group
|
||||||
Group to chgrp to.
|
Group to chgrp to.
|
||||||
|
|
@ -47,7 +36,7 @@ BOOLEAN PARAMETERS
|
||||||
parents
|
parents
|
||||||
Whether to create parents as well (mkdir -p behaviour).
|
Whether to create parents as well (mkdir -p behaviour).
|
||||||
Warning: all intermediate directory permissions default
|
Warning: all intermediate directory permissions default
|
||||||
to whatever mkdir -p does.
|
to whatever mkdir -p does.
|
||||||
|
|
||||||
Usually this means root:root, 0700.
|
Usually this means root:root, 0700.
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -64,43 +64,6 @@ case "$os" in
|
||||||
require="__apt_source/docker" __package docker-ce --state "${state}"
|
require="__apt_source/docker" __package docker-ce --state "${state}"
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
devuan)
|
|
||||||
os_version="$(cat "$__global/explorer/os_version")"
|
|
||||||
|
|
||||||
case "$os_version" in
|
|
||||||
ascii)
|
|
||||||
distribution="stretch"
|
|
||||||
;;
|
|
||||||
jessie)
|
|
||||||
distribution="jessie"
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
echo "Your devuan release ($os_version) is currently not supported by this type (${__type##*/}).">&2
|
|
||||||
echo "Please contribute an implementation for it if you can." >&2
|
|
||||||
exit 1
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
if [ "${state}" = "present" ]; then
|
|
||||||
__package apt-transport-https
|
|
||||||
__package ca-certificates
|
|
||||||
__package gnupg2
|
|
||||||
fi
|
|
||||||
__apt_key_uri docker --name "Docker Release (CE deb) <docker@docker.com>" \
|
|
||||||
--uri "https://download.docker.com/linux/${os}/gpg" --state "${state}"
|
|
||||||
|
|
||||||
require="__apt_key_uri/docker" __apt_source docker \
|
|
||||||
--uri "https://download.docker.com/linux/${os}" \
|
|
||||||
--distribution "${distribution}" \
|
|
||||||
--state "${state}" \
|
|
||||||
--component "stable"
|
|
||||||
if [ "$version" != "latest" ]; then
|
|
||||||
require="__apt_source/docker" __package docker-ce --version "${version}" --state "${state}"
|
|
||||||
else
|
|
||||||
require="__apt_source/docker" __package docker-ce --state "${state}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
;;
|
|
||||||
*)
|
*)
|
||||||
echo "Your operating system ($os) is currently not supported by this type (${__type##*/})." >&2
|
echo "Your operating system ($os) is currently not supported by this type (${__type##*/})." >&2
|
||||||
echo "Please contribute an implementation for it if you can." >&2
|
echo "Please contribute an implementation for it if you can." >&2
|
||||||
|
|
|
||||||
|
|
@ -18,4 +18,4 @@
|
||||||
# along with cdist. If not, see <http://www.gnu.org/licenses/>.
|
# along with cdist. If not, see <http://www.gnu.org/licenses/>.
|
||||||
#
|
#
|
||||||
|
|
||||||
docker info 2>/dev/null | grep '^ *Swarm: ' | awk '{print $2}'
|
docker info 2>/dev/null | grep "^Swarm: " | cut -d " " -f 2-
|
||||||
|
|
|
||||||
|
|
@ -25,9 +25,6 @@ user
|
||||||
OPTIONAL PARAMETERS
|
OPTIONAL PARAMETERS
|
||||||
-------------------
|
-------------------
|
||||||
|
|
||||||
dirmode
|
|
||||||
forwarded to :strong:`__directory` type as mode
|
|
||||||
|
|
||||||
mode
|
mode
|
||||||
forwarded to :strong:`__file` type
|
forwarded to :strong:`__file` type
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -19,7 +19,6 @@ set -eu
|
||||||
user="$(cat "${__object}/parameter/user")"
|
user="$(cat "${__object}/parameter/user")"
|
||||||
home="$(cat "${__object}/explorer/home")"
|
home="$(cat "${__object}/explorer/home")"
|
||||||
primary_group="$(cat "${__object}/explorer/primary_group")"
|
primary_group="$(cat "${__object}/explorer/primary_group")"
|
||||||
dirmode="$(cat "${__object}/parameter/dirmode")"
|
|
||||||
|
|
||||||
# Create parent directory. Type __directory has flag 'parents', but it
|
# Create parent directory. Type __directory has flag 'parents', but it
|
||||||
# will leave us with root-owned directory in user home, which is not
|
# will leave us with root-owned directory in user home, which is not
|
||||||
|
|
@ -37,7 +36,6 @@ export CDIST_ORDER_DEPENDENCY
|
||||||
for dir ; do
|
for dir ; do
|
||||||
__directory "${home}/${dir}" \
|
__directory "${home}/${dir}" \
|
||||||
--group "${primary_group}" \
|
--group "${primary_group}" \
|
||||||
--mode "${dirmode}" \
|
|
||||||
--owner "${user}"
|
--owner "${user}"
|
||||||
done
|
done
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
0700
|
|
||||||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue