Compare commits
No commits in common. "master" and "preos-plugins-dir-opt" have entirely different histories.
master
...
preos-plug
50 changed files with 141 additions and 1429 deletions
|
@ -74,7 +74,6 @@ SHELLCHECKCMD="shellcheck -s sh -f gcc -x"
|
||||||
# Skip SC2154 for variables starting with __ since such variables are cdist
|
# Skip SC2154 for variables starting with __ since such variables are cdist
|
||||||
# environment variables.
|
# environment variables.
|
||||||
SHELLCHECK_SKIP=': __.*is referenced but not assigned.*\[SC2154\]'
|
SHELLCHECK_SKIP=': __.*is referenced but not assigned.*\[SC2154\]'
|
||||||
SHELLCHECKTMP=".shellcheck.tmp"
|
|
||||||
|
|
||||||
# Change to checkout directory
|
# Change to checkout directory
|
||||||
basedir="${0%/*}/../"
|
basedir="${0%/*}/../"
|
||||||
|
@ -370,7 +369,7 @@ eof
|
||||||
cat << eof
|
cat << eof
|
||||||
Manual steps post release:
|
Manual steps post release:
|
||||||
- cdist-web
|
- cdist-web
|
||||||
- send generated mailinglist.tmp mail
|
- send mail body generated in mailinglist.tmp and inform Dmitry for deb
|
||||||
- twitter
|
- twitter
|
||||||
eof
|
eof
|
||||||
;;
|
;;
|
||||||
|
@ -432,67 +431,53 @@ eof
|
||||||
;;
|
;;
|
||||||
|
|
||||||
shellcheck-global-explorers)
|
shellcheck-global-explorers)
|
||||||
# shellcheck disable=SC2086
|
find cdist/conf/explorer -type f -exec ${SHELLCHECKCMD} {} + | grep -v "${SHELLCHECK_SKIP}" || exit 0
|
||||||
find cdist/conf/explorer -type f -exec ${SHELLCHECKCMD} {} + | grep -v "${SHELLCHECK_SKIP}" > "${SHELLCHECKTMP}"
|
|
||||||
test ! -s "${SHELLCHECKTMP}" || { cat "${SHELLCHECKTMP}"; exit 1; }
|
|
||||||
;;
|
;;
|
||||||
|
|
||||||
shellcheck-type-explorers)
|
shellcheck-type-explorers)
|
||||||
# shellcheck disable=SC2086
|
find cdist/conf/type -type f -path "*/explorer/*" -exec ${SHELLCHECKCMD} {} + | grep -v "${SHELLCHECK_SKIP}" || exit 0
|
||||||
find cdist/conf/type -type f -path "*/explorer/*" -exec ${SHELLCHECKCMD} {} + | grep -v "${SHELLCHECK_SKIP}" > "${SHELLCHECKTMP}"
|
|
||||||
test ! -s "${SHELLCHECKTMP}" || { cat "${SHELLCHECKTMP}"; exit 1; }
|
|
||||||
;;
|
;;
|
||||||
|
|
||||||
shellcheck-manifests)
|
shellcheck-manifests)
|
||||||
# shellcheck disable=SC2086
|
find cdist/conf/type -type f -name manifest -exec ${SHELLCHECKCMD} {} + | grep -v "${SHELLCHECK_SKIP}" || exit 0
|
||||||
find cdist/conf/type -type f -name manifest -exec ${SHELLCHECKCMD} {} + | grep -v "${SHELLCHECK_SKIP}" > "${SHELLCHECKTMP}"
|
|
||||||
test ! -s "${SHELLCHECKTMP}" || { cat "${SHELLCHECKTMP}"; exit 1; }
|
|
||||||
;;
|
;;
|
||||||
|
|
||||||
shellcheck-local-gencodes)
|
shellcheck-local-gencodes)
|
||||||
# shellcheck disable=SC2086
|
find cdist/conf/type -type f -name gencode-local -exec ${SHELLCHECKCMD} {} + | grep -v "${SHELLCHECK_SKIP}" || exit 0
|
||||||
find cdist/conf/type -type f -name gencode-local -exec ${SHELLCHECKCMD} {} + | grep -v "${SHELLCHECK_SKIP}" > "${SHELLCHECKTMP}"
|
|
||||||
test ! -s "${SHELLCHECKTMP}" || { cat "${SHELLCHECKTMP}"; exit 1; }
|
|
||||||
;;
|
;;
|
||||||
|
|
||||||
shellcheck-remote-gencodes)
|
shellcheck-remote-gencodes)
|
||||||
# shellcheck disable=SC2086
|
find cdist/conf/type -type f -name gencode-remote -exec ${SHELLCHECKCMD} {} + | grep -v "${SHELLCHECK_SKIP}" || exit 0
|
||||||
find cdist/conf/type -type f -name gencode-remote -exec ${SHELLCHECKCMD} {} + | grep -v "${SHELLCHECK_SKIP}" > "${SHELLCHECKTMP}"
|
|
||||||
test ! -s "${SHELLCHECKTMP}" || { cat "${SHELLCHECKTMP}"; exit 1; }
|
|
||||||
;;
|
;;
|
||||||
|
|
||||||
shellcheck-scripts)
|
shellcheck-scripts)
|
||||||
# shellcheck disable=SC2086
|
${SHELLCHECKCMD} scripts/cdist-dump scripts/cdist-new-type || exit 0
|
||||||
${SHELLCHECKCMD} scripts/cdist-dump scripts/cdist-new-type > "${SHELLCHECKTMP}"
|
|
||||||
test ! -s "${SHELLCHECKTMP}" || { cat "${SHELLCHECKTMP}"; exit 1; }
|
|
||||||
;;
|
;;
|
||||||
|
|
||||||
shellcheck-gencodes)
|
shellcheck-gencodes)
|
||||||
"$0" shellcheck-local-gencodes || exit 1
|
"$0" shellcheck-local-gencodes
|
||||||
"$0" shellcheck-remote-gencodes || exit 1
|
"$0" shellcheck-remote-gencodes
|
||||||
;;
|
;;
|
||||||
|
|
||||||
shellcheck-types)
|
shellcheck-types)
|
||||||
"$0" shellcheck-type-explorers || exit 1
|
"$0" shellcheck-type-explorers
|
||||||
"$0" shellcheck-manifests || exit 1
|
"$0" shellcheck-manifests
|
||||||
"$0" shellcheck-gencodes || exit 1
|
"$0" shellcheck-gencodes
|
||||||
;;
|
;;
|
||||||
|
|
||||||
shellcheck)
|
shellcheck)
|
||||||
"$0" shellcheck-global-explorers || exit 1
|
"$0" shellcheck-global-explorers
|
||||||
"$0" shellcheck-types || exit 1
|
"$0" shellcheck-types
|
||||||
"$0" shellcheck-scripts || exit 1
|
"$0" shellcheck-scripts
|
||||||
;;
|
;;
|
||||||
|
|
||||||
shellcheck-type-files)
|
shellcheck-type-files)
|
||||||
# shellcheck disable=SC2086
|
find cdist/conf/type -type f -path "*/files/*" -exec ${SHELLCHECKCMD} {} + | grep -v "${SHELLCHECK_SKIP}" || exit 0
|
||||||
find cdist/conf/type -type f -path "*/files/*" -exec ${SHELLCHECKCMD} {} + | grep -v "${SHELLCHECK_SKIP}" > "${SHELLCHECKTMP}"
|
|
||||||
test ! -s "${SHELLCHECKTMP}" || { cat "${SHELLCHECKTMP}"; exit 1; }
|
|
||||||
;;
|
;;
|
||||||
|
|
||||||
shellcheck-with-files)
|
shellcheck-with-files)
|
||||||
"$0" shellcheck || exit 1
|
"$0" shellcheck
|
||||||
"$0" shellcheck-type-files || exit 1
|
"$0" shellcheck-type-files
|
||||||
;;
|
;;
|
||||||
|
|
||||||
shellcheck-build-helper)
|
shellcheck-build-helper)
|
||||||
|
@ -550,7 +535,6 @@ eof
|
||||||
|
|
||||||
# Temp files
|
# Temp files
|
||||||
rm -f ./*.tmp
|
rm -f ./*.tmp
|
||||||
rm -f ./.*.tmp
|
|
||||||
;;
|
;;
|
||||||
|
|
||||||
distclean)
|
distclean)
|
||||||
|
|
|
@ -6,7 +6,6 @@ import collections
|
||||||
import functools
|
import functools
|
||||||
import cdist.configuration
|
import cdist.configuration
|
||||||
import cdist.preos
|
import cdist.preos
|
||||||
import cdist.info
|
|
||||||
|
|
||||||
|
|
||||||
# set of beta sub-commands
|
# set of beta sub-commands
|
||||||
|
@ -437,37 +436,6 @@ def get_parsers():
|
||||||
' 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)
|
|
||||||
|
|
||||||
for p in parser:
|
for p in parser:
|
||||||
parser[p].epilog = EPILOG
|
parser[p].epilog = EPILOG
|
||||||
|
|
||||||
|
|
|
@ -28,10 +28,7 @@ acl_path="/$__object_id"
|
||||||
|
|
||||||
acl_is="$( cat "$__object/explorer/acl_is" )"
|
acl_is="$( cat "$__object/explorer/acl_is" )"
|
||||||
|
|
||||||
if [ -f "$__object/parameter/entry" ]
|
if [ -f "$__object/parameter/acl" ]
|
||||||
then
|
|
||||||
acl_should="$( cat "$__object/parameter/entry" )"
|
|
||||||
elif [ -f "$__object/parameter/acl" ]
|
|
||||||
then
|
then
|
||||||
acl_should="$( cat "$__object/parameter/acl" )"
|
acl_should="$( cat "$__object/parameter/acl" )"
|
||||||
elif
|
elif
|
||||||
|
|
|
@ -15,7 +15,7 @@ See ``setfacl`` and ``acl`` manpages for more details.
|
||||||
|
|
||||||
REQUIRED MULTIPLE PARAMETERS
|
REQUIRED MULTIPLE PARAMETERS
|
||||||
----------------------------
|
----------------------------
|
||||||
entry
|
acl
|
||||||
Set ACL entry following ``getfacl`` output syntax.
|
Set ACL entry following ``getfacl`` output syntax.
|
||||||
|
|
||||||
|
|
||||||
|
@ -36,8 +36,8 @@ remove
|
||||||
|
|
||||||
DEPRECATED PARAMETERS
|
DEPRECATED PARAMETERS
|
||||||
---------------------
|
---------------------
|
||||||
Parameters ``acl``, ``user``, ``group``, ``mask`` and ``other`` are deprecated and they
|
Parameters ``user``, ``group``, ``mask`` and ``other`` are deprecated and they
|
||||||
will be removed in future versions. Please use ``entry`` parameter instead.
|
will be removed in future versions. Please use ``acl`` parameter instead.
|
||||||
|
|
||||||
|
|
||||||
EXAMPLES
|
EXAMPLES
|
||||||
|
@ -49,27 +49,27 @@ EXAMPLES
|
||||||
--default \
|
--default \
|
||||||
--recursive \
|
--recursive \
|
||||||
--remove \
|
--remove \
|
||||||
--entry user:alice:rwx \
|
--acl user:alice:rwx \
|
||||||
--entry user:bob:r-x \
|
--acl user:bob:r-x \
|
||||||
--entry group:project-group:rwx \
|
--acl group:project-group:rwx \
|
||||||
--entry group:some-other-group:r-x \
|
--acl group:some-other-group:r-x \
|
||||||
--entry mask::r-x \
|
--acl mask::r-x \
|
||||||
--entry other::r-x
|
--acl other::r-x
|
||||||
|
|
||||||
# give Alice read-only access to subdir,
|
# give Alice read-only access to subdir,
|
||||||
# but don't allow her to see parent content.
|
# but don't allow her to see parent content.
|
||||||
|
|
||||||
__acl /srv/project2 \
|
__acl /srv/project2 \
|
||||||
--remove \
|
--remove \
|
||||||
--entry default:group:secret-project:rwx \
|
--acl default:group:secret-project:rwx \
|
||||||
--entry group:secret-project:rwx \
|
--acl group:secret-project:rwx \
|
||||||
--entry user:alice:--x
|
--acl user:alice:--x
|
||||||
|
|
||||||
__acl /srv/project2/subdir \
|
__acl /srv/project2/subdir \
|
||||||
--default \
|
--default \
|
||||||
--remove \
|
--remove \
|
||||||
--entry group:secret-project:rwx \
|
--acl group:secret-project:rwx \
|
||||||
--entry user:alice:r-x
|
--acl user:alice:r-x
|
||||||
|
|
||||||
|
|
||||||
AUTHORS
|
AUTHORS
|
||||||
|
|
|
@ -1 +0,0 @@
|
||||||
see manual for details
|
|
|
@ -1,4 +1,3 @@
|
||||||
entry
|
|
||||||
acl
|
acl
|
||||||
user
|
user
|
||||||
group
|
group
|
||||||
|
|
|
@ -181,7 +181,7 @@ init_upstart()
|
||||||
|
|
||||||
# Install init script to start on boot
|
# Install init script to start on boot
|
||||||
case "$os" in
|
case "$os" in
|
||||||
devuan)
|
alpine|devuan)
|
||||||
init_sysvinit debian
|
init_sysvinit debian
|
||||||
;;
|
;;
|
||||||
centos|redhat)
|
centos|redhat)
|
||||||
|
|
|
@ -1 +0,0 @@
|
||||||
../__chroot_umount/manifest
|
|
|
@ -1,33 +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/>.
|
|
||||||
#
|
|
||||||
|
|
||||||
if [ -f "$__object/parameter/name" ]
|
|
||||||
then
|
|
||||||
name="$( cat "$__object/parameter/name" )"
|
|
||||||
else
|
|
||||||
name="$__object_id"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -n "$( mysql -B -N -e "show databases like '$name'" )" ]
|
|
||||||
then
|
|
||||||
echo 'present'
|
|
||||||
else
|
|
||||||
echo 'absent'
|
|
||||||
fi
|
|
|
@ -1,6 +1,6 @@
|
||||||
#!/bin/sh -e
|
#!/bin/sh -e
|
||||||
#
|
#
|
||||||
# 2020 Ander Punnar (ander-at-kvlt-dot-ee)
|
# 2012 Benedikt Koeppel (code@benediktkoeppel.ch)
|
||||||
#
|
#
|
||||||
# This file is part of cdist.
|
# This file is part of cdist.
|
||||||
#
|
#
|
||||||
|
@ -17,30 +17,38 @@
|
||||||
# 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/>.
|
||||||
#
|
#
|
||||||
|
#
|
||||||
|
|
||||||
state_is="$( cat "$__object/explorer/state" )"
|
# if --database was specified
|
||||||
|
if [ -f "$__object/parameter/name" ]; then
|
||||||
state_should="$( cat "$__object/parameter/state" )"
|
database="$(cat "$__object/parameter/name")"
|
||||||
|
else # otherwise use the object id as database name
|
||||||
if [ "$state_is" = "$state_should" ]
|
database="$__object_id"
|
||||||
then
|
|
||||||
exit 0
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -f "$__object/parameter/name" ]
|
cat <<-EOFF
|
||||||
then
|
mysql -u root <<-EOF
|
||||||
name="$( cat "$__object/parameter/name" )"
|
CREATE DATABASE IF NOT EXISTS $database
|
||||||
else
|
EOF
|
||||||
name="$__object_id"
|
EOFF
|
||||||
fi
|
|
||||||
|
|
||||||
case "$state_should" in
|
# if --user was specified
|
||||||
present)
|
if [ -f "$__object/parameter/user" ]; then
|
||||||
echo "mysql -e 'create database \`$name\`'"
|
user="$(cat "$__object/parameter/user")"
|
||||||
echo "create database $name" >> "$__messages_out"
|
|
||||||
;;
|
# if --password was specified
|
||||||
absent)
|
if [ -f "$__object/parameter/password" ]; then
|
||||||
echo "mysql -e 'drop database \`$name\`'"
|
password="$(cat "$__object/parameter/password")"
|
||||||
echo "drop database $name" >> "$__messages_out"
|
cat <<-EOFF
|
||||||
;;
|
mysql -u root <<-EOF
|
||||||
esac
|
GRANT ALL PRIVILEGES ON $database.* to '$user'@'localhost' IDENTIFIED BY '$password';
|
||||||
|
EOF
|
||||||
|
EOFF
|
||||||
|
else
|
||||||
|
cat <<-EOFF
|
||||||
|
mysql -u root <<-EOF
|
||||||
|
GRANT ALL PRIVILEGES ON $database.* to '$user'@'localhost';
|
||||||
|
EOF
|
||||||
|
EOFF
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
|
@ -8,24 +8,24 @@ cdist-type__mysql_database - Manage a MySQL database
|
||||||
|
|
||||||
DESCRIPTION
|
DESCRIPTION
|
||||||
-----------
|
-----------
|
||||||
|
This cdist type allows you to install a MySQL database.
|
||||||
|
|
||||||
Create MySQL database and optionally user with all privileges.
|
|
||||||
|
|
||||||
|
REQUIRED PARAMETERS
|
||||||
|
-------------------
|
||||||
|
None.
|
||||||
|
|
||||||
OPTIONAL PARAMETERS
|
OPTIONAL PARAMETERS
|
||||||
-------------------
|
-------------------
|
||||||
name
|
name
|
||||||
Name of database. Defaults to object id.
|
The name of the database to install
|
||||||
|
defaults to the object id
|
||||||
|
|
||||||
user
|
user
|
||||||
Create user and give all privileges to database.
|
A user that should have access to the database
|
||||||
|
|
||||||
password
|
password
|
||||||
Password for user.
|
The password for the user who manages the database
|
||||||
|
|
||||||
state
|
|
||||||
Defaults to present.
|
|
||||||
If absent and user is also set, both will be removed (with privileges).
|
|
||||||
|
|
||||||
|
|
||||||
EXAMPLES
|
EXAMPLES
|
||||||
|
@ -33,23 +33,17 @@ EXAMPLES
|
||||||
|
|
||||||
.. code-block:: sh
|
.. code-block:: sh
|
||||||
|
|
||||||
# just create database
|
__mysql_database "cdist" --name "cdist" --user "myuser" --password "mypwd"
|
||||||
__mysql_database foo
|
|
||||||
|
|
||||||
# create database with respective user with all privileges to database
|
|
||||||
__mysql_database bar \
|
|
||||||
--user name \
|
|
||||||
--password secret
|
|
||||||
|
|
||||||
|
|
||||||
AUTHORS
|
AUTHORS
|
||||||
-------
|
-------
|
||||||
Ander Punnar <ander-at-kvlt-dot-ee>
|
Benedikt Koeppel <code@benediktkoeppel.ch>
|
||||||
|
|
||||||
|
|
||||||
COPYING
|
COPYING
|
||||||
-------
|
-------
|
||||||
Copyright \(C) 2020 Ander Punnar. You can redistribute it and/or modify it
|
Copyright \(C) 2012 Benedikt Koeppel. You can redistribute it
|
||||||
under the terms of the GNU General Public License as published by the Free
|
and/or modify it under the terms of the GNU General Public License as
|
||||||
Software Foundation, either version 3 of the License, or (at your option) any
|
published by the Free Software Foundation, either version 3 of the
|
||||||
later version.
|
License, or (at your option) any later version.
|
||||||
|
|
|
@ -1,52 +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/>.
|
|
||||||
#
|
|
||||||
|
|
||||||
if [ -f "$__object/parameter/user" ]
|
|
||||||
then
|
|
||||||
user="$( cat "$__object/parameter/user" )"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -f "$__object/parameter/password" ]
|
|
||||||
then
|
|
||||||
password="$( cat "$__object/parameter/password" )"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -n "$user" ] && [ -n "$password" ]
|
|
||||||
then
|
|
||||||
if [ -f "$__object/parameter/name" ]
|
|
||||||
then
|
|
||||||
database="$( cat "$__object/parameter/name" )"
|
|
||||||
else
|
|
||||||
database="$__object_id"
|
|
||||||
fi
|
|
||||||
|
|
||||||
state_should="$( cat "$__object/parameter/state" )"
|
|
||||||
|
|
||||||
__mysql_user "$user" \
|
|
||||||
--password "$password" \
|
|
||||||
--state "$state_should"
|
|
||||||
|
|
||||||
# removing user should remove all user's privileges
|
|
||||||
require="__mysql_user/$user" \
|
|
||||||
__mysql_privileges "$database/$user" \
|
|
||||||
--database "$database" \
|
|
||||||
--user "$user" \
|
|
||||||
--state "$state_should"
|
|
||||||
fi
|
|
|
@ -1 +0,0 @@
|
||||||
present
|
|
|
@ -1,4 +1,3 @@
|
||||||
name
|
name
|
||||||
user
|
user
|
||||||
password
|
password
|
||||||
state
|
|
||||||
|
|
|
@ -1,40 +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/>.
|
|
||||||
#
|
|
||||||
|
|
||||||
privileges="$( cat "$__object/parameter/privileges" )"
|
|
||||||
|
|
||||||
database="$( cat "$__object/parameter/database" )"
|
|
||||||
|
|
||||||
table="$( cat "$__object/parameter/table" )"
|
|
||||||
|
|
||||||
user="$( cat "$__object/parameter/user" )"
|
|
||||||
|
|
||||||
host="$( cat "$__object/parameter/host" )"
|
|
||||||
|
|
||||||
check_privileges="$(
|
|
||||||
mysql -B -N -e "show grants for '$user'@'$host'" \
|
|
||||||
| grep -Ei "^grant $privileges on .$database.\..$table. to " || true )"
|
|
||||||
|
|
||||||
if [ -n "$check_privileges" ]
|
|
||||||
then
|
|
||||||
echo 'present'
|
|
||||||
else
|
|
||||||
echo 'absent'
|
|
||||||
fi
|
|
|
@ -1,49 +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/>.
|
|
||||||
#
|
|
||||||
|
|
||||||
state_is="$( cat "$__object/explorer/state" )"
|
|
||||||
|
|
||||||
state_should="$( cat "$__object/parameter/state" )"
|
|
||||||
|
|
||||||
if [ "$state_is" = "$state_should" ]
|
|
||||||
then
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
privileges="$( cat "$__object/parameter/privileges" )"
|
|
||||||
|
|
||||||
database="$( cat "$__object/parameter/database" )"
|
|
||||||
|
|
||||||
table="$( cat "$__object/parameter/table" )"
|
|
||||||
|
|
||||||
user="$( cat "$__object/parameter/user" )"
|
|
||||||
|
|
||||||
host="$( cat "$__object/parameter/host" )"
|
|
||||||
|
|
||||||
case "$state_should" in
|
|
||||||
present)
|
|
||||||
echo "mysql -e 'grant $privileges on \`$database\`.\`$table\` to \`$user\`@\`$host\`'"
|
|
||||||
echo "grant $privileges on $database.$table to $user@$host" >> "$__messages_out"
|
|
||||||
;;
|
|
||||||
absent)
|
|
||||||
echo "mysql -e 'revoke $privileges on \`$database\`.\`$table\` from \`$user\`@\`$host\`'"
|
|
||||||
echo "revoke $privileges on $database.$table from $user@$host" >> "$__messages_out"
|
|
||||||
;;
|
|
||||||
esac
|
|
|
@ -1,57 +0,0 @@
|
||||||
cdist-type__mysql_privileges(7)
|
|
||||||
===============================
|
|
||||||
|
|
||||||
NAME
|
|
||||||
----
|
|
||||||
cdist-type__mysql_privileges - Manage MySQL privileges
|
|
||||||
|
|
||||||
|
|
||||||
DESCRIPTION
|
|
||||||
-----------
|
|
||||||
|
|
||||||
Grant and revoke privileges of MySQL user.
|
|
||||||
|
|
||||||
|
|
||||||
REQUIRED PARAMETERS
|
|
||||||
-------------------
|
|
||||||
database
|
|
||||||
Name of database.
|
|
||||||
|
|
||||||
User
|
|
||||||
Name of user.
|
|
||||||
|
|
||||||
|
|
||||||
OPTIONAL PARAMETERS
|
|
||||||
-------------------
|
|
||||||
privileges
|
|
||||||
Defaults to "all".
|
|
||||||
|
|
||||||
table
|
|
||||||
Defaults to "*".
|
|
||||||
|
|
||||||
host
|
|
||||||
Defaults to localhost.
|
|
||||||
|
|
||||||
state
|
|
||||||
"present" grants and "absent" revokes. Defaults to present.
|
|
||||||
|
|
||||||
|
|
||||||
EXAMPLES
|
|
||||||
--------
|
|
||||||
|
|
||||||
.. code-block:: sh
|
|
||||||
|
|
||||||
__mysql_privileges user-to-db --database db --user user
|
|
||||||
|
|
||||||
|
|
||||||
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 +0,0 @@
|
||||||
localhost
|
|
|
@ -1 +0,0 @@
|
||||||
all privileges
|
|
|
@ -1 +0,0 @@
|
||||||
present
|
|
|
@ -1 +0,0 @@
|
||||||
*
|
|
|
@ -1,4 +0,0 @@
|
||||||
privileges
|
|
||||||
table
|
|
||||||
host
|
|
||||||
state
|
|
|
@ -1,2 +0,0 @@
|
||||||
database
|
|
||||||
user
|
|
|
@ -1,54 +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/>.
|
|
||||||
#
|
|
||||||
|
|
||||||
if [ -f "$__object/parameter/name" ]
|
|
||||||
then
|
|
||||||
name="$( cat "$__object/parameter/name" )"
|
|
||||||
else
|
|
||||||
name="$__object_id"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -f "$__object/parameter/password" ]
|
|
||||||
then
|
|
||||||
password="$( cat "$__object/parameter/password" )"
|
|
||||||
else
|
|
||||||
password=''
|
|
||||||
fi
|
|
||||||
|
|
||||||
host="$( cat "$__object/parameter/host" )"
|
|
||||||
|
|
||||||
check_user="$( mysql -B -N -e "select user from mysql.user where user = '$name' and host = '$host'" )"
|
|
||||||
|
|
||||||
if [ -n "$check_user" ]
|
|
||||||
then
|
|
||||||
if [ -n "$password" ]
|
|
||||||
then
|
|
||||||
check_password="$( mysql -B -N -e "select user from mysql.user where user = '$name' and host = '$host' and password = password( '$password' )" )"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -n "$password" ] && [ -z "$check_password" ]
|
|
||||||
then
|
|
||||||
echo 'change-password'
|
|
||||||
else
|
|
||||||
echo 'present'
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
echo 'absent'
|
|
||||||
fi
|
|
|
@ -1,68 +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/>.
|
|
||||||
#
|
|
||||||
|
|
||||||
state_is="$( cat "$__object/explorer/state" )"
|
|
||||||
|
|
||||||
state_should="$( cat "$__object/parameter/state" )"
|
|
||||||
|
|
||||||
if [ "$state_is" = "$state_should" ]
|
|
||||||
then
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -f "$__object/parameter/name" ]
|
|
||||||
then
|
|
||||||
name="$( cat "$__object/parameter/name" )"
|
|
||||||
else
|
|
||||||
name="$__object_id"
|
|
||||||
fi
|
|
||||||
|
|
||||||
host="$( cat "$__object/parameter/host" )"
|
|
||||||
|
|
||||||
if [ -f "$__object/parameter/password" ]
|
|
||||||
then
|
|
||||||
password="$( cat "$__object/parameter/password" )"
|
|
||||||
else
|
|
||||||
if [ "$state_should" = 'present' ]
|
|
||||||
then
|
|
||||||
echo '--password needed' >&2
|
|
||||||
exit 1
|
|
||||||
else
|
|
||||||
password=''
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "$state_is" = 'absent' ] && [ "$state_should" = 'present' ]
|
|
||||||
then
|
|
||||||
echo "mysql -e 'create user \`$name\`@\`$host\` identified by \"$password\"'"
|
|
||||||
echo "create user $name@$host" >> "$__messages_out"
|
|
||||||
|
|
||||||
elif [ "$state_is" != 'absent' ] && [ "$state_should" = 'absent' ]
|
|
||||||
then
|
|
||||||
echo "mysql -e 'drop user \`$name\`@\`$host\`'"
|
|
||||||
echo "drop user $name@$host" >> "$__messages_out"
|
|
||||||
|
|
||||||
elif [ "$state_is" = 'change-password' ]
|
|
||||||
then
|
|
||||||
# this only works with MySQL 5.7.6 and later or MariaDB 10.1.20 and later
|
|
||||||
echo "mysql -e 'alter user \`$name\`@\`$host\` identified by \"$password\"'"
|
|
||||||
echo "mysql -e 'flush privileges'"
|
|
||||||
echo "change password $name@$host" >> "$__messages_out"
|
|
||||||
fi
|
|
|
@ -1,48 +0,0 @@
|
||||||
cdist-type__mysql_user(7)
|
|
||||||
=========================
|
|
||||||
|
|
||||||
NAME
|
|
||||||
----
|
|
||||||
cdist-type__mysql_user - Manage a MySQL user
|
|
||||||
|
|
||||||
|
|
||||||
DESCRIPTION
|
|
||||||
-----------
|
|
||||||
|
|
||||||
Create MySQL user or change password for the user.
|
|
||||||
|
|
||||||
|
|
||||||
OPTIONAL PARAMETERS
|
|
||||||
-------------------
|
|
||||||
name
|
|
||||||
Name of user. Defaults to object id.
|
|
||||||
|
|
||||||
host
|
|
||||||
Host of user. Defaults to localhost.
|
|
||||||
|
|
||||||
password
|
|
||||||
Password of user.
|
|
||||||
|
|
||||||
state
|
|
||||||
Defaults to present.
|
|
||||||
|
|
||||||
|
|
||||||
EXAMPLES
|
|
||||||
--------
|
|
||||||
|
|
||||||
.. code-block:: sh
|
|
||||||
|
|
||||||
__mysql_user user --password secret
|
|
||||||
|
|
||||||
|
|
||||||
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 +0,0 @@
|
||||||
localhost
|
|
|
@ -1 +0,0 @@
|
||||||
present
|
|
|
@ -1,4 +0,0 @@
|
||||||
name
|
|
||||||
host
|
|
||||||
password
|
|
||||||
state
|
|
|
@ -1,44 +0,0 @@
|
||||||
#!/bin/sh
|
|
||||||
|
|
||||||
manager_dn=$(cat "${__object}/parameter/manager-dn")
|
|
||||||
manager_password=$(cat "${__object}/parameter/manager-password")
|
|
||||||
description=$(cat "${__object}/parameter/description")
|
|
||||||
suffix=$(cat "${__object}/parameter/suffix")
|
|
||||||
suffix_dc=$(printf "%s" "${suffix}" | awk -F',' '{print $1}' | awk -F'=' '{print $2}')
|
|
||||||
|
|
||||||
SLAPD_IPC=$(tr '\n' ' ' < "${__object}/parameter/slapd-url" | awk '{ print $1}')
|
|
||||||
|
|
||||||
cat <<DONE # | tee /dev/stderr
|
|
||||||
# Restart service
|
|
||||||
service slapd restart
|
|
||||||
# It can sometimes take a tiny bit to bind
|
|
||||||
sleep 1
|
|
||||||
# Create or update base object
|
|
||||||
if ldapsearch -xZ -D "${manager_dn}" -w "${manager_password}" -H '${SLAPD_IPC}' -b '${suffix}' -s base 2>&1 > /dev/null; then
|
|
||||||
# Already exists, use ldapmodify
|
|
||||||
ldapmodify -xZ -D "${manager_dn}" -w "${manager_password}" -H '${SLAPD_IPC}' <<EOF
|
|
||||||
dn: ${suffix}
|
|
||||||
changetype: modify
|
|
||||||
replace: objectClass
|
|
||||||
objectClass: top
|
|
||||||
objectClass: dcObject
|
|
||||||
objectClass: organization
|
|
||||||
-
|
|
||||||
replace: o
|
|
||||||
o: ${description}
|
|
||||||
-
|
|
||||||
replace: dc
|
|
||||||
dc: ${suffix_dc}
|
|
||||||
EOF
|
|
||||||
else
|
|
||||||
# Does not exist, use ldapadd
|
|
||||||
ldapadd -xZ -D "${manager_dn}" -w "${manager_password}" -H '${SLAPD_IPC}' <<EOF
|
|
||||||
dn: ${suffix}
|
|
||||||
objectClass: top
|
|
||||||
objectClass: dcObject
|
|
||||||
objectClass: organization
|
|
||||||
o: ${description}
|
|
||||||
dc: ${suffix_dc}
|
|
||||||
EOF
|
|
||||||
fi
|
|
||||||
DONE
|
|
|
@ -1,212 +0,0 @@
|
||||||
cdist-type__openldap_server(7)
|
|
||||||
==============================
|
|
||||||
|
|
||||||
NAME
|
|
||||||
----
|
|
||||||
cdist-type__openldap_server - Setup an openldap(4) server instance
|
|
||||||
|
|
||||||
|
|
||||||
DESCRIPTION
|
|
||||||
-----------
|
|
||||||
This type can be used to bootstrap an LDAP environment using openldap as slapd.
|
|
||||||
|
|
||||||
It bootstraps the LDAP server with sane defaults and creates and manages the
|
|
||||||
base DN defined by `suffix`.
|
|
||||||
|
|
||||||
|
|
||||||
REQUIRED PARAMETERS
|
|
||||||
-------------------
|
|
||||||
manager-dn
|
|
||||||
The rootdn to set up in the directory.
|
|
||||||
E.g. `cn=manager,dc=ungleich,dc=ch`. See `slapd.conf(5)`.
|
|
||||||
|
|
||||||
manager-password
|
|
||||||
The password for `manager-dn` in the directory.
|
|
||||||
This will be used to connect to the LDAP server on the first `slapd-url`
|
|
||||||
with the given `manager-dn`.
|
|
||||||
|
|
||||||
manager-password-hash
|
|
||||||
The password for `manager-dn` in the directory.
|
|
||||||
This should be valid for `slapd.conf` like `{SSHA}qV+mCs3u8Q2sCmUXT4Ybw7MebHTASMyr`.
|
|
||||||
Generate e.g. with: `slappasswd -s weneedgoodsecurity`.
|
|
||||||
See `slappasswd(8C)`, `slapd.conf(5)`.
|
|
||||||
TODO: implement this: http://blog.adamsbros.org/2015/06/09/openldap-ssha-salted-hashes-by-hand/
|
|
||||||
to derive from the manager-password parameter and ensure idempotency (care with salts).
|
|
||||||
At that point, manager-password-hash should be deprecated and ignored.
|
|
||||||
|
|
||||||
serverid
|
|
||||||
The server for the directory.
|
|
||||||
E.g. `dc=ungleich,dc=ch`. See `slapd.conf(5)`.
|
|
||||||
|
|
||||||
suffix
|
|
||||||
The suffix for the directory.
|
|
||||||
E.g. `dc=ungleich,dc=ch`. See `slapd.conf(5)`.
|
|
||||||
|
|
||||||
|
|
||||||
REQUIRED MULTIPLE PARAMETERS
|
|
||||||
----------------------------
|
|
||||||
slapd-url
|
|
||||||
A URL for slapd to listen on.
|
|
||||||
Pass once for each URL you want to support,
|
|
||||||
e.g.: `--slapd-url ldaps://my.fqdn/ --slapd-url ldap://my.fqdn/`.
|
|
||||||
The first instance that is passed will be used as the main URL to
|
|
||||||
connect to this LDAP server
|
|
||||||
See the `-h` flag in `slapd(8C)`.
|
|
||||||
|
|
||||||
|
|
||||||
OPTIONAL PARAMETERS
|
|
||||||
-------------------
|
|
||||||
syncrepl-credentials
|
|
||||||
Only has an effect if `replicate` is set; required in that case.
|
|
||||||
This secret is shared amongst the hosts that will replicate the directory.
|
|
||||||
Note that each replication server needs this secret and it is saved in
|
|
||||||
plain text in the directory.
|
|
||||||
|
|
||||||
syncrepl-searchbase
|
|
||||||
Only has an effect if `replicate` is set; required in that case.
|
|
||||||
The searchbase to use for replication.
|
|
||||||
E.g. `dc=ungleich,dc=ch`. See `slapd.conf(5)`.
|
|
||||||
|
|
||||||
admin-email
|
|
||||||
Passed to `cdist-type__letsencrypt_cert`; has otherwise no use.
|
|
||||||
Required if using `__letsencrypt_cert`.
|
|
||||||
Where to send Let's Encrypt emails like "certificate needs renewal".
|
|
||||||
|
|
||||||
tls-cipher-suite
|
|
||||||
Setting for TLSCipherSuite.
|
|
||||||
Defaults to `NORMAL` in a Debian-like OS and `HIGH:MEDIUM:+SSLv2` on FreeBSD.
|
|
||||||
See `slapd.conf(5)`.
|
|
||||||
|
|
||||||
tls-cert
|
|
||||||
If defined, `__letsencrypt_cert` is not used and this must be the path in
|
|
||||||
the remote hosts to the PEM-encoded TLS certificate.
|
|
||||||
Requires: `tls-privkey` and `tls-ca`.
|
|
||||||
Permissions, existence and renewal of these files are left up to the
|
|
||||||
type's user.
|
|
||||||
|
|
||||||
tls-privkey
|
|
||||||
Required if `tls-cert` is defined.
|
|
||||||
Path in the remote hosts to the PEM-encoded private key file.
|
|
||||||
|
|
||||||
tls-ca
|
|
||||||
Required if `tls-cert` is defined.
|
|
||||||
Path in the remote hosts to the PEM-encoded CA certificate file.
|
|
||||||
|
|
||||||
|
|
||||||
OPTIONAL MULTIPLE PARAMETERS
|
|
||||||
----------------------------
|
|
||||||
syncrepl-host
|
|
||||||
Only has an effect if `replicate` is set; required in that case.
|
|
||||||
Set once per host that will replicate the directory.
|
|
||||||
|
|
||||||
module
|
|
||||||
LDAP module to load. See `slapd.conf(5)`.
|
|
||||||
Default value is OS-dependent, see manifest.
|
|
||||||
|
|
||||||
schema
|
|
||||||
Name of LDAP schema to load. Must be the name without extension of a
|
|
||||||
`.schema` file in slapd's schema directory (usually `/etc/slapd/schema` or
|
|
||||||
`/usr/local/etc/openldap/schema`).
|
|
||||||
Example value: `inetorgperson`
|
|
||||||
The type user must ensure that the schema file is deployed.
|
|
||||||
This defaults to a sensible subset, for details see the type definition.
|
|
||||||
|
|
||||||
description
|
|
||||||
The description of the base DN passed in the `suffix` parameter.
|
|
||||||
Defaults to `Managed by cdist, do not edit manually.`
|
|
||||||
|
|
||||||
|
|
||||||
BOOLEAN PARAMETERS
|
|
||||||
------------------
|
|
||||||
staging
|
|
||||||
Passed to `cdist-type__letsencrypt_cert`; has otherwise no use.
|
|
||||||
Obtain a test certificate from a staging server.
|
|
||||||
|
|
||||||
replicate
|
|
||||||
Whether to setup replication or not.
|
|
||||||
If present `syncrepl-credentials` and `syncrepl-host` are also required.
|
|
||||||
|
|
||||||
|
|
||||||
EXAMPLES
|
|
||||||
--------
|
|
||||||
|
|
||||||
.. code-block:: sh
|
|
||||||
|
|
||||||
# Example of a simple server with manual certificate management.
|
|
||||||
pki_prefix="/usr/local/etc/pki/realms/ldap.camilion.cloud"
|
|
||||||
__openldap_server \
|
|
||||||
--manager-dn 'cn=manager,dc=camilion,dc=cloud' \
|
|
||||||
--manager-password "foo" \
|
|
||||||
--manager-password-hash '{SSHA}foo' \
|
|
||||||
--serverid 0 \
|
|
||||||
--suffix 'dc=camilion,dc=cloud' \
|
|
||||||
--slapd-url 'ldaps://ldap.camilion.cloud' \
|
|
||||||
--tls-cert "${pki_prefix}/default.crt" \
|
|
||||||
--tls-privkey "${pki_prefix}/default.key" \
|
|
||||||
--tls-ca "${pki_prefix}/CA.crt"
|
|
||||||
|
|
||||||
# The created basedn looks as follows:
|
|
||||||
#
|
|
||||||
# dn: dc=camilion,dc=cloud
|
|
||||||
# objectClass: top
|
|
||||||
# objectClass: dcObject
|
|
||||||
# objectClass: organization
|
|
||||||
# o: Managed by cdist, do not edit manually.
|
|
||||||
# dc: camilion
|
|
||||||
#
|
|
||||||
# Do not change it manually, the type will overwrite your changes.
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Changing to a replicated setup is a simple change to something like:
|
|
||||||
#
|
|
||||||
# Example for multiple servers with replication and automatic
|
|
||||||
# Let's Encrypt certificate management through certbot.
|
|
||||||
id=1
|
|
||||||
for host in ldap-test1.ungleich.ch ldap-test2.ungleich.ch; do
|
|
||||||
echo "__ungleich_ldap \
|
|
||||||
--manager-dn 'cn=manager,dc=ungleich,dc=ch' \
|
|
||||||
--manager-psasword 'foo' \
|
|
||||||
--manager-password-hash '{SSHA}fooo' \
|
|
||||||
--serverid '${id}' \
|
|
||||||
--suffix 'dc=ungleich,dc=ch' \
|
|
||||||
--slapd-url ldap://${host} \
|
|
||||||
--searchbase 'dc=ungleich,dc=ch' \
|
|
||||||
--syncrepl-credentials 'fooo' \
|
|
||||||
--syncrepl-host 'ldap-test1.ungleich.ch' \
|
|
||||||
--syncrepl-host 'ldap-test2.ungleich.ch' \
|
|
||||||
--description 'Ungleich LDAP server'" \
|
|
||||||
--staging \
|
|
||||||
| cdist config -i - -v ${host}
|
|
||||||
id=$((id + 1))
|
|
||||||
done
|
|
||||||
|
|
||||||
# The created basedn looks as follows:
|
|
||||||
#
|
|
||||||
# dn: dc=ungleich,dc=ch
|
|
||||||
# objectClass: top
|
|
||||||
# objectClass: dcObject
|
|
||||||
# objectClass: organization
|
|
||||||
# o: Ungleich LDAP server
|
|
||||||
# dc: ungleich
|
|
||||||
#
|
|
||||||
# Do not change it manually, the type will overwrite your changes.
|
|
||||||
|
|
||||||
|
|
||||||
SEE ALSO
|
|
||||||
--------
|
|
||||||
:strong:`cdist-type__letsencrypt_cert`\ (7)
|
|
||||||
|
|
||||||
|
|
||||||
AUTHORS
|
|
||||||
-------
|
|
||||||
ungleich <foss--@--ungleich.ch>
|
|
||||||
Evilham <contact--@--evilham.com>
|
|
||||||
|
|
||||||
|
|
||||||
COPYING
|
|
||||||
-------
|
|
||||||
Copyright \(C) 2020 ungleich glarus ag. You can redistribute it
|
|
||||||
and/or modify it under the terms of the GNU General Public License as
|
|
||||||
published by the Free Software Foundation, either version 3 of the
|
|
||||||
License, or (at your option) any later version.
|
|
|
@ -1,263 +0,0 @@
|
||||||
#!/bin/sh
|
|
||||||
|
|
||||||
name="${__target_host}"
|
|
||||||
manager_dn=$(cat "${__object}/parameter/manager-dn")
|
|
||||||
manager_password_hash=$(cat "${__object}/parameter/manager-password-hash")
|
|
||||||
serverid=$(cat "${__object}/parameter/serverid")
|
|
||||||
suffix=$(cat "${__object}/parameter/suffix")
|
|
||||||
slapd_modules=$(cat "${__object}/parameter/module" 2>/dev/null || true)
|
|
||||||
schemas=$(cat "${__object}/parameter/schema")
|
|
||||||
slapd_urls=$(tr '\n' ' ' < "${__object}/parameter/slapd-url")
|
|
||||||
tls_cipher_suite=$(cat "${__object}/parameter/tls-cipher-suite" 2>/dev/null || true)
|
|
||||||
|
|
||||||
|
|
||||||
os="$(cat "${__global}/explorer/os")"
|
|
||||||
|
|
||||||
# Setup OS-dependent vars
|
|
||||||
CONF_OWNER="root"
|
|
||||||
CONF_GROUP="root"
|
|
||||||
case "${os}" in
|
|
||||||
freebsd)
|
|
||||||
PKGS="openldap-server"
|
|
||||||
ETC="/usr/local/etc"
|
|
||||||
SLAPD_DIR="/usr/local/etc/openldap"
|
|
||||||
SLAPD_DATA_DIR="/var/db/openldap-data"
|
|
||||||
SLAPD_RUN_DIR="/var/run/openldap"
|
|
||||||
SLAPD_MODULE_PATH="/usr/local/libexec/openldap"
|
|
||||||
if [ -z "${slapd_modules}" ]; then
|
|
||||||
# It looks like ppolicy and syncprov must be compiled
|
|
||||||
slapd_modules="back_mdb back_monitor"
|
|
||||||
fi
|
|
||||||
CONF_OWNER="ldap"
|
|
||||||
CONF_GROUP="ldap"
|
|
||||||
if [ -z "${tls_cipher_suite}" ]; then
|
|
||||||
# TODO: research default for FreeBSD. 'NORMAL' appears to not work
|
|
||||||
tls_cipher_suite="HIGH:MEDIUM:+SSLv2"
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
debian|ubuntu|devuan)
|
|
||||||
PKGS="slapd ldap-utils"
|
|
||||||
ETC="/etc"
|
|
||||||
SLAPD_DIR="/etc/ldap"
|
|
||||||
SLAPD_DATA_DIR="/var/lib/ldap"
|
|
||||||
SLAPD_RUN_DIR="/var/run/slapd"
|
|
||||||
SLAPD_MODULE_PATH="/usr/lib/ldap"
|
|
||||||
if [ -z "${slapd_modules}" ]; then
|
|
||||||
slapd_modules="back_mdb ppolicy syncprov back_monitor"
|
|
||||||
fi
|
|
||||||
if [ -z "${tls_cipher_suite}" ]; then
|
|
||||||
tls_cipher_suite="NORMAL"
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
echo "Don't know the openldap defaults for: $os" >&2
|
|
||||||
exit 1
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
PKG_MAIN=$(echo "${PKGS}" | awk '{print $1;}')
|
|
||||||
|
|
||||||
|
|
||||||
# Determine if __letsencrypt_cert is to be used and setup vars accordingly
|
|
||||||
if [ -f "${__object}/parameter/tls-cert" ]; then
|
|
||||||
tls_cert=$(cat "${__object}/parameter/tls-cert")
|
|
||||||
|
|
||||||
if [ ! -f "${__object}/parameter/tls-privkey" ]; then
|
|
||||||
echo "When tls-cert is defined, tls-privkey is also required." >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
tls_privkey=$(cat "${__object}/parameter/tls-privkey")
|
|
||||||
|
|
||||||
if [ ! -f "${__object}/parameter/tls-ca" ]; then
|
|
||||||
echo "When tls-cert is defined, tls-ca is also required." >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
tls_ca=$(cat "${__object}/parameter/tls-ca")
|
|
||||||
|
|
||||||
_skip_letsencrypt_cert="YES"
|
|
||||||
else
|
|
||||||
if [ ! -f "${__object}/parameter/admin-email" ]; then
|
|
||||||
echo "When using __letsencrypt_cert, admin-email is also required." >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
admin_email=$(cat "${__object}/parameter/admin-email")
|
|
||||||
|
|
||||||
tls_cert="${SLAPD_DIR}/sasl2/cert.pem"
|
|
||||||
tls_privkey="${SLAPD_DIR}/sasl2/privkey.pem"
|
|
||||||
tls_ca="${SLAPD_DIR}/sasl2/chain.pem"
|
|
||||||
fi
|
|
||||||
|
|
||||||
mkdir "${__object}/files"
|
|
||||||
ldapconf="${__object}/files/ldapconf"
|
|
||||||
|
|
||||||
replication=""
|
|
||||||
if [ -f "${__object}/parameter/replicate" ]; then
|
|
||||||
replication=yes
|
|
||||||
|
|
||||||
if [ ! -f "${__object}/parameter/syncrepl-searchbase" ]; then
|
|
||||||
echo "Requiring the searchbase for replication" >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
syncrepl_searchbase=$(cat "${__object}/parameter/syncrepl-searchbase")
|
|
||||||
|
|
||||||
if [ ! -f "${__object}/parameter/syncrepl-credentials" ]; then
|
|
||||||
echo "Requiring credentials for replication" >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
syncrepl_credentials=$(cat "${__object}/parameter/syncrepl-credentials")
|
|
||||||
|
|
||||||
if [ ! -f "${__object}/parameter/syncrepl-host" ]; then
|
|
||||||
echo "Requiring host(s) for replication" >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
syncrepl_hosts=$(cat "${__object}/parameter/syncrepl-host")
|
|
||||||
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Install required packages
|
|
||||||
for pkg in ${PKGS}; do
|
|
||||||
__package "${pkg}"
|
|
||||||
done
|
|
||||||
|
|
||||||
|
|
||||||
require="__package/${PKG_MAIN}" __start_on_boot slapd
|
|
||||||
|
|
||||||
# Setup -h flag for the listeners. See man slapd (-h flag).
|
|
||||||
case "${os}" in
|
|
||||||
freebsd)
|
|
||||||
require="__start_on_boot/slapd" __key_value \
|
|
||||||
--file "/etc/rc.conf" \
|
|
||||||
--key "slapd_flags" \
|
|
||||||
--value "\"-h '${slapd_urls}'\"" \
|
|
||||||
--delimiter "=" \
|
|
||||||
--comment "# LDAP Listener URLs" \
|
|
||||||
"${__target_host}__slapd_flags"
|
|
||||||
;;
|
|
||||||
debian|ubuntu|devuan)
|
|
||||||
require="__package/${PKG_MAIN}" __line rm_slapd_conf \
|
|
||||||
--file ${ETC}/default/slapd \
|
|
||||||
--regex 'SLAPD_CONF=.*' \
|
|
||||||
--state absent
|
|
||||||
|
|
||||||
require="__package/${PKG_MAIN}" __line rm_slapd_services \
|
|
||||||
--file ${ETC}/default/slapd \
|
|
||||||
--regex 'SLAPD_SERVICES=.*' \
|
|
||||||
--state absent
|
|
||||||
|
|
||||||
require="__line/rm_slapd_conf" __line add_slapd_conf \
|
|
||||||
--file ${ETC}/default/slapd \
|
|
||||||
--line "SLAPD_CONF=${SLAPD_DIR}/slapd.conf" \
|
|
||||||
--state present
|
|
||||||
|
|
||||||
require="__line/rm_slapd_services" __line add_slapd_services \
|
|
||||||
--file ${ETC}/default/slapd \
|
|
||||||
--line "SLAPD_SERVICES=\"${slapd_urls}\"" \
|
|
||||||
--state present
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
# Nothing to do here, move on.
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
|
|
||||||
if [ -z "${_skip_letsencrypt_cert}" ]; then
|
|
||||||
if [ -f "${__object}/parameter/staging" ]; then
|
|
||||||
staging="--staging"
|
|
||||||
else
|
|
||||||
staging=""
|
|
||||||
fi
|
|
||||||
|
|
||||||
__letsencrypt_cert "${name}" --admin-email "${admin_email}" \
|
|
||||||
--renew-hook "cp ${ETC}/letsencrypt/live/${name}/*.pem ${SLAPD_DIR}/sasl2 && chown -R openldap:openldap ${SLAPD_DIR}/sasl2 && service slapd restart" \
|
|
||||||
--automatic-renewal ${staging}
|
|
||||||
fi
|
|
||||||
|
|
||||||
require="__package/${PKG_MAIN}" __directory ${SLAPD_DIR}/slapd.d --state absent
|
|
||||||
|
|
||||||
if [ -z "${_skip_letsencrypt_cert}" ]; then
|
|
||||||
require="__package/${PKG_MAIN} __letsencrypt_cert/${name}" \
|
|
||||||
__file ${SLAPD_DIR}/slapd.conf --owner ${CONF_OWNER} --group ${CONF_GROUP} --mode 644 \
|
|
||||||
--source "${ldapconf}"
|
|
||||||
else
|
|
||||||
require="__package/${PKG_MAIN}" \
|
|
||||||
__file ${SLAPD_DIR}/slapd.conf --owner ${CONF_OWNER} --group ${CONF_GROUP} --mode 644 \
|
|
||||||
--source "${ldapconf}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Start slapd.conf
|
|
||||||
cat << EOF > "${ldapconf}"
|
|
||||||
pidfile ${SLAPD_RUN_DIR}/slapd.pid
|
|
||||||
argsfile ${SLAPD_RUN_DIR}/slapd.args
|
|
||||||
|
|
||||||
TLSCipherSuite ${tls_cipher_suite}
|
|
||||||
TLSCertificateFile ${tls_cert}
|
|
||||||
TLSCertificateKeyFile ${tls_privkey}
|
|
||||||
TLSCACertificateFile ${tls_ca}
|
|
||||||
|
|
||||||
disallow bind_anon
|
|
||||||
require bind
|
|
||||||
security tls=1
|
|
||||||
EOF
|
|
||||||
|
|
||||||
# Add specified schemas
|
|
||||||
for schema in ${schemas}; do
|
|
||||||
echo "include ${SLAPD_DIR}/schema/${schema}.schema" >> "${ldapconf}"
|
|
||||||
done
|
|
||||||
|
|
||||||
# Add specified modules
|
|
||||||
echo "modulepath ${SLAPD_MODULE_PATH}" >> "${ldapconf}"
|
|
||||||
for module in ${slapd_modules}; do
|
|
||||||
echo "moduleload ${module}.la" >> "${ldapconf}"
|
|
||||||
done
|
|
||||||
|
|
||||||
# Rest of the config
|
|
||||||
cat << EOF >> "${ldapconf}"
|
|
||||||
loglevel 1024
|
|
||||||
|
|
||||||
database mdb
|
|
||||||
maxsize 1073741824
|
|
||||||
|
|
||||||
suffix "${suffix}"
|
|
||||||
directory ${SLAPD_DATA_DIR}
|
|
||||||
rootdn "${manager_dn}"
|
|
||||||
rootpw "${manager_password_hash}"
|
|
||||||
|
|
||||||
index objectClass eq,pres
|
|
||||||
index ou,cn,mail,surname,givenname eq,pres,sub
|
|
||||||
index uidNumber,gidNumber,loginShell eq,pres
|
|
||||||
index uid,memberUid eq,pres,sub
|
|
||||||
index nisMapName,nisMapEntry eq,pres,sub
|
|
||||||
index entryCSN,entryUUID eq
|
|
||||||
|
|
||||||
serverid ${serverid}
|
|
||||||
EOF
|
|
||||||
|
|
||||||
# Setup replication
|
|
||||||
if [ "${replication}" ]; then
|
|
||||||
rid=1;
|
|
||||||
for syncrepl in ${syncrepl_hosts}; do
|
|
||||||
cat <<EOF >> "${ldapconf}"
|
|
||||||
syncrepl rid=${rid}
|
|
||||||
provider=ldap://${syncrepl}
|
|
||||||
bindmethod=simple
|
|
||||||
starttls=yes
|
|
||||||
binddn="${manager_dn}"
|
|
||||||
credentials=${syncrepl_credentials}
|
|
||||||
searchbase="${syncrepl_searchbase}"
|
|
||||||
type=refreshAndPersist
|
|
||||||
retry="5 + 5 +"
|
|
||||||
interval=00:00:00:05
|
|
||||||
EOF
|
|
||||||
rid=$((rid + 1))
|
|
||||||
done
|
|
||||||
cat <<EOF >> "${ldapconf}"
|
|
||||||
mirrormode true
|
|
||||||
overlay syncprov
|
|
||||||
syncprov-checkpoint 100 5
|
|
||||||
syncprov-sessionlog 100
|
|
||||||
|
|
||||||
database monitor
|
|
||||||
limits dn.exact="${manager_dn}" time=unlimited size=unlimited
|
|
||||||
EOF
|
|
||||||
fi
|
|
|
@ -1,2 +0,0 @@
|
||||||
staging
|
|
||||||
replicate
|
|
|
@ -1 +0,0 @@
|
||||||
Managed by cdist, do not edit manually.
|
|
|
@ -1,12 +0,0 @@
|
||||||
corba
|
|
||||||
core
|
|
||||||
cosine
|
|
||||||
duaconf
|
|
||||||
dyngroup
|
|
||||||
inetorgperson
|
|
||||||
java
|
|
||||||
misc
|
|
||||||
nis
|
|
||||||
openldap
|
|
||||||
ppolicy
|
|
||||||
collective
|
|
|
@ -1,8 +0,0 @@
|
||||||
description
|
|
||||||
syncrepl-credentials
|
|
||||||
syncrepl-searchbase
|
|
||||||
admin-email
|
|
||||||
tls-cipher-suite
|
|
||||||
tls-cert
|
|
||||||
tls-privkey
|
|
||||||
tls-ca
|
|
|
@ -1,3 +0,0 @@
|
||||||
syncrepl-host
|
|
||||||
module
|
|
||||||
schema
|
|
|
@ -1,5 +0,0 @@
|
||||||
manager-dn
|
|
||||||
manager-password
|
|
||||||
manager-password-hash
|
|
||||||
serverid
|
|
||||||
suffix
|
|
|
@ -1 +0,0 @@
|
||||||
slapd-url
|
|
|
@ -41,16 +41,12 @@ if [ "$state_should" != "$state_is" ]; then
|
||||||
present)
|
present)
|
||||||
owner=""
|
owner=""
|
||||||
if [ -f "$__object/parameter/owner" ]; then
|
if [ -f "$__object/parameter/owner" ]; then
|
||||||
owner="-O \"$(cat "$__object/parameter/owner")\""
|
owner="-O '$(cat "$__object/parameter/owner")'"
|
||||||
fi
|
fi
|
||||||
cat << EOF
|
echo "su - '$postgres_user' -c \"createdb $owner '$name'\""
|
||||||
su - '$postgres_user' -c "createdb $owner \"$name\""
|
|
||||||
EOF
|
|
||||||
;;
|
;;
|
||||||
absent)
|
absent)
|
||||||
cat << EOF
|
echo "su - '$postgres_user' -c \"dropdb '$name'\""
|
||||||
su - '$postgres_user' -c "dropdb \"$name\""
|
|
||||||
EOF
|
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -53,13 +53,11 @@ case "$state_should" in
|
||||||
done
|
done
|
||||||
|
|
||||||
[ -n "$password" ] && password="PASSWORD '$password'"
|
[ -n "$password" ] && password="PASSWORD '$password'"
|
||||||
cat << EOF
|
|
||||||
su - '$postgres_user' -c "psql postgres -wc 'CREATE ROLE \"$name\" WITH $password $booleans;'"
|
cmd="CREATE ROLE $name WITH $password $booleans"
|
||||||
EOF
|
echo "su - '$postgres_user' -c \"psql postgres -wc \\\"$cmd\\\"\""
|
||||||
;;
|
;;
|
||||||
absent)
|
absent)
|
||||||
cat << EOF
|
echo "su - '$postgres_user' -c \"dropuser \\\"$name\\\"\""
|
||||||
su - '$postgres_user' -c "dropuser \"$name\""
|
|
||||||
EOF
|
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
|
@ -12,7 +12,7 @@ This cdist type allows you to enable or disable stuff to be started
|
||||||
at boot of your operating system.
|
at boot of your operating system.
|
||||||
|
|
||||||
Warning: This type has not been tested intensively and is not fully
|
Warning: This type has not been tested intensively and is not fully
|
||||||
supported.
|
supported (i.e. \*BSD are not implemented).
|
||||||
|
|
||||||
|
|
||||||
REQUIRED PARAMETERS
|
REQUIRED PARAMETERS
|
||||||
|
|
|
@ -69,6 +69,7 @@ class Local(object):
|
||||||
|
|
||||||
self.exec_path = exec_path
|
self.exec_path = exec_path
|
||||||
self.custom_initial_manifest = initial_manifest
|
self.custom_initial_manifest = initial_manifest
|
||||||
|
self._add_conf_dirs = add_conf_dirs
|
||||||
self.cache_path_pattern = cache_path_pattern
|
self.cache_path_pattern = cache_path_pattern
|
||||||
self.quiet_mode = quiet_mode
|
self.quiet_mode = quiet_mode
|
||||||
if configuration:
|
if configuration:
|
||||||
|
@ -83,7 +84,16 @@ class Local(object):
|
||||||
self._init_cache_dir(None)
|
self._init_cache_dir(None)
|
||||||
self._init_paths()
|
self._init_paths()
|
||||||
self._init_object_marker()
|
self._init_object_marker()
|
||||||
self._init_conf_dirs(add_conf_dirs)
|
self._init_conf_dirs()
|
||||||
|
|
||||||
|
@property
|
||||||
|
def dist_conf_dir(self):
|
||||||
|
return os.path.abspath(os.path.join(os.path.dirname(cdist.__file__),
|
||||||
|
"conf"))
|
||||||
|
|
||||||
|
@property
|
||||||
|
def home_dir(self):
|
||||||
|
return cdist.home_dir()
|
||||||
|
|
||||||
def _init_log(self):
|
def _init_log(self):
|
||||||
self.log = logging.getLogger(self.target_host[0])
|
self.log = logging.getLogger(self.target_host[0])
|
||||||
|
@ -130,9 +140,28 @@ class Local(object):
|
||||||
# Does not need to be secure - just randomly different from .cdist
|
# Does not need to be secure - just randomly different from .cdist
|
||||||
self.object_marker_name = tempfile.mktemp(prefix='.cdist-', dir='')
|
self.object_marker_name = tempfile.mktemp(prefix='.cdist-', dir='')
|
||||||
|
|
||||||
def _init_conf_dirs(self, add_conf_dirs):
|
def _init_conf_dirs(self):
|
||||||
self.conf_dirs = util.resolve_conf_dirs(
|
self.conf_dirs = []
|
||||||
self.configuration, add_conf_dirs=add_conf_dirs)
|
|
||||||
|
self.conf_dirs.append(self.dist_conf_dir)
|
||||||
|
|
||||||
|
# Is the default place for user created explorer, type and manifest
|
||||||
|
if self.home_dir:
|
||||||
|
self.conf_dirs.append(self.home_dir)
|
||||||
|
|
||||||
|
# Add directories defined in the CDIST_PATH environment variable
|
||||||
|
# if 'CDIST_PATH' in os.environ:
|
||||||
|
# cdist_path_dirs = re.split(r'(?<!\\):', os.environ['CDIST_PATH'])
|
||||||
|
# cdist_path_dirs.reverse()
|
||||||
|
# self.conf_dirs.extend(cdist_path_dirs)
|
||||||
|
if 'conf_dir' in self.configuration:
|
||||||
|
conf_dirs = self.configuration['conf_dir']
|
||||||
|
if conf_dirs:
|
||||||
|
self.conf_dirs.extend(conf_dirs)
|
||||||
|
|
||||||
|
# Add command line supplied directories
|
||||||
|
if self._add_conf_dirs:
|
||||||
|
self.conf_dirs.extend(self._add_conf_dirs)
|
||||||
|
|
||||||
def _init_directories(self):
|
def _init_directories(self):
|
||||||
self.mkdir(self.conf_path)
|
self.mkdir(self.conf_path)
|
||||||
|
@ -158,11 +187,10 @@ class Local(object):
|
||||||
self.object_marker_name, self.object_marker_file))
|
self.object_marker_name, self.object_marker_file))
|
||||||
|
|
||||||
def _init_cache_dir(self, cache_dir):
|
def _init_cache_dir(self, cache_dir):
|
||||||
home_dir = cdist.home_dir()
|
|
||||||
if cache_dir:
|
if cache_dir:
|
||||||
self.cache_path = cache_dir
|
self.cache_path = cache_dir
|
||||||
elif home_dir:
|
elif self.home_dir:
|
||||||
self.cache_path = os.path.join(home_dir, "cache")
|
self.cache_path = os.path.join(self.home_dir, "cache")
|
||||||
else:
|
else:
|
||||||
raise cdist.Error(
|
raise cdist.Error(
|
||||||
"No homedir setup and no cache dir location given")
|
"No homedir setup and no cache dir location given")
|
||||||
|
|
|
@ -24,7 +24,6 @@ import os
|
||||||
from tempfile import TemporaryFile
|
from tempfile import TemporaryFile
|
||||||
|
|
||||||
import cdist
|
import cdist
|
||||||
import cdist.configuration
|
|
||||||
|
|
||||||
|
|
||||||
# IMPORTANT:
|
# IMPORTANT:
|
||||||
|
@ -176,34 +175,3 @@ def log_std_fd(log, command, stdfd, prefix):
|
||||||
stdfd.seek(0, 0)
|
stdfd.seek(0, 0)
|
||||||
log.trace("Command: {}; {}: {}".format(
|
log.trace("Command: {}; {}: {}".format(
|
||||||
command, prefix, stdfd.read().decode()))
|
command, prefix, stdfd.read().decode()))
|
||||||
|
|
||||||
|
|
||||||
def dist_conf_dir():
|
|
||||||
return os.path.abspath(os.path.join(os.path.dirname(cdist.__file__),
|
|
||||||
"conf"))
|
|
||||||
|
|
||||||
|
|
||||||
def resolve_conf_dirs(configuration, add_conf_dirs):
|
|
||||||
conf_dirs = []
|
|
||||||
|
|
||||||
conf_dirs.append(dist_conf_dir())
|
|
||||||
|
|
||||||
home_dir = cdist.home_dir()
|
|
||||||
if home_dir:
|
|
||||||
conf_dirs.append(home_dir)
|
|
||||||
|
|
||||||
if 'conf_dir' in configuration:
|
|
||||||
x = configuration['conf_dir']
|
|
||||||
if x:
|
|
||||||
conf_dirs.extend(x)
|
|
||||||
|
|
||||||
if add_conf_dirs:
|
|
||||||
conf_dirs.extend(add_conf_dirs)
|
|
||||||
conf_dirs = set(conf_dirs)
|
|
||||||
return conf_dirs
|
|
||||||
|
|
||||||
|
|
||||||
def resolve_conf_dirs_from_config_and_args(args):
|
|
||||||
cfg = cdist.configuration.Configuration(args)
|
|
||||||
configuration = cfg.get_config(section='GLOBAL')
|
|
||||||
return resolve_conf_dirs(configuration, args.conf_dir)
|
|
||||||
|
|
181
cdist/info.py
181
cdist/info.py
|
@ -1,181 +0,0 @@
|
||||||
#!/usr/bin/env python3
|
|
||||||
# -*- coding: utf-8 -*-
|
|
||||||
#
|
|
||||||
# 2019-2020 Darko Poljak (darko.poljak at gmail.com)
|
|
||||||
#
|
|
||||||
# This file is part of cdist.
|
|
||||||
#
|
|
||||||
# cdist is free software: you can redistribute it and/or modify
|
|
||||||
# it under the terms of the GNU General Public License as published by
|
|
||||||
# the Free Software Foundation, either version 3 of the License, or
|
|
||||||
# (at your option) any later version.
|
|
||||||
#
|
|
||||||
# cdist is distributed in the hope that it will be useful,
|
|
||||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
# GNU General Public License for more details.
|
|
||||||
#
|
|
||||||
# You should have received a copy of the GNU General Public License
|
|
||||||
# along with cdist. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
#
|
|
||||||
#
|
|
||||||
|
|
||||||
import cdist
|
|
||||||
import cdist.configuration
|
|
||||||
import cdist.core
|
|
||||||
import cdist.exec.util as util
|
|
||||||
import os
|
|
||||||
import glob
|
|
||||||
import fnmatch
|
|
||||||
|
|
||||||
|
|
||||||
class Info(object):
|
|
||||||
|
|
||||||
def __init__(self, conf_dirs, args):
|
|
||||||
self.conf_dirs = conf_dirs
|
|
||||||
self.all = args.all
|
|
||||||
self.display_global_explorers = args.global_explorers
|
|
||||||
self.display_types = args.types
|
|
||||||
if not self.display_global_explorers and not self.display_types:
|
|
||||||
self.all = True
|
|
||||||
self.fixed_string = args.fixed_string
|
|
||||||
self._setup_glob_pattern(args.pattern)
|
|
||||||
self.full = args.full
|
|
||||||
|
|
||||||
def _setup_glob_pattern(self, pattern):
|
|
||||||
if pattern is None:
|
|
||||||
self.glob_pattern = '*'
|
|
||||||
elif ('?' in pattern or '*' in pattern or '[' in pattern or
|
|
||||||
self.fixed_string):
|
|
||||||
self.glob_pattern = pattern
|
|
||||||
else:
|
|
||||||
self.glob_pattern = '*' + pattern + '*'
|
|
||||||
|
|
||||||
@classmethod
|
|
||||||
def commandline(cls, args):
|
|
||||||
conf_dirs = util.resolve_conf_dirs_from_config_and_args(args)
|
|
||||||
c = cls(conf_dirs, args)
|
|
||||||
c.run()
|
|
||||||
|
|
||||||
def _get_global_explorers(self, conf_path):
|
|
||||||
rv = []
|
|
||||||
global_explorer_path = os.path.join(conf_path, "explorer",
|
|
||||||
self.glob_pattern)
|
|
||||||
if self.fixed_string:
|
|
||||||
if os.path.exists(global_explorer_path):
|
|
||||||
rv.append(global_explorer_path)
|
|
||||||
else:
|
|
||||||
for explorer in glob.glob(global_explorer_path):
|
|
||||||
rv.append(explorer)
|
|
||||||
return rv
|
|
||||||
|
|
||||||
def _should_display_type(self, dir_entry):
|
|
||||||
if not dir_entry.is_dir():
|
|
||||||
return False
|
|
||||||
if self.glob_pattern is None:
|
|
||||||
return True
|
|
||||||
if self.fixed_string:
|
|
||||||
return dir_entry.name == self.glob_pattern
|
|
||||||
else:
|
|
||||||
return fnmatch.fnmatch(dir_entry.name, self.glob_pattern)
|
|
||||||
|
|
||||||
def _get_types(self, conf_path):
|
|
||||||
rv = []
|
|
||||||
types_path = os.path.join(conf_path, "type")
|
|
||||||
if not os.path.exists(types_path):
|
|
||||||
return rv
|
|
||||||
with os.scandir(types_path) as it:
|
|
||||||
for entry in it:
|
|
||||||
if self._should_display_type(entry):
|
|
||||||
rv.append(entry.path)
|
|
||||||
return rv
|
|
||||||
|
|
||||||
def _display_details(self, title, details, default_values=None,
|
|
||||||
deprecated=None):
|
|
||||||
if not details:
|
|
||||||
return
|
|
||||||
if isinstance(details, bool):
|
|
||||||
print("\t{}: {}".format(title, 'yes' if details else 'no'))
|
|
||||||
elif isinstance(details, str):
|
|
||||||
print("\t{}: {}".format(title, details))
|
|
||||||
elif isinstance(details, list):
|
|
||||||
dv = dict(default_values) if default_values else {}
|
|
||||||
dp = dict(deprecated) if deprecated else {}
|
|
||||||
|
|
||||||
print("\t{}:".format(title))
|
|
||||||
for x in sorted(details):
|
|
||||||
print("\t\t{}".format(x), end='')
|
|
||||||
has_default = x in dv
|
|
||||||
is_deprecated = x in dp
|
|
||||||
need_comma = False
|
|
||||||
if has_default or is_deprecated:
|
|
||||||
print(" (", end='')
|
|
||||||
if has_default:
|
|
||||||
print("default: {}".format(dv[x]), end='')
|
|
||||||
need_comma = True
|
|
||||||
if is_deprecated:
|
|
||||||
print("{}deprecated".format(', ' if need_comma else ''),
|
|
||||||
end='')
|
|
||||||
if has_default or is_deprecated:
|
|
||||||
print(")", end='')
|
|
||||||
print()
|
|
||||||
|
|
||||||
def _display_type_parameters(self, cdist_type):
|
|
||||||
self._display_details("required parameters",
|
|
||||||
cdist_type.required_parameters,
|
|
||||||
default_values=cdist_type.parameter_defaults,
|
|
||||||
deprecated=cdist_type.deprecated_parameters)
|
|
||||||
self._display_details("required multiple parameters",
|
|
||||||
cdist_type.required_multiple_parameters,
|
|
||||||
default_values=cdist_type.parameter_defaults,
|
|
||||||
deprecated=cdist_type.deprecated_parameters)
|
|
||||||
self._display_details("optional parameters",
|
|
||||||
cdist_type.optional_parameters,
|
|
||||||
default_values=cdist_type.parameter_defaults,
|
|
||||||
deprecated=cdist_type.deprecated_parameters)
|
|
||||||
self._display_details("optional multiple parameters",
|
|
||||||
cdist_type.optional_multiple_parameters,
|
|
||||||
default_values=cdist_type.parameter_defaults,
|
|
||||||
deprecated=cdist_type.deprecated_parameters)
|
|
||||||
self._display_details("boolean parameters",
|
|
||||||
cdist_type.boolean_parameters,
|
|
||||||
default_values=cdist_type.parameter_defaults,
|
|
||||||
deprecated=cdist_type.deprecated_parameters)
|
|
||||||
|
|
||||||
def _display_type_characteristics(self, cdist_type):
|
|
||||||
characteristics = []
|
|
||||||
if cdist_type.is_install:
|
|
||||||
characteristics.append('install')
|
|
||||||
else:
|
|
||||||
characteristics.append('config')
|
|
||||||
if cdist_type.is_singleton:
|
|
||||||
characteristics.append('singleton')
|
|
||||||
if cdist_type.is_nonparallel:
|
|
||||||
characteristics.append('nonparallel')
|
|
||||||
else:
|
|
||||||
characteristics.append('parallel')
|
|
||||||
if cdist_type.deprecated is not None:
|
|
||||||
characteristics.append('deprecated')
|
|
||||||
print("\t{}".format(', '.join(characteristics)))
|
|
||||||
|
|
||||||
def _display_type_details(self, type_path):
|
|
||||||
dirname, basename = os.path.split(type_path)
|
|
||||||
cdist_type = cdist.core.CdistType(dirname, basename)
|
|
||||||
|
|
||||||
self._display_type_characteristics(cdist_type)
|
|
||||||
self._display_type_parameters(cdist_type)
|
|
||||||
|
|
||||||
def run(self):
|
|
||||||
rv = []
|
|
||||||
for cp in self.conf_dirs:
|
|
||||||
conf_path = os.path.expanduser(cp)
|
|
||||||
if self.all or self.display_global_explorers:
|
|
||||||
rv.extend((x, 'E', ) for x in self._get_global_explorers(
|
|
||||||
conf_path))
|
|
||||||
if self.all or self.display_types:
|
|
||||||
rv.extend((x, 'T', ) for x in self._get_types(conf_path))
|
|
||||||
rv = sorted(rv, key=lambda x: x[0])
|
|
||||||
for x, t in rv:
|
|
||||||
print(x)
|
|
||||||
if self.full and t == 'T':
|
|
||||||
self._display_type_details(x)
|
|
|
@ -5,9 +5,8 @@ import inspect
|
||||||
import argparse
|
import argparse
|
||||||
import cdist
|
import cdist
|
||||||
import logging
|
import logging
|
||||||
|
import re
|
||||||
import cdist.argparse
|
import cdist.argparse
|
||||||
import cdist.configuration
|
|
||||||
import cdist.exec.util as util
|
|
||||||
|
|
||||||
|
|
||||||
_PREOS_CALL = "commandline"
|
_PREOS_CALL = "commandline"
|
||||||
|
@ -25,6 +24,16 @@ def extend_plugins_path(dirs):
|
||||||
_PLUGINS_PATH.append(preos_dir)
|
_PLUGINS_PATH.append(preos_dir)
|
||||||
|
|
||||||
|
|
||||||
|
cdist_home = cdist.home_dir()
|
||||||
|
if cdist_home:
|
||||||
|
extend_plugins_path((cdist_home, ))
|
||||||
|
x = 'CDIST_PATH'
|
||||||
|
if x in os.environ:
|
||||||
|
vals = re.split(r'(?<!\\):', os.environ[x])
|
||||||
|
vals = [x for x in vals if x]
|
||||||
|
extend_plugins_path(vals)
|
||||||
|
|
||||||
|
|
||||||
def preos_plugin(obj):
|
def preos_plugin(obj):
|
||||||
"""It is preos if _PREOS_MARKER is True and has _PREOS_CALL."""
|
"""It is preos if _PREOS_MARKER is True and has _PREOS_CALL."""
|
||||||
if hasattr(obj, _PREOS_MARKER):
|
if hasattr(obj, _PREOS_MARKER):
|
||||||
|
@ -93,9 +102,6 @@ class PreOS(object):
|
||||||
help=('Add configuration directory (one that '
|
help=('Add configuration directory (one that '
|
||||||
'contains "preos" subdirectory)'),
|
'contains "preos" subdirectory)'),
|
||||||
action='append')
|
action='append')
|
||||||
parser.add_argument('-g', '--config-file',
|
|
||||||
help='Use specified custom configuration file.',
|
|
||||||
dest="config_file", required=False)
|
|
||||||
parser.add_argument('-L', '--list-preoses',
|
parser.add_argument('-L', '--list-preoses',
|
||||||
help='List available PreOS-es',
|
help='List available PreOS-es',
|
||||||
action='store_true', default=False)
|
action='store_true', default=False)
|
||||||
|
@ -104,9 +110,8 @@ class PreOS(object):
|
||||||
cdist.argparse.handle_loglevel(args)
|
cdist.argparse.handle_loglevel(args)
|
||||||
log.debug("preos args : {}".format(args))
|
log.debug("preos args : {}".format(args))
|
||||||
|
|
||||||
conf_dirs = util.resolve_conf_dirs_from_config_and_args(args)
|
if args.conf_dir:
|
||||||
|
extend_plugins_path(args.conf_dir)
|
||||||
extend_plugins_path(conf_dirs)
|
|
||||||
sys.path.extend(_PLUGINS_PATH)
|
sys.path.extend(_PLUGINS_PATH)
|
||||||
cls.preoses = find_preoses()
|
cls.preoses = find_preoses()
|
||||||
|
|
||||||
|
|
|
@ -2,28 +2,11 @@ Changelog
|
||||||
---------
|
---------
|
||||||
|
|
||||||
next:
|
next:
|
||||||
* Type __acl: Add --entry parameter to replace --acl, deprecate --acl (Ander Punnar)
|
|
||||||
* Core: preos: Fix missing configuration file usage, support -g, --config-file option (Darko Poljak)
|
|
||||||
* Core info command: Support tilde expansion of conf directories (Darko Poljak)
|
|
||||||
|
|
||||||
6.4.0: 2020-01-04
|
|
||||||
* Type __consul_agent: Don't deploy init script on Alpine anymore, it ships with one itself (Nico Schottelius)
|
|
||||||
* Type __install_chroot_umount: Bugfix: type was not using __chroot_umount/manifest (Steven Armstrong)
|
|
||||||
* Types __postgres_*: Use double quoted identifiers in generated SQL (Timothée Floure)
|
|
||||||
* Core: Add cdist info command (Darko Poljak)
|
|
||||||
* New types: __mysql_user, __mysql_privileges (Ander Punnar)
|
|
||||||
* Type __mysql_database: Rewrite (Ander Punnar)
|
|
||||||
|
|
||||||
6.3.0: 2019-12-12
|
|
||||||
* Type __package_update_index: Fix Alpine part (Dominique Roux)
|
* Type __package_update_index: Fix Alpine part (Dominique Roux)
|
||||||
* Documentation: Fix man pages for install types (Darko Poljak)
|
* Documentation: Fix man pages for install types (Darko Poljak)
|
||||||
* Documentation: Embed config skeleton instead of rewriting it (Darko Poljak)
|
* Documentation: Embed config skeleton instead of rewriting it (Darko Poljak)
|
||||||
* Documentation: Remove cdist-type prefix and man page reference from type list in html (Darko Poljak)
|
* Documentation: Remove cdist-type prefix and man page reference from type list in html (Darko Poljak)
|
||||||
* Documentation: PreOS english nitpicking (Evil Ham)
|
* Documentation: PreOS english nitpicking (Evil Ham)
|
||||||
* Documentation: Add installing from source with signature verification (Darko Poljak)
|
|
||||||
* Core: preos: Support top command logging options, custom conf-dir option and CDIST_PATH env var (Darko Poljak)
|
|
||||||
* Type __start_on_boot: Docs: remove unsupported *BSD claim (Evil Ham)
|
|
||||||
* New type: __openldap_server (Evil Ham)
|
|
||||||
|
|
||||||
6.2.0: 2019-11-30
|
6.2.0: 2019-11-30
|
||||||
* Core: Redefine/reimplement/fix CDIST_ORDER_DEPENDENCY (Darko Poljak)
|
* Core: Redefine/reimplement/fix CDIST_ORDER_DEPENDENCY (Darko Poljak)
|
||||||
|
|
|
@ -23,6 +23,8 @@ Target Hosts
|
||||||
Install cdist
|
Install cdist
|
||||||
-------------
|
-------------
|
||||||
|
|
||||||
|
You can install cdist either from git or as a python package.
|
||||||
|
|
||||||
From git
|
From git
|
||||||
~~~~~~~~
|
~~~~~~~~
|
||||||
|
|
||||||
|
@ -40,7 +42,6 @@ To install cdist, execute the following commands:
|
||||||
|
|
||||||
From version 4.2.0 cdist tags and releases are signed.
|
From version 4.2.0 cdist tags and releases are signed.
|
||||||
You can get GPG public key used for signing `here <_static/pgp-key-EFD2AE4EC36B6901.asc>`_.
|
You can get GPG public key used for signing `here <_static/pgp-key-EFD2AE4EC36B6901.asc>`_.
|
||||||
It is assumed that you are familiar with *git* ways of signing and verification.
|
|
||||||
|
|
||||||
You can also get cdist from `github mirror <https://github.com/ungleich/cdist>`_.
|
You can also get cdist from `github mirror <https://github.com/ungleich/cdist>`_.
|
||||||
|
|
||||||
|
@ -156,27 +157,3 @@ Cdist is available as a python package at
|
||||||
.. code-block:: sh
|
.. code-block:: sh
|
||||||
|
|
||||||
pip install cdist
|
pip install cdist
|
||||||
|
|
||||||
Installing from source with signature verification
|
|
||||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
|
||||||
|
|
||||||
If you want to install cdist from signed source and verify it, first you need to
|
|
||||||
download cdist archive and its detached signature.
|
|
||||||
|
|
||||||
Get both, *cdist-x.y.z.tar.gz* and *cdist-x.y.z.tar.gz.asc* from release
|
|
||||||
notes of the desired tag *x.y.z* at
|
|
||||||
`cdist git repository <https://code.ungleich.ch/ungleich-public/cdist/-/tags>`_.
|
|
||||||
|
|
||||||
Get GPG public key used for signing `here <_static/pgp-key-EFD2AE4EC36B6901.asc>`_
|
|
||||||
and import it into GPG.
|
|
||||||
|
|
||||||
Now cdist source archive can be verified using `gpg`, e.g. to verify `cdist-6.2.0`:
|
|
||||||
|
|
||||||
.. code-block:: sh
|
|
||||||
|
|
||||||
$ gpg --verify cdist-6.2.0.tar.gz.asc cdist-6.2.0.targ.gz
|
|
||||||
gpg: Signature made Sat Nov 30 23:14:19 2019 CET
|
|
||||||
gpg: using RSA key 69767822F3ECC3C349C1EFFFEFD2AE4EC36B6901
|
|
||||||
gpg: Good signature from "ungleich GmbH (ungleich FOSS) <foss@ungleich.ch>" [ultimate]
|
|
||||||
|
|
||||||
Further steps are the same as for `installing from git <cdist-install.html#from-git>`_.
|
|
||||||
|
|
|
@ -11,7 +11,7 @@ SYNOPSIS
|
||||||
|
|
||||||
::
|
::
|
||||||
|
|
||||||
cdist [-h] [-V] {banner,config,install,inventory,preos,shell,info} ...
|
cdist [-h] [-V] {banner,config,install,inventory,preos,shell} ...
|
||||||
|
|
||||||
cdist banner [-h] [-l LOGLEVEL] [-q] [-v]
|
cdist banner [-h] [-l LOGLEVEL] [-q] [-v]
|
||||||
|
|
||||||
|
@ -59,9 +59,7 @@ SYNOPSIS
|
||||||
[-I INVENTORY_DIR] [-a] [-f HOSTFILE] [-H] [-t]
|
[-I INVENTORY_DIR] [-a] [-f HOSTFILE] [-H] [-t]
|
||||||
[host [host ...]]
|
[host [host ...]]
|
||||||
|
|
||||||
cdist preos [-h] [-l LOGLEVEL] [-q] [-v] [-c CONF_DIR] [-g CONFIG_FILE]
|
cdist preos [-h] [-l LOGLEVEL] [-q] [-v] [-c CONF_DIR] [-L] [preos] ...
|
||||||
[-L]
|
|
||||||
[preos] ...
|
|
||||||
|
|
||||||
cdist preos [preos-options] debian [-h] [-l LOGLEVEL] [-q] [-v] [-b] [-a ARCH] [-B]
|
cdist preos [preos-options] debian [-h] [-l LOGLEVEL] [-q] [-v] [-b] [-a ARCH] [-B]
|
||||||
[-C] [-c CDIST_PARAMS] [-D DRIVE] [-e REMOTE_EXEC]
|
[-C] [-c CDIST_PARAMS] [-D DRIVE] [-e REMOTE_EXEC]
|
||||||
|
@ -86,8 +84,6 @@ SYNOPSIS
|
||||||
|
|
||||||
cdist shell [-h] [-l LOGLEVEL] [-q] [-v] [-s SHELL]
|
cdist shell [-h] [-l LOGLEVEL] [-q] [-v] [-s SHELL]
|
||||||
|
|
||||||
cdist info [-h] [-a] [-c CONF_DIR] [-e] [-F] [-f] [-g CONFIG_FILE] [-t] [pattern]
|
|
||||||
|
|
||||||
|
|
||||||
DESCRIPTION
|
DESCRIPTION
|
||||||
-----------
|
-----------
|
||||||
|
@ -466,9 +462,6 @@ Create PreOS.
|
||||||
**-c CONF_DIR, --conf-dir CONF_DIR**
|
**-c CONF_DIR, --conf-dir CONF_DIR**
|
||||||
Add configuration directory (one that contains "preos" subdirectory).
|
Add configuration directory (one that contains "preos" subdirectory).
|
||||||
|
|
||||||
**-g CONFIG_FILE, --config-file CONFIG_FILE**
|
|
||||||
Use specified custom configuration file.
|
|
||||||
|
|
||||||
**-L, --list-preoses**
|
**-L, --list-preoses**
|
||||||
List available PreOS-es.
|
List available PreOS-es.
|
||||||
|
|
||||||
|
@ -611,39 +604,6 @@ usage. Its primary use is for debugging type parameters.
|
||||||
be POSIX compatible shell.
|
be POSIX compatible shell.
|
||||||
|
|
||||||
|
|
||||||
INFO
|
|
||||||
----
|
|
||||||
Display information for cdist (global explorers, types).
|
|
||||||
|
|
||||||
**pattern**
|
|
||||||
Glob pattern. If it contains special characters('?', '*', '[') then it is
|
|
||||||
used as specified, otherwise it is translated to `*pattern*`.
|
|
||||||
|
|
||||||
**-h, --help**
|
|
||||||
Show help message and exit.
|
|
||||||
|
|
||||||
**-a, --all**
|
|
||||||
Display all info. This is the default.
|
|
||||||
|
|
||||||
**-c CONF_DIR, --conf-dir CONF_DIR**
|
|
||||||
Add configuration directory (can be repeated).
|
|
||||||
|
|
||||||
**-e, --global-explorers**
|
|
||||||
Display info for global explorers.
|
|
||||||
|
|
||||||
**-F, --fixed-string**
|
|
||||||
Interpret pattern as a fixed string.
|
|
||||||
|
|
||||||
**-f, --full**
|
|
||||||
Display full details.
|
|
||||||
|
|
||||||
**-g CONFIG_FILE, --config-file CONFIG_FILE**
|
|
||||||
Use specified custom configuration file.
|
|
||||||
|
|
||||||
**-t, --types**
|
|
||||||
Display info for types.
|
|
||||||
|
|
||||||
|
|
||||||
CONFIGURATION
|
CONFIGURATION
|
||||||
-------------
|
-------------
|
||||||
cdist obtains configuration data from the following sources in the following
|
cdist obtains configuration data from the following sources in the following
|
||||||
|
@ -955,5 +915,5 @@ such case and display a warning message. An example of such a case:
|
||||||
|
|
||||||
COPYING
|
COPYING
|
||||||
-------
|
-------
|
||||||
Copyright \(C) 2011-2019 Nico Schottelius. Free use of this software is
|
Copyright \(C) 2011-2017 Nico Schottelius. Free use of this software is
|
||||||
granted under the terms of the GNU General Public License v3 or later (GPLv3+).
|
granted under the terms of the GNU General Public License v3 or later (GPLv3+).
|
||||||
|
|
Loading…
Add table
Reference in a new issue