Darko Poljak
3fa74b454a
Fix typo
2020-09-30 15:43:32 +02:00
f994226d0e
[__package_pkgng_freebsd] Bootstrap pkg if necessary
...
In a pristine FreeBSD base installation, pkg is really a bootstrapper utility,
in such cases the type used to fail instead of automatically bootstrapping pkg.
2020-09-29 19:47:59 +02:00
Darko Poljak
0fc10749ed
Fix shellcheck
2020-09-21 09:11:35 +02:00
139a782c96
Merge branch '__package_pip_detect_pip_bin' into 'master'
...
[__package_pip] detect pip binary
See merge request ungleich-public/cdist!935
2020-09-21 09:06:44 +02:00
89b6215115
Clarify stdin input
...
Resolve #836 .
2020-09-21 09:04:05 +02:00
decc0ad54d
[__package_pip] detect pip binary
2020-09-19 12:38:20 +03:00
Darko Poljak
53b91adbd8
Fix shellcheck
2020-09-11 14:20:57 +02:00
a20ab63e60
Merge branch 'fix/__systemd_service/manpage' into 'master'
...
__systemd_service: fix manpage typos
See merge request ungleich-public/cdist!931
2020-09-10 13:21:19 +02:00
b1375464cc
__systemd_service: fix manpage typos
2020-09-09 21:11:40 +02:00
f5b534df71
Merge branch 'fix/type/__timezone/singleton' into 'master'
...
__timezone: Make singleton
See merge request ungleich-public/cdist!916
2020-09-08 07:20:01 +02:00
Darko Poljak
c17541f24c
Expand and split by consecutive require delimiters
...
Resolves #832 .
2020-08-24 07:16:28 +02:00
a8ea56253c
Merge branch 'feature/explorer/os_version/debian-sid' into 'master'
...
explorer/os_version: Convert Debian sid to version number.
Closes #833
See merge request ungleich-public/cdist!927
2020-08-18 11:05:12 +02:00
2c1eca9ee7
Merge branch '__download_man_fix' into 'master'
...
[__download] fix manual: onchange parameter in wrong section
See merge request ungleich-public/cdist!929
2020-08-18 11:02:18 +02:00
d239169c4f
[__download] fix manual: onchange parameter in wrong section
2020-08-18 00:48:58 +03:00
502d753047
[__unpack] add --onchange
2020-08-18 00:46:07 +03:00
Dennis Camera
6fed178529
[explorer/os_version] Convert Debian sid to version number.
...
Conversion of Debian sid to versions is done based on Debian codenames.
The version number is the version number of the final release - 0.01.
It is unknown if Debian < 4.0 has any sort of version information
available (apart from maybe checking base-files package version).
But I don't think any of these systems are still alive,
so I think going with 3.99 is fine for those.
2020-08-17 09:31:40 +02:00
ssrq
fa967631e3
Merge branch 'master' into 'fix/type/__locale_system/version-cmp'
...
# Conflicts:
# cdist/conf/type/__locale_system/manifest
2020-08-15 21:17:25 +02:00
7b0a4f6831
Merge branch 'feature/alpine-filesystem' into 'master'
...
Add Alpine Linux as supported for __filesystem.
See merge request ungleich-public/cdist!925
2020-08-15 21:09:37 +02:00
54c525e36c
Merge branch '__unpack_tar_extra_args' into 'master'
...
[__unpack] add parameter --tar-extra-args
See merge request ungleich-public/cdist!922
2020-08-15 21:07:20 +02:00
4082359a2f
Merge branch 'fix/explorer/os/opensuse' into 'master'
...
explorer/os: Fix OS detection for openSUSE
See merge request ungleich-public/cdist!924
2020-08-15 21:06:31 +02:00
17ab4bd80c
Add Alpine Linux as supported for __filesystem.
2020-08-06 11:45:05 +02:00
Dennis Camera
b370b70ff4
[explorer/os] Fix OS detection for openSUSE
...
All distros with ID_LIKE suse should be treated as "suse".
My openSUSE Leap 15.1 installation has:
ID_LIKE="suse opensuse"
This patch doesn't require a strict "suse" value but only the word suse to be in
the list.
2020-08-02 22:50:06 +02:00
Dennis Camera
7b480f4293
[type/__locale_system] Fix version extraction for SuSE
2020-08-02 22:47:46 +02:00
Dennis Camera
71710fa00a
[type/__locale_system] Implement "proper" version comparison
...
Proper in the sense that it can handle all numeric version numbers even if they
are not floating point (e.g. 16.04.6).
2020-08-02 20:59:22 +02:00
Dennis Camera
885d5a58f4
[type/__locale_system] Fix floating point version comparison
2020-08-02 17:04:06 +02:00
935f2395bc
[__locale_system] fix for debian and ubuntu
...
ubuntu 6.10 and debian etch are 10+ years old and EOL. rather than
preserving compatibility I'll just remove it. while /etc/environment
works too, correct place is /etc/default/locale (as it was before
breaking change). also /etc/debian_version (os_version explorer) may
contain minor version with dot (10.5) or string (bullseye/sid).
2020-08-02 13:54:30 +03:00
d37d2dc307
[__unpack] add parameter --tar-extra-args
2020-08-02 13:53:38 +03:00
Darko Poljak
c053a2c4a0
Fix building man pages
...
Resolves #830 .
2020-07-29 11:31:12 +02:00
a5f25faf25
Merge branch 'fix/type/__sysctl/netbsd-path' into 'master'
...
__sysctl: Fix on NetBSD
See merge request ungleich-public/cdist!918
2020-07-27 15:30:57 +02:00
a6cd767c8f
Merge branch 'fix/explorer/netbsd' into 'master'
...
Fix global explorers for NetBSD
See merge request ungleich-public/cdist!917
2020-07-27 15:29:52 +02:00
Dennis Camera
3a87a447d0
[type/__sysctl] Fix on NetBSD
2020-07-27 15:22:21 +02:00
Dennis Camera
5dfc996feb
Fix global explorers for NetBSD
...
On NetBSD sysctl is at /sbin/sysctl, but the default PATH does not
contain /sbin.
2020-07-27 15:11:02 +02:00
5c5890d458
Merge branch 'feature/type/__locale_system/os-support' into 'master'
...
__locale_system: Wider OS support
See merge request ungleich-public/cdist!914
2020-07-27 12:58:53 +02:00
Dennis Camera
d26c36914a
[__timezone] Make type singleton
2020-07-27 11:06:14 +02:00
8a8a48313c
Merge branch '__unpack' into 'master'
...
new type: __unpack
See merge request ungleich-public/cdist!893
2020-07-27 06:20:21 +02:00
73f1937636
[__unpack] no mkdir by default, because destination can be file, but tar needs mkdir andrar needs slash at the end
2020-07-27 06:20:21 +02:00
1b18b9487e
Merge branch 'fix/type/__key_value/solaris-awk' into 'master'
...
__key_value: Get AWK from POSIX PATH
See merge request ungleich-public/cdist!913
2020-07-27 06:01:53 +02:00
263c7a90a8
Merge branch 'fix/type/__package_apt/legacy-norecommends' into 'master'
...
__package_apt: Fix for legacy APT versions that do not support --no-install-recommends.
See merge request ungleich-public/cdist!912
2020-07-27 05:58:40 +02:00
Dennis Camera
70d1228dc0
[type/__locale_system] Add support for FreeBSD
2020-07-26 20:10:52 +02:00
Dennis Camera
511d8c96aa
[type/__locale_system] Add support for Slackware
2020-07-26 20:10:52 +02:00
Dennis Camera
a923e75d9b
[type/__locale_system] Add support for NetBSD
2020-07-26 20:10:52 +02:00
Dennis Camera
cbf22f3b2c
[type/__locale_system] Add support for Solaris
2020-07-26 20:10:52 +02:00
Dennis Camera
0ae0935afa
[type/__locale_system] Add support for SuSE
2020-07-26 20:10:34 +02:00
Dennis Camera
630d987d5f
[type/__locale_system] Add support for Void Linux
2020-07-26 20:10:34 +02:00
Dennis Camera
0ef54a721d
[type/__locale_system] Add support for Gentoo Linux
2020-07-26 20:10:34 +02:00
Dennis Camera
47e28fc441
[type/__locale_system] Support old Debian derivatives
2020-07-26 20:10:34 +02:00
Dennis Camera
a590504436
[type/__locale_system] RedHat systems on systemd use /etc/locale.conf
2020-07-26 20:10:34 +02:00
Dennis Camera
46d09392f0
[type/__key_value] Get AWK from POSIX PATH
...
This is required here, because Solaris /usr/bin/awk does not support the
sub() function.
So xpg4 AWK needs to be used.
2020-07-26 19:36:34 +02:00
Dennis Camera
ee71cad047
[type/__package_apt] Fix type for legacy APT versions
...
--no-install-recommends was introduced with Debian 5.
The APT::Install-Recommends option gets ignored by old versions and
produces no error.
2020-07-25 19:20:32 +02:00
9df29de564
Merge branch 'rm-deprecated-__pf_apply' into 'master'
...
Remove deprecated __pf_apply
See merge request ungleich-public/cdist!899
2020-07-24 12:30:32 +02:00
fnux
ae5f0bba0b
Add Alpine support to __openldap_server
2020-07-24 12:26:35 +02:00
5d0f6caef7
Merge branch 'hotfix/stat-explorer' into 'master'
...
Hotfix: Fix incorrect interpretation of --mode strings with leading 0s as octal
See merge request ungleich-public/cdist!911
2020-07-23 10:59:18 +02:00
Dennis Camera
595e43b8d5
[type/{__file,__directory}] Fix incorrect interpretation of strings with leading 0s as octal
2020-07-23 09:43:40 +02:00
Dennis Camera
3965c7f738
[type/__user] Install user{add,mod,del} packages on OpenWrt
2020-07-21 19:42:40 +02:00
bc97073131
Merge branch 'bugfix/postfix-master-option' into '6.6'
...
Fix broken --option parameter in __postfix_master type
See merge request ungleich-public/cdist!905
(cherry picked from commit 2f433a1458f3a1f7f8859e9ae165178a0ec5b7a0)
9496b2344009bbd7
2020-07-13 07:49:49 +02:00
652ffea4a8
Merge branch 'fix/stat-explorer' into 'master'
...
type/{__file/__directory}: Support setuid,setguid,sticky bits
See merge request ungleich-public/cdist!903
2020-07-13 07:37:50 +02:00
Dennis Camera
9fb7e151b8
[type/{__file/__directory}] Remove special Solaris blocks
...
Solaris 11 has GNU stat (handled by *)
Solaris 10 (and older?) does not have stat (handled by failing command -v stat)
On Solaris 10 (at least on UFS), setgid cannot be set on directories.
Unlike on other systems `chmod 2400` is not `-r----S---`, but `-r----l---`.
2020-07-12 12:41:02 +02:00
Dennis Camera
19514662b0
[type/{__file/__directory}] Fix typo
2020-07-12 12:24:00 +02:00
Dennis Camera
a5ae26116b
[type/__hosts] Fix when used without --alias
2020-07-11 18:57:47 +02:00
506a0f3f47
Merge branch 'bugfix/make-code-consistent' into 'master'
...
Make code consistent
See merge request ungleich-public/cdist!904
2020-07-10 21:01:42 +02:00
Darko Poljak
cb9933b4a0
Fix state -> state_is
2020-07-08 12:43:55 +02:00
fde5627721
Merge branch '__download_improvements' into 'master'
...
__download improvements
See merge request ungleich-public/cdist!895
2020-07-08 12:33:41 +02:00
e906266286
[__download] s/variable/format specification/
2020-07-08 00:20:55 +03:00
93506d2113
[__download] curl follow redirects
2020-07-08 00:17:12 +03:00
Darko Poljak
fe193ecab8
Make code consistent
...
* Remove supreflous checking and warning message.
* Fix cache recording.
2020-07-01 14:08:48 +02:00
727f3dbb03
Merge branch 'fix/type/__user/openbsd-shadow' into 'master'
...
__user: Fix shadow explorer for OpenBSD
See merge request ungleich-public/cdist!902
2020-06-30 22:55:33 +02:00
c5a8004c9a
Merge branch 'hosts-aliases' into 'master'
...
__hosts: add --alias parameter
See merge request ungleich-public/cdist!901
2020-06-30 22:52:52 +02:00
Dennis Camera
3860f1feea
[type/{__file/__directory}] Support setuid,setguid,sticky bits
2020-06-30 15:10:30 +02:00
Dennis Camera
6467ccbdcc
[type/__user] Make shellcheck happy
2020-06-30 14:31:11 +02:00
ssrq
9e33a8f42f
Merge branch 'master' into 'fix/type/__user/openbsd-shadow'
...
# Conflicts:
# cdist/conf/type/__user/explorer/shadow
2020-06-30 14:26:23 +02:00
Dennis Camera
999e7b0134
[type/__user] Fix shadow explorer for OpenBSD
2020-06-30 14:23:34 +02:00
Dennis Camera
a263fdfe58
[__hosts] Add --alias parameter
...
The --alias parameter allows to specify a hostname and multiple aliases on a
single /etc/hosts line.
2020-06-30 14:05:26 +02:00
99b5dcd8f0
Merge branch 'master' into __download_improvements
2020-06-28 16:57:13 +03:00
996e7fc09c
Merge branch 'master' into __download_improvements
2020-06-28 16:55:11 +03:00
b6bf90e3f1
[__download] update manual
2020-06-28 16:43:45 +03:00
85614aabd6
[__download] add --download (local|remote), update manual
2020-06-28 16:38:15 +03:00
Darko Poljak
077989e8fd
Remove annoying warnings
...
Those warnings don't have any specail meaning and usage.
Resolve #825 .
2020-06-27 15:55:57 +02:00
684043bf37
Merge branch 'fix/type/__package_opkg/lock' into 'master'
...
__package_opkg: Add locking
See merge request ungleich-public/cdist!896
2020-06-25 06:31:16 +02:00
ceedcd02f2
Merge branch 'feature/type/__locale_system/support-devuan' into 'master'
...
__locale_system: "Whitelist" Devuan
See merge request ungleich-public/cdist!900
2020-06-25 06:24:17 +02:00
Dennis Camera
5364d3bc90
[type/__package_opkg] Implement flock locking if available
2020-06-24 21:06:10 +02:00
Dennis Camera
a9778965be
[type/__package_opkg] Use mkdir(1) to lock instead of noclobber
...
noclobber is potentially unsafe, because it relies on the underlying shell to
implement noclobber in a safe way that avoids race conditions between multiple
processes.
mkdir is safer because it is mandated by POSIX to "fail" if the target already
exists.
2020-06-24 08:47:22 +02:00
Darko Poljak
49dde11def
Remove deprecated __pf_apply
2020-06-24 07:04:32 +02:00
Dennis Camera
3649555f35
[type/__package_opkg] Do not lock execution of code-remote (revert)
...
Instead, rely on `nonparallel`.
In any case cdist should never run explorer and code concurrently even if the
dependency graph would allow to do so as it would result in many more
synchronization issues than this one.
2020-06-22 09:32:57 +02:00
26dfdf37c2
[__download] support multiple checksum formats and download utilities, add --onchange and other minor changes
2020-06-21 23:39:53 +03:00
d478bef8a6
Merge branch 'lint/py3-classes' into 'master'
...
Consequently use Python 3-style classes
See merge request ungleich-public/cdist!898
2020-06-21 17:54:56 +02:00
e67215f93d
Merge branch 'lint/no-python-shebangs' into 'master'
...
Remove unnecessary Python shebangs
See merge request ungleich-public/cdist!897
2020-06-21 17:53:44 +02:00
Dennis Camera
6aae58dea7
[type/__package_opkg] Mark lock variables readonly
2020-06-21 17:35:28 +02:00
Dennis Camera
ce07021580
Do not subclass object
2020-06-21 16:53:47 +02:00
Dennis Camera
a6a3fb40bf
Remove unnecessary Python shebangs
2020-06-21 16:03:09 +02:00
Dennis Camera
e79b26a61f
[type/__package_opkg] Also lock execution of code-remote
2020-06-21 15:53:01 +02:00
Dennis Camera
97e48be39e
[type/__package_opkg] Fix explorer running in parallel
2020-06-21 15:52:57 +02:00
d59ba09d71
Merge branch '__download' into 'master'
...
new type: __download
See merge request ungleich-public/cdist!892
2020-06-17 13:39:07 +02:00
201050a9e5
new type: __download
2020-06-16 20:53:31 +03:00
Darko Poljak
59b98091d7
Adapt; update docs and code style
2020-06-13 13:44:01 +02:00
Steven Armstrong
57e352cd1e
log server is also usefull for cdist config
...
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2020-06-13 13:44:01 +02:00
Steven Armstrong
831bfc822b
remove unused code
...
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2020-06-13 13:44:01 +02:00
Steven Armstrong
6e9e9ad557
implement log server to capture nested logging output
...
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2020-06-13 13:44:01 +02:00
Darko Poljak
4167f9f60c
Use proper format string with name
2020-06-11 14:22:54 +02:00
Darko Poljak
840e417eb7
Fix emulator colored logging
2020-06-11 14:16:37 +02:00
7c490a703d
[__clean_path] add --path parameter
2020-06-10 11:38:14 +03:00
Darko Poljak
a251e53495
Merge branch 'fix_os_explorer_sles15' of https://github.com/dheule/cdist into dheule-fix_os_explorer_sles15
2020-06-08 13:43:41 +02:00
Dennis Camera
23e66e08fa
Restrict colored_output value to always/never/auto.
2020-06-06 13:45:31 +02:00
Dennis Camera
89e48734bf
Let config file and command line override NO_COLOR envvar
2020-06-05 12:23:36 +02:00
Dennis Camera
cdb0d2be41
Patch tests
2020-06-03 23:21:50 +02:00
Dennis Camera
747c6b1076
Respect NO_COLOR environment variable
2020-06-03 22:17:52 +02:00
Daniel Heule
6a611e556a
fix os explorer for sles15
2020-06-02 13:40:21 +02:00
Darko Poljak
55ebd1a4c5
Fix man build failure in newer sphinx versions
2020-06-01 20:22:40 +02:00
ba77ea9edc
[UX] Add option to enable LogLevel-based coloured output.
...
This makes it easier for new and experienced users to run cdist with higher
verbosity levels, both to know that things are working as expected and to debug
issues.
Documentation has been modified accordingly and default behaviour is not
changed.
2020-06-01 19:11:58 +02:00
Darko Poljak
988190363a
Resolve shellcheck SC1090
2020-05-30 15:10:13 +02:00
29c0180204
[__ssh_authorized_keys] add --remove-unknown parameter
2020-05-28 23:31:13 +03:00
Darko Poljak
f4e1bbc87e
Fix multiple log lines
...
Fixes #813 .
2020-05-24 01:10:56 +02:00
716d3554f3
[__user] fix user delete on freebsd
2020-05-23 00:48:35 +03:00
dab32b0cb6
Merge branch '__group_freebsd_fix' into 'master'
...
[__group] fix --gid on freebsd
See merge request ungleich-public/cdist!881
2020-05-22 10:08:29 +02:00
3bcbd95269
[__motd] debian|ubuntu|devuan use /etc/motd
2020-05-22 02:36:49 +03:00
bf25a18a04
[__group] fix --gid on freebsd
2020-05-22 02:31:38 +03:00
ad58ea79c2
[__ssh_authorized_keys] Fix bug where --option was not multiple
...
This went against both documentation and intent.
2020-05-18 20:01:01 +02:00
8d639d54d0
Merge branch 'evilham-authorized_keys-man' into 'master'
...
[__ssh_authorizedkey{,s}] Improve documentation.
See merge request ungleich-public/cdist!877
2020-05-18 19:49:50 +02:00
2362d89976
Merge branch 'evilham-machine_type-explorer-simplify-linux-add-openbsd' into 'master'
...
[explorer/machine_type] simplify linux add openbsd
See merge request ungleich-public/cdist!876
2020-05-18 19:48:47 +02:00
c5454afc72
Merge branch 'evilham-machine_type-explorer-freebsd' into 'master'
...
[explorer/machine_type] Add support for FreeBSD.
See merge request ungleich-public/cdist!875
2020-05-18 19:46:47 +02:00
6d502f737a
[__ssh_authorizedkey{,s}] Improve documentation.
2020-05-18 18:37:16 +02:00
8b790b0a54
[explorer/machine_type] Make shellcheck happy!
2020-05-18 16:47:20 +02:00
cf44c4a01b
[explorer/machine_type] Simplify Linux + basic OpenBSD support.
...
By abstracting away vendor-dependent pattern matching for the linux code, we can
re-use that and be reasonably sure about OpenBSD machines being virtualised when
we can identify the undelrying virtualisation technology.
It remains to be solved how to tell if an OpenBSD machine is physical; in that
case previous cdist behaviour ("unknown") remains.
For NetBSD something similar to OpenBSD could be done, with different sysctls:
hw.machine and hw.model wary of adding those without testing though, so for
NetBSD previous cdist behaviour ("unknown") remains.
https://netbsd.gw.com/cgi-bin/man-cgi?sysctl+7.i386+NetBSD-9.0
2020-05-18 16:35:50 +02:00
7ca2bfc14a
[explorer/machine_type] Add support for FreeBSD.
...
More research is needed for {Net,Open}BSD support.
Indentation is left as-is for the linux code as I intend to simplify it in a
future MR, this way the diff is minimal.
2020-05-18 16:00:23 +02:00
086e683c99
[__file] add "default values" in manual for group, mode and owner
...
Because at least the --mode default value may not be expected, the
manual lists the "default values". As they are not explicitly set in the
`__file` type, it is a bit more difficult, but should resolve to
following:
- the mode comes from the umask set in the cdist code to protect file
creation and uses the strongest umask possible.
- the owner and group comes from the ssh user, which should always be
the root user. (I think this can be swaped, too, but who will?)
At the owner and group parameter, it could be replaced with something
like "the ssh user and group", which would be more correct, but less
understandable.
2020-05-16 16:33:38 +02:00
dcfabf9268
[__cron] add hint for default values of time-related parameters
...
This should resolve some misunderstanding when leave a time-related
parameter with it's default value.
2020-05-16 14:00:02 +02:00
42f2dceeb1
[__link] fix typo in the manual
2020-05-09 18:40:44 +02:00
Nico Schottelius
d4059fd29e
[__letsencrypt_cert] whitelist Ubuntu
2020-05-01 15:31:23 +02:00
Nico Schottelius
f58d662b32
[__pyvenv] Switch to python3 -m venv for ubuntu
2020-05-01 15:28:01 +02:00
ea3bd14d8b
[logging] Mute warning on return_output=True when running scripts.
...
This fixes #806 which contains more information about the issue.
The TL;DR: this warning is not being useful and hinders debugging types because
it creates an innecessary line for each explorer.
An alternative proposal was #807 but was abandoned in favour of just dropping
the warning.
2020-04-28 14:54:51 +02:00
678df1ec8a
[explorers] Improve *BSD support.
...
cpu_cores and memory did lacked support for other BSDs.
2020-04-27 01:29:37 +02:00
8074f02bb3
Merge branch 'evilham-pf' into 'master'
...
[__pf*] (~) __pf_ruleset (+)__pf_apply_anchor, deprecate __pf_apply
See merge request ungleich-public/cdist!867
2020-04-26 09:59:24 +02:00
71156258a4
Merge branch 'evilham-postfix' into 'master'
...
[__postfix] Automagically support more OSs by not checking too much.
See merge request ungleich-public/cdist!866
2020-04-26 09:52:08 +02:00
c13608fab5
Merge branch 'evilham-openldap_server' into 'master'
...
[__openldap_server] Support extra config parameter.
See merge request ungleich-public/cdist!865
2020-04-26 09:50:21 +02:00
b40b95d758
Merge branch 'evilham-motd' into 'master'
...
[__motd] Improve documentation and support for FreeBSD
See merge request ungleich-public/cdist!864
2020-04-26 09:47:54 +02:00
6ec3274598
Merge branch 'postgres-database-args' into 'master'
...
Add --template, --encoding, --lc-collate, --lc-support to __postgres_database type
See merge request ungleich-public/cdist!859
2020-04-26 09:41:30 +02:00
80d204368a
Merge branch 'fix-configuration-file-location' into 'master'
...
Fix configuration file location
See merge request ungleich-public/cdist!863
2020-04-26 09:33:38 +02:00
2928795441
[__pf_ruleset] Fix shellcheck issue.
2020-04-25 14:54:29 +02:00
fefe90e9c9
[__pf*] (~) __pf_ruleset (+)__pf_apply_anchor, deprecate __pf_apply
...
__pf_apply the way it exists on cdist is not really useful and __pf_ruleset does
not take advantage of other types as it should, being instead overly complex and
not as reliable.
The new __pf_ruleset is compatible with the previous one, and __pf_apply_anchors
allows for a simple and powerful way of managing pf anchors.
The functionality previously provided by __pf_apply is still possible out of the
box in __pf_ruleset.
These patches were mostly contributed by Kamila Součková and made fit for
upstreaming by Evilham.
2020-04-25 12:23:27 +02:00
5981d0a5f1
[__postfix] Automagically support more OSs by not checking too much.
...
It is quite likely that the package is going to be called postfix, rather
than trying to have an exhaustive "allow list" for this package, we can
just add special cases for OSs where that is not the case (not aware of any
atm).
2020-04-25 00:22:28 +02:00
056c7c5400
[__openldap_server] Support extra config parameter.
...
This allows the user to, e.g. manually define ACLs, while this type does not
support that.
2020-04-25 00:12:24 +02:00
de37b0ce45
[__motd] Improve documentation and support for FreeBSD
...
This makes it easier to use the type just by reading the man page and also
treats FreeBSD's MOTD better.
2020-04-24 20:26:44 +02:00
Darko Poljak
38ccdfda32
Fix newly found shellcheck issues
2020-04-22 23:21:34 +02:00
742163e38c
Fix configuration file location
2020-04-15 17:10:33 +02:00
c3f924d350
Add --template flag to __postgres_database type
2020-04-14 10:23:08 +02:00
Darko Poljak
704e78322e
Use OrderedDict to guarantee order
...
Note:
> Changed in version 3.7: Dictionary order is guaranteed to be
> insertion order. This behavior was an implementation detail of
> CPython from 3.6.
2020-04-11 20:26:20 +02:00
Steven Armstrong
e19c1bb1e0
remove duplicates from conf dirs while preserving order
...
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2020-04-10 21:50:39 +02:00
Steven Armstrong
76d978d3d8
explorer/init: do not grep on non-existent init
...
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2020-04-10 10:51:17 +02:00
d53077f4e8
Add --encoding, --lc-collate, --lc-support to __postgres_database type
2020-04-06 09:30:01 +02:00
Darko Poljak
890c73f6bd
Fix shellcheck issues
2020-04-02 20:18:04 +02:00
Nico Schottelius
d034fe9369
[__pyvenv] use python3 -m venv on alpine
...
Until python4 comes, this will work
2020-04-02 18:24:13 +02:00
Nico Schottelius
0f639a9278
Make __cron nonparallel
...
It fails due to removal / edit of crontab at the same time
VERBOSE: [18331]: uncloud.ungleich.ch: Running object __cron/pg_dump_cleanup
VERBOSE: [18332]: uncloud.ungleich.ch: Running object __ungleich_packages/server
VERBOSE: [18335]: uncloud.ungleich.ch: Running object __postgres_role/app
INFO: [18335]: uncloud.ungleich.ch: Processing __postgres_role/app
INFO: [18331]: uncloud.ungleich.ch: Processing __cron/pg_dump_cleanup
ERROR: [16451]: uncloud.ungleich.ch: ssh -o User=root -o ControlPath=/tmp/tmp_8eu4oep/s -o ControlMaster=auto -o ControlPersist=2h uncloud.ungleich.ch /bin/sh -c ' export __object=/var/lib/cdist/object/__cron/pg_dumpall_under_day/.cdist-mfd00npk; export __object_id=pg_dumpall_under_day;/bin/sh -e /var/lib/cdist/object/__cron/pg_dumpall_under_day/.cdist-mfd00npk/code-remote': ['ssh', '-o', 'User=root', '-o', 'ControlPath=/tmp/tmp_8eu4oep/s', '-o', 'ControlMaster=auto', '-o', 'ControlPersist=2h', 'uncloud.ungleich.ch', "/bin/sh -c ' export __object=/var/lib/cdist/object/__cron/pg_dumpall_under_day/.cdist-mfd00npk; export __object_id=pg_dumpall_under_day;/bin/sh -e /var/lib/cdist/object/__cron/pg_dumpall_under_day/.cdist-mfd00npk/code-remote'"]
Error processing object '__cron/pg_dumpall_under_day'
=====================================================
name: __cron/pg_dumpall_under_day
path: /tmp/tmplaq9cwdh/6318c251013a449595327745daacf3ee/data/object/__cron/pg_dumpall_under_day/.cdist-mfd00npk
source: /tmp/tmplaq9cwdh/6318c251013a449595327745daacf3ee/data/conf/type/__ungleich_postgresql/manifest
type: /home/nico/vcs/cdist/cdist/conf/type/__cron
code-remote:stderr
------------------
crontab: can't move 'postgres.new' to 'postgres': No such file or directory
VERBOSE: [16451]: config: Total processing time for 1 host(s): 13.98031210899353
[18:09] line:~%
2020-04-02 18:14:09 +02:00
1eb02f908b
Merge branch 'fix/__package_update_index' into 'master'
...
[__package_update_index] Fix maxage false-positives on brand-new installations
See merge request ungleich-public/cdist!858
2020-03-29 13:53:55 +02:00
Darko Poljak
b25939cdd6
Fix shellcheck
2020-03-27 13:30:52 +01:00
11148995d1
Merge branch 'master' into 'master'
...
fix typo
See merge request ungleich-public/cdist!857
2020-03-27 08:50:29 +01:00
Nico Schottelius
66d9905029
[__consul_agent] make conf_dir depent on the OS
2020-03-26 21:48:17 +01:00
f00e4af5f0
fix typo
2020-03-26 21:17:32 +08:00
358e04b2af
Handle specially if no time about the last index update found.
...
The explorer 'currage' now returns -1 if he can not find any value about
this. The gencode-remote script handle this value special to not exit if
-1 given as value.
This fixes the bug
ungleich-public/cdist#803
2020-03-14 09:58:38 +01:00
fb32d6ed3f
alpine uses a different getent lib which doesnt support: getent shadow
2020-03-08 16:04:02 +01:00
4b24d886eb
Merge branch 'file/better-errors' into 'master'
...
[__file] Better errors analogous to __directory
See merge request ungleich-public/cdist!854
2020-02-26 21:50:01 +01:00
Dennis Camera
9eacba06bb
[__file] Treat pre-exists as a special case in gencode-remote as it should never get there
2020-02-26 16:48:14 +01:00
Dennis Camera
46d2487f08
[__file] Give more precise error message when --state pre-exists
2020-02-26 16:40:53 +01:00
dd6b07d924
Merge branch 'directory-exists' into 'master'
...
[__directory] Add --state exists and --state pre-exists
See merge request ungleich-public/cdist!832
2020-02-26 16:33:37 +01:00
Dennis Camera
6b4b6534a1
[__directory] Give more precise error message when --state pre-exists
2020-02-26 16:15:23 +01:00
aa49afd61a
Merge branch 'fix/explorer/disks' into 'master'
...
explorer/disks: Fix on NetBSD and support Linux w/o lsblk
See merge request ungleich-public/cdist!852
2020-02-26 12:53:26 +01:00
Dennis Camera
6db6dc4ac0
[explorer/disks] Add license header
2020-02-25 20:24:14 +01:00
Dennis Camera
1ef126e16f
[explorer/disks] Move xargs call to the bottom
2020-02-25 20:21:35 +01:00
Dennis Camera
d3bd2669ec
[explorer/disks] Support Linux without lsblk (fallback to sysfs)
2020-02-25 20:21:14 +01:00
e6f683b886
Add support for alpine (edge) package to __consul_agent
2020-02-24 09:20:49 +01:00
Dennis Camera
c6aba8d189
[explorer/disks] Fix for NetBSD
...
When connecting over SSH and running /bin/sh, the PATH is missing sbin locations.
sysctl is located at /sbin/sysctl on NetBSD.
2020-02-23 22:59:41 +01:00
47ec9ada10
Merge branch 'consul_agent' into 'master'
...
Refactor __consul_* for use with distribution packages
See merge request ungleich-public/cdist!837
2020-02-23 09:28:24 +01:00
e1b80f7222
Merge branch 'service' into 'master'
...
Add simple __service type
See merge request ungleich-public/cdist!847
2020-02-23 09:21:29 +01:00
2a5309b413
Merge branch 'fix/init-explorer/busybox' into 'master'
...
[explorer/init] Support more init systems
See merge request ungleich-public/cdist!850
2020-02-23 09:18:51 +01:00
Dennis Camera
0d6bc8e8f8
[explorer/init] Make shellcheck happy
2020-02-20 23:34:19 +01:00
Dennis Camera
0d84c91b40
[explorer/init] Fix unique() for Solaris
2020-02-20 23:34:19 +01:00
Dennis Camera
364340c8d5
[explorer/init] Refactor and testing
2020-02-20 23:34:19 +01:00
Dennis Camera
d895bb0e87
[explorer/init] Clean up
2020-02-20 23:34:19 +01:00
Dennis Camera
21c9e3db18
[explorer/init] Support more init systems
2020-02-20 23:34:11 +01:00
28d3760e29
[cdist]Update os_version for alpine
2020-02-20 09:40:55 +01:00
a3bc8f9407
__update_alternatives: remove expired comment
2020-02-19 12:59:14 +02:00
b891bb05d5
__update_alternatives: add state explorer
2020-02-19 12:58:22 +02:00
09540dc6bd
Add simple __service type
2020-02-17 21:38:03 +01:00
31ad1bdaad
Fix various typos and styling errors in __consul_agent, conf-dir
...
explorer
2020-02-17 13:43:18 +01:00
f595664924
Patch __consul_* to discover remote consul configuration dir
2020-02-17 13:42:19 +01:00
70200cd28f
Refactor __consul_agent type to support distribution packages
2020-02-17 13:42:19 +01:00
Darko Poljak
0640b02f90
Fix too short title underline
2020-02-15 14:59:12 +01:00
7acbc8709b
Merge branch 'postgres-role-password' into 'master'
...
Fix password command synthax in __postgres_role
See merge request ungleich-public/cdist!845
2020-02-15 14:36:54 +01:00
a1536933ab
Fix password command synthax in __postgres_role
2020-02-15 14:16:00 +01:00
221c3820ca
Merge branch 'type/__systemd_service' into 'master'
...
[__systemd_service] new type to manage the state of systemd services
See merge request ungleich-public/cdist!844
2020-02-15 12:22:04 +01:00
b898412faf
Merge branch 'fix/__cron' into 'master'
...
[__cron] Fix cronjob removal if `is` and `should` don't match
See merge request ungleich-public/cdist!841
2020-02-15 12:16:58 +01:00
ef089d1c61
[__systemd_service] new type to manage the state of systemd services
2020-02-15 11:42:01 +01:00
5e6e17b3e5
Moved default parameter values from scripts to cdist parameter handling.
...
For more generalisation, the default parameter values are now handled by
cdist instead of trying to get a value and use a default if parameter is
not given.
It handles the default values in a more general way, instead of write
one default in (possibly) multiple places.
Problem occurred when checking the 'state' parameter, which required to
set a default value in two places.
2020-02-15 09:46:23 +01:00
a761d4842c
Add check for the state parameter in manifest.
...
This only allow following cases:
- present
- absent
else, it will abort with an error message.
2020-02-15 08:21:24 +01:00
c8dbd0718e
Merge branch '__package_apt_updates_index' into 'master'
...
__package_apt: update index cache, on installation, when it is older than one day
See merge request ungleich-public/cdist!842
2020-02-14 21:57:04 +01:00
869a38676f
__package_apt: add comment about package index update
2020-02-14 19:22:06 +02:00
1be5a9d316
__package_apt: add note about updating index
2020-02-14 19:19:12 +02:00
f771840178
__mysql_privileges: fix typo
2020-02-13 17:38:34 +02:00
b7483d73eb
__mysql_privileges: fix shellcheck
2020-02-13 17:38:19 +02:00
710e99f240
__mysql_privileges: fix quoting
2020-02-13 17:29:44 +02:00
b3bad9468d
__package_apt: pkgcache.bin may not exist
2020-02-09 20:43:09 +02:00
08d5814e2c
__package_apt: update index cache, on installation, when it is older than one day
2020-02-09 20:37:06 +02:00
0edda3b528
Merge branch 'no-stat-patch' into 'master'
...
__file/__directory: Patch for systems without stat(1)
See merge request ungleich-public/cdist!839
2020-02-04 07:46:28 +01:00
Dennis Camera
984e0dc8c4
[explorer/os_release] Add fallbacks to /usr/lib/os-release and /var/run/os-release
2020-02-03 19:29:04 +01:00
Dennis Camera
3b5433d63a
[__directory] stat explorer patch for systems without stat(1)
...
Some embedded systems (like OpenWrt) do not ship a stat(1) binary.
This workaround parses the output of ls(1) and /etc/passwd, /etc/group to
gather the information needed.
2020-02-03 18:36:59 +01:00
Dennis Camera
e82dd35869
[__file] stat explorer patch for systems without stat(1)
...
Some embedded systems (like OpenWrt) do not ship a stat(1) binary.
This workaround parses the output of ls(1) and /etc/passwd, /etc/group to
gather the information needed.
2020-02-03 18:36:59 +01:00
Nico Schottelius
2d8afe0d16
Merge branch 'master' of code.ungleich.ch:ungleich-public/cdist
2020-02-03 17:44:55 +01:00
Nico Schottelius
f3237e5d76
[consul agent] add support for Debian 10
2020-02-03 17:44:47 +01:00
e5d86ffc93
Fix to remove cronjobs when the cronjob expression did not match.
2020-02-01 17:08:25 +01:00
Dennis Camera
4fe2dcba89
[explorer/init] Linux is a mess...
2020-01-30 18:35:50 +01:00
Dennis Camera
de1a421b68
[explorer/init] Support for Darwin and more BusyBox combinations
2020-01-30 18:04:00 +01:00
1fbd2fc2bd
__acl: add --file and --directory for convenience
2020-01-19 22:51:40 +02:00
e1ac97b6a5
__acl: add --source
2020-01-19 14:02:00 +02:00
Darko Poljak
ffb3c003ca
Merge branch 'ssrq/cdist-line-patches'
2020-01-17 18:07:14 +01:00
efdeab61f3
Merge branch '__apt_unattended_upgrades' into 'master'
...
__apt_unattended_upgrades
See merge request ungleich-public/cdist!828
2020-01-17 15:50:07 +01:00
65c5b592a5
__apt_unattended_upgrades: update manual
2020-01-17 14:48:54 +02:00
6097cd9e90
__apt_unattended_upgrades: use word expansions
2020-01-17 14:41:00 +02:00
ef2f4b9a00
__postgres_*: fix forgotten edge cases in delimited identifier escape
2020-01-17 11:24:24 +01:00
6fa0d687f7
__apt_unattended_upgrades: alternative approach
2020-01-16 01:13:27 +02:00
f5f70671cb
__apt_unattended_upgrades: make parameters more speaking
2020-01-16 00:59:03 +02:00
Dennis Camera
5a9a1ba57f
[__line] Produce error when file does not exist
2020-01-15 22:00:56 +01:00
b3f36dbe5b
__apt_unattended_upgrades: fix typo
2020-01-15 20:51:47 +02:00
cd24a806e7
__apt_unattended_upgrades: rewrite manifest, add more parameters
2020-01-15 20:48:32 +02:00
Dennis Camera
2cf44c66d4
[__directory] Add --state exists and --state pre-exists
2020-01-15 19:00:30 +01:00
68e5502fce
__apt_unattended_upgrades: move debian wiki link to manual
2020-01-15 19:27:02 +02:00
cd2d5b3f79
__apt_unattended_upgrades: all objects depend on package
2020-01-15 19:24:21 +02:00
Dennis Camera
51b1b11cc2
[__line/state] Logic fixes in explorer
...
This commit fixes the incorrectly reported state "wrongposition" if position is
"after" and anchor is present in the file but the line missing.
2020-01-15 17:57:45 +01:00
Dennis Camera
4cdb8aaa03
[__line/state] Make sure the index match is at the beginning
...
Without the == 1 all lines which contain --line as a substring match. e.g. if
--line is "line" and the file contains the line "wrong line" this was considered
a match.
2020-01-15 17:50:43 +01:00
Dennis Camera
629d0795c8
[__line] Always add line to end if anchor is not found
2020-01-15 17:27:25 +01:00
Dennis Camera
93ec4b46aa
[__line] Ensure the line is only added once
2020-01-15 17:27:25 +01:00
Darko Poljak
3258fc98e1
Fix typo
2020-01-12 12:19:49 +01:00
Darko Poljak
3f133dbc17
Info command: support tilde expansion
2020-01-11 15:26:46 +01:00
Darko Poljak
11f569959d
Fix missing configuration file usage, support -g
...
PreOS code did not use configuration support. This fix adds support
for using cdist configuration, which takes into account cdist
configuration file, environment variables and command line options,
especially conf_dir.
It also adds support for -g, --config-file option, for specifying
custom configuration file.
2020-01-11 14:16:33 +01:00
d4bd49bbb5
__acl: rename --acl to --entry for the sake of consistency, add compatibility
2020-01-04 17:43:57 +02:00
ec8d9571f9
__apt_unattended_upgrades: add manual
2020-01-04 17:07:46 +02:00
a9d491f998
__apt_unattended_upgrades: add license header
2020-01-04 16:59:42 +02:00
94e32dcd78
__apt_unattended_upgrades: initial commit
2020-01-04 16:36:44 +02:00
1fc845480e
Merge branch '__mysql' into 'master'
...
rewrite __mysql_database, add types __mysql_user and __mysql_privileges
See merge request ungleich-public/cdist!827
2020-01-04 13:45:15 +01:00
Darko Poljak
e4596593c0
Add cdist info command
2020-01-04 12:50:12 +01:00
4329cced82
__mysql_privileges: add manual
2020-01-03 18:55:55 +02:00
5e8dc7122d
__mysql_user: add manual
2020-01-03 18:48:11 +02:00
fcc774cb7b
__mysql_database: add manual
2020-01-03 18:33:23 +02:00
24862e0208
__mysql_database: carry over state
2020-01-03 18:26:11 +02:00
9a693537f4
__mysql_*: add license headers
2020-01-01 12:38:12 +02:00
c32e4040b1
__mysql_*: initial rewrite
2019-12-31 19:16:49 +02:00
beb930c0dc
__postgres_*: use delimited identifiers (double quoted) in generated SQL
2019-12-31 11:34:51 +01:00
Steven Armstrong
df05abd15b
bugfix: __install_chroot_umount was not using __chroot_umount/manifest
...
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2019-12-19 12:33:47 +01:00
Nico Schottelius
f407e8825f
[consul/alpine] no init script required to be deployed anymore
2019-12-15 22:56:16 +01:00
Darko Poljak
bd4eee7925
Fix shellcheck reported issues
2019-12-12 07:37:32 +01:00
c58c4b8309
Merge branch 'evilham-openldap' into 'master'
...
[new-type] __openldap_server
See merge request ungleich-public/cdist!822
2019-12-10 19:33:33 +01:00
3ba230c10d
[type-docs] __start_on_boot: remove unspported *BSD claim.
...
The type appears to support {Open,Free}BSD properly.
2019-12-10 13:12:54 +01:00
35f0d4dbfa
[new-type] __openldap_server: another documentation typo.
2019-12-10 13:10:19 +01:00
