fancsali/cdist-backup
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
6387 commits 91 branches 177 tags 18 MiB
Commit graph

1805 commits

Author SHA1 Message Date
Darko Poljak
378c7f6a89 Support in-distribution config file 2018-03-01 20:12:21 +01:00
Darko Poljak
2dfbd89c5e Fix determining save_output_streams value through configuration 2018-03-01 20:00:54 +01:00
Darko Poljak
23292e5cad Fix determining beta value through configuration 2018-03-01 19:33:22 +01:00
Darko Poljak
8eb0697b42
Merge pull request #640 from darko-poljak/bugfix/error_info_lost_with_jobs_#632 
[BETA] bug: error info lost with parallel (option -j) #632
 2018-02-28 23:40:26 +01:00
Darko Poljak
7ccc959ebd Bugfix: --beta on the commandline does not seem to work #635 
Fix argparse parsers.
 2018-02-28 23:29:45 +01:00
Darko Poljak
3fb7e33305 Bugfix: non-existent manifest not handled gracefully #639 2018-02-28 23:26:04 +01:00
Darko Poljak
2b5f1a0148 Fix a case when HOME is set but empty 2018-02-27 23:07:52 +01:00
Darko Poljak
cf36aece7d [BETA] bug: error info lost with parallel (option -j) #632 2018-02-25 23:48:53 +01:00
Darko Poljak
b870b6e43a bugfix: __consul fails if consul is already running #633 2018-02-25 09:51:51 +01:00
Darko Poljak
ef7304499a
Merge pull request #629 from tom-ee/feature/improve__package_dpkg 
add `--state`-parameter and messaging to __package_dpkg
 2018-02-21 21:19:07 +01:00
Thomas Eckert
a5dc6214e1 dpkg {-r|-P} needs the package-, not the filename 2018-02-21 15:01:08 +01:00
Thomas Eckert
3208ab614e review notes (duplicate boolean section, comma separate "see also" items) 2018-02-21 11:16:23 +01:00
Darko Poljak
526e1c9a6d
Merge pull request #628 from tom-ee/bugfix/messaging__package_update_index 
fix messaging for __package_update_index
 2018-02-21 10:03:58 +01:00
Darko Poljak
1f93e7291e Fix consul message and document messaging. 2018-02-21 10:00:25 +01:00
Thomas Eckert
a545b10538 add --state-parameter and messaging to __package_dpkg 
- `--state` allows to remove a deb-package, if `--purge-if-absent` is
  specified the package is purged instead of "only" removed
- messaging was added
- man-page updated accordingly
 2018-02-20 16:46:26 +01:00
Thomas Eckert
94c9d11cb8 fix messaging for __package_update_index 
The message was printed unconditionally, even if no `apt-get update` had
been running.
 2018-02-20 10:20:54 +01:00
Darko Poljak
c0dc26a577 Fix consul message. 2018-02-15 22:03:28 +01:00
Darko Poljak
48a0fb5bd0 Add message when adding consule directly on target. 2018-02-15 21:34:54 +01:00
Darko Poljak
4d39b6af51 Add -4 and -6 params to force IPv4, IPv6 addresses respectively. 2018-02-15 20:33:36 +01:00
Darko Poljak
9a832d88b5
Add option for directly downloading on target host. 2018-02-15 15:45:31 +01:00
Darko Poljak
0074bb0564 Fix minor docs formatting. 2018-02-14 20:07:44 +01:00
Darko Poljak
eb94d7a8bb
Remove update index type dep, call update index after adding new source. (#623) 2018-02-12 12:13:38 +01:00
Darko Poljak
a993e0f5a9
Support disabling saving output streams 2018-02-07 18:12:15 +01:00
Darko Poljak
47399bfa9f Add --renew-hook param to letsencrypt_cert type. 2018-02-05 13:57:53 +01:00
Darko Poljak
fe7da4d8b3 Update man page. 2018-01-31 20:21:48 +01:00
Darko Poljak
d6ff077156 __package_apt ignores --version parameter #615 2018-01-31 20:18:11 +01:00
Darko Poljak
87558adbda
Merge pull request #620 from thriqon/130-issue-stdin 
Allow reading contents of __motd and __issue from stdin
 2018-01-31 20:12:10 +01:00
Darko Poljak
4d4d76bb38
Merge pull request #617 from tom-ee/maxage-for__package_update_index 
Maxage for  package update index
 2018-01-31 13:57:09 +01:00
Jonas Weber
bfde7a6cfa Allow __motd to read from stdin 2018-01-31 12:53:50 +00:00
Jonas Weber
2069650e74 Allow filling __issue from stdin 
closes #130
 2018-01-31 12:53:50 +00:00
Thomas Eckert
fa91dbfcdb (re-) copyright msg 2018-01-31 11:10:20 +01:00
Thomas Eckert
6a6fdac25d add error-message if OS is unsuppored; fix indentation 2018-01-31 10:37:30 +01:00
Thomas Eckert
cb21b3679a add missing legal boilerplate to explorer 2018-01-31 09:22:19 +01:00
Thomas Eckert
2dc5550fa4 __package_update_index: update man-page w/ --magage and MESSAGING 2018-01-30 16:05:30 +01:00
Thomas Eckert
27d38a28ab __package_update_index: optional --maxage <seconds>-parameter for apt 
`--maxage 3600` ensures that `apt-get --quiet update` is only done if
the previous run was at least 1 hour ago.

This also adds messaging
 2018-01-30 13:48:25 +01:00
Jonas Weber
3545d0157f Provide --purge-if-absent to __package_apt 
Configuration files are not purged under Debian when the package
is deinstalled. If this parameter is given, they are deleted upon
package deinstallation.
 2018-01-30 12:04:19 +01:00
Jonas Weber
dd188ca588 Handle stdin to __systemd_unit correctly 
When directly piping in the source of a systemd unit file, cdist
errored out. This is due to not propagating the stdin file to the
underlying __config_file type (which already contains code for this
case, but this has to be duplicated in __systemd_unit).

The following example thus works:

    __systemd_unit test.service --source - <<EOF
    [Service]
    ExecStart=/bin/sleep 3600
    EOF
 2018-01-21 09:12:45 +00:00
Darko Poljak
9703e0f08e Save output streams. 
Implementation is 99% based on Steven's initial implementation.
 2018-01-09 09:31:40 +01:00
Kamila Součková
00f524773e
__daemontools fixes 
make __daemontools more robust and clean up the --install-init-script confusion
 2018-01-05 22:04:13 +01:00
Michal Hanula
c895be381f When installing packages on freebsd, redirect stdout and stderr to /dev/null instead of closing them. 
Some pre/post-install scripts rely on them being open.

(It would be bette to leave them open and show the output, but I didn't
want to change the behaviour)
 2018-01-02 18:11:37 +01:00
Kamila Součková
a657af64a1 __letsencrypt_cert: add nonparallel and make admin-email required (#609) 2017-12-29 17:10:16 +01:00
uqam-fob
fc8dded8e9 __line: Support regex beginning with an hyphen (fixes #607) (#608) 
If `regex` begins with an hyphen, `grep` treats it as an option
and treats `file` as the regular expression. This leads to `grep`
trying to read from the standard input and making it wait infinitely.

This patch adds the missing argument breaker `--` and allows
`regex` to begin with an hyphen (provided it is called correctly).
 2017-12-29 17:09:06 +01:00
Ľubomír Kučera
3397bcbf9b __systemd_unit improvements (#606) 
* __systemd_unit: Move systemctl detection to manifest

* __systemd_unit: Restart the unit if inactive

Until now, the --restart parameter caused the unit to be restarted
only when the unit file has changed. This commit modifies --restart
behavior so that the unit is also restarted when the unit is inactive.

* __systemd_unit: Do not create unit file when source is empty
 2017-12-29 17:06:48 +01:00
Ľubomír Kučera
457233f968 __sysctl: Add support for CoreOS (#605) 2017-12-12 08:50:48 +01:00
Steven Armstrong
71b858e467 use parameter defaults for chroot; re-export cdist log level to nested cdist run 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2017-12-12 00:15:54 +01:00
Darko Poljak
eb8922ebcd Remove redundant log.error line. 2017-11-20 08:02:25 +01:00
Kamila Součková
be7a99210b add --minute to __cron (#603) 
We don't want this to run _every_ minute (default for `--minute` is `*`).
 2017-11-19 13:31:44 +01:00
uqam-fob
3b6a471119 explorer/memory: Support OpenBSD (#602) 
Adds support to detect the amount of memory available on OpenBSD
systems.
 2017-11-15 07:31:17 +01:00
Darko Poljak
0bf6af6d22
Skip empty parameter. Fixes #599. (#600) 2017-11-15 07:30:35 +01:00
Ľubomír Kučera
aec63d42f1 __config_file: Fix onchange command not being executed (#596) 
When a config file state changes from present to absent, onchange
command was not being run.

Fixes #595.
 2017-11-10 12:22:38 +01:00
Darko Poljak
4f5dddd9d6
Fix for __line containing single quotes: #154. (#594) 2017-11-09 08:20:33 +01:00
_moep_
4cdc4ea42c update type for Debian Stretch (#593) 2017-11-07 13:26:44 +01:00
Ľubomír Kučera
b18327c520 Add __systemd_unit type (#589) 2017-11-07 13:25:37 +01:00
Darko Poljak
a8c41bfe44 Change warning message for invalid type. 2017-11-02 19:56:27 +01:00
Darko Poljak
782e662a13 Remove invalid type link from runtime conf dir at proper time. 2017-11-02 17:54:14 +01:00
Darko Poljak
c14f3b68f4 Warn about invalid type and continue instead of error. 2017-11-02 17:44:47 +01:00
Darko Poljak
e6c5563a16 NoSuchTypeError -> InvalidTypeError 2017-11-02 13:57:36 +01:00
Kamila Součková
4799e43516 new type: __letsencrypt_cert (#591) 2017-11-01 08:56:12 +01:00
Thomas Eckert
5eb478da95 Add messaging to __ssh_authorized_key. (#590) 2017-10-31 07:56:25 +01:00
Dominique Roux
2cd006de79 F/ccollect create destination (#548) 2017-10-29 17:23:35 +01:00
Kamila Součková
da8f6efafc fix explorer/os for devuan ascii (#588) 2017-10-20 18:16:06 +02:00
Ľubomír Kučera
36302f7541 Add support for CoreOS to __timezone type (#587) 2017-10-19 19:58:34 +02:00
Ľubomír Kučera
5c4cda589c Add support for CoreOS to __hostname type (#586) 2017-10-19 19:58:25 +02:00
Thomas Eckert
d1c3e2420f Add messaging to __process 2017-09-29 14:48:51 +02:00
Ander Punnar
8b78001c9e fix running scripts with execute bit (#583) 2017-09-29 14:44:44 +02:00
Thomas Eckert
7ee56d099f resolved #444 add messaging to __line-type (#580) 
#444 Add messaging to __line-type
 2017-09-27 12:19:07 +02:00
Darko Poljak
966bf30bee Fix \n thing. 2017-09-20 21:53:05 +02:00
Darko Poljak
ea58cbd171 Better format command error output. 2017-09-20 21:19:19 +02:00
Darko Poljak
764ea49904 Log more data. 2017-09-17 20:30:07 +02:00
Darko Poljak
8883196efb Bugfix for: __ssh_authorized_keys overwrites existing keys #577 (#579) 
* Fix a bug where invalid key removes all file entries.

* __ssh_authorized_key: add key validation.
 2017-09-17 08:13:05 +02:00
Darko Poljak
ac04edc233 Change path removal suitable for integration and normal run. 2017-09-14 09:53:16 +02:00
Darko Poljak
47d72fb83a Create control path only if needed. 2017-09-14 09:27:27 +02:00
Darko Poljak
08bc38dd0f Log ERROR to stderr and rest to stdout. (#576) 2017-09-13 13:06:06 +02:00
Darko Poljak
f2614469c5 configuration: converter() -> get_converter() 2017-09-11 22:36:45 +02:00
Darko Poljak
f0dc21ec0c __cdist_log_level=<log level int value>; __cdist_log_level_name=<log level name> (#574) 2017-09-11 09:06:47 +02:00
Darko Poljak
1ae5b1732e Fix missing dirs cleanup. 2017-09-10 23:08:21 +02:00
Darko Poljak
519eb60664 Fix exec/{local,remote} tests. Add exec/local test to make test. 2017-09-10 22:05:05 +02:00
Kamila Součková
1f00a35795 fixes + go version bump in __prometheus_exporter (#573) 2017-09-09 21:21:15 +02:00
Darko Poljak
3454da076f Add -l/--log-level option. Honor __cdist_loglevel env var. (#572) 
Add -l/--log-level option, __cdist_loglevel -> __cdist_log_level; honor __cdist_log_level env var
 2017-09-09 21:17:29 +02:00
Darko Poljak
f08ac264a0 pep8 2017-09-07 16:37:49 +02:00
Darko Poljak
57f15f9cce Make __cdist_loglevel value more expressive. (#571) 2017-09-07 16:36:23 +02:00
Darko Poljak
2e4c0d3465 Improve dry run logging. 2017-09-07 16:33:22 +02:00
Darko Poljak
97f6517715 Configuration fixes. 2017-09-07 16:13:46 +02:00
Darko Poljak
28d3466e9d Fix logging dry run line. 2017-09-07 12:32:04 +02:00
Darko Poljak
cb38354df3 Run cleanup commands in quiet mode for DEBUG, TRACE. 2017-09-07 12:10:17 +02:00
Darko Poljak
e0a4fc4ea7 verbose -> info 2017-09-07 11:58:19 +02:00
Darko Poljak
dd48c82656 Log 'Processing' line even if dry run. 2017-09-07 11:30:02 +02:00
Darko Poljak
7141e67d51 Merge pull request #570 from darko-poljak/debug-to-cdist_loglevel 
__debug -> __cdist_loglevel
 2017-09-07 10:09:57 +02:00
Darko Poljak
92488e83d6 __debug -> __cdist_loglevel 2017-09-06 21:59:57 +02:00
Philippe Grégoire
b2fb38d1f4
__package_pkg_openbsd: fix pkg_version explorer 
The pkg_version explorer will fail to properly detect if a package
is installed when a package's name is present in the description of
a package (as returned by pkg_info).

Currently, trying to install libtool fails due to incorrect parsing:

    $ pkg_info | grep libtool
    libltdl-2.4.2p1     GNU libtool system independent dlopen wrapper

Additionally, trying to install nagios results in the following output:

    $ pkg_info | grep nagios
    nagios-4.0.8p3-chroot host and service monitor
    nagios-web-4.0.8p2-chroot cgis and webpages for nagios

This commit fixes detection by properly parsing pkg_info's output.
Specifically, descriptions are ignored and package names are properly
extracted.
 2017-09-04 13:07:49 -04:00
uqam-fob
0dd5411216 __package_pkg_openbsd: fix use of --name (#568) 
Fixes the improper use of the file holding the value of the 'name'
option.
 2017-09-03 23:27:27 +02:00
Darko Poljak
fb3cd98b54 Minor fixes to man page. 2017-09-02 21:38:13 +02:00
Kamila Součková
b8a1ad0ebd Improve __daemontools on FreeBSD (#567) 
Improve __daemontools on freebsd
 2017-09-02 21:25:17 +02:00
Kamila Součková
a9f338b6a5 new type: __prometheus_exporter (#566) 2017-09-02 21:23:48 +02:00
Kamila Součková
7564038f04 fixes to __prometheus_{server,alertmanager} (#565) 2017-09-02 21:22:33 +02:00
Darko Poljak
99133219bc Add another test case. 2017-09-02 08:40:23 +02:00
Sven Wick
ed55d01b35 Update machine_type (#564) 
detect kvm on proxmox
 2017-09-01 20:56:48 +02:00
Darko Poljak
5213f343c0 pep8 2017-09-01 14:11:58 +02:00
Darko Poljak
136f2ecd87 Add helpers for cdist config/install integration. (#551) 
Implement simple integration API.
 2017-09-01 14:08:50 +02:00
Darko Poljak
4af3c0c6d5 Fix empty conf_dir configuration value. 2017-08-30 23:57:47 +02:00
Darko Poljak
2f10353156 Fix configuration bugs. 2017-08-30 23:11:10 +02:00
Darko Poljak
bdee7273af Configfile (#559) 
Add cdist configuration/config file support.
 2017-08-30 23:02:17 +02:00
Darko Poljak
eae399b025 Fix removing ssh key that is last one in the file. 2017-08-30 09:27:06 +02:00
Steven Armstrong
3c3b29f710 allow hostnamectl to fail silently 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2017-08-29 22:50:47 +02:00
Steven Armstrong
0114001627 remember default __remote_{copy,exec} so we can use it ourself in custom __remote_{copy,exec} scripts 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2017-08-29 22:31:30 +02:00
Steven Armstrong
04c8415060 use __remote_{exec,copy} instead of plain ssh/scp in remote exec scripts 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2017-08-29 21:49:47 +02:00
Philippe Grégoire
0e3c7545cc
__user_groups: Support OpenBSD 
OpenBSD's usermod(8) interface is similary to NetBSD's.
This commit makes __user_groups support it explicitly.

https://man.openbsd.org/usermod.8
http://netbsd.gw.com/cgi-bin/man-cgi?usermod++NetBSD-current
 2017-08-27 08:58:16 -04:00
Darko Poljak
6751349d21 Merge pull request #561 from uqam-fob/pkg-openbsd-installurl 
__package_pkg_openbsd: support using /etc/installurl
 2017-08-27 14:23:11 +02:00
Philippe Grégoire
d4f34a3f40
__package_pkg_openbsd: support the empty flavor 
Adds support for specifying an empty flavor by passing --flavor "".
 2017-08-26 10:59:04 -04:00
Philippe Grégoire
56adfd4dee
__package_pkg_openbsd: support using /etc/installurl 
In 6.1, OpenBSD introduced installurl(5), which contains
the URL the sets where installed from during install or upgrade.
The content of this file is used by pkg_add(1) if PKG_PATH is
not defined.

This commit changes the behavior of __package_pkg_openbsd to omit
setting PKG_PATH to a hard-coded value if --pkg_path is not provided.
This, in turn, makes pkg_add(1) use installurl(5).
 2017-08-26 09:42:36 -04:00
Mark Verboom
6f04c9bfce Explorer pipes output of apt-key list, which always generates: 
Warning: apt-key output should not be parsed (stdout is not a terminal)
on stderr. Redirect stderr of apt-key to /dev/null to prevent output in
cdist run.
 2017-08-25 14:31:32 +02:00
Darko Poljak
c6d00019a8 Merge pull request #556 from uqam-fob/explorer-init-pgrep 
explorer/init/Linux: use pgrep instead of ps
 2017-08-25 11:31:42 +02:00
Darko Poljak
11a974aeff Merge pull request #557 from uqam-fob/type-user-explorers 
__user: explore with /etc files
 2017-08-25 11:30:32 +02:00
Darko Poljak
d9cf1590b8 Fix spelling. 2017-08-25 10:50:11 +02:00
Steven Armstrong
4851c0517f inherit log level from cdist install during nested cdist config 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2017-08-24 14:43:26 +02:00
Darko Poljak
f368539447 Some pylint cleaning. 2017-08-22 10:58:30 +02:00
Philippe Grégoire
31e5c97c55
use command(1) to get executable's path 2017-08-21 10:51:55 -04:00
Philippe Grégoire
997fdd8ac4
fix typo in group entry extraction 2017-08-20 15:13:01 -04:00
Philippe Grégoire
a915baa73b
__user: explore with /etc files 
getent(1) is a utility available where Name Service Switch (NSS)
is available. Many modern operating systems support it, but that
may not be the case of all (e.g. embedded systems).

This commit modifies the __user type explorers to check the
traditional files instead of relying solely on the availability
of getent(1).

- Makes the group explorer use /etc/group
- Makes the passwd explorer use /etc/passwd
- Makes the shadow explorer use /etc/shadow

Implementation note

"getent shadow" does not support querying an entry using a uid
since it does not store that information. Since the shadow explorer
uses __object_id, the passwd explorer does not check if __object_id
matches an entry by uid. This behavior ensures consistent, transparent
behavior of the type. The group explorer, on the other hand, handles
group names and uids; like always.
 2017-08-20 12:10:54 -04:00
Philippe Grégoire
ebe0c0d66d
make sure we continue on errors 2017-08-20 11:12:30 -04:00
Philippe Grégoire
5646a66f6c
explorer/init/Linux: replace ps by pgrep 
BusyBox's version of ps does not support the -o option.
On Linux systems, use pgrep -P0 -l to get the name of
pid 1.
 2017-08-20 11:06:07 -04:00
Philippe Grégoire
2b9bf3de24
replace grep+sed by awk 2017-08-19 18:19:17 -04:00
Philippe Grégoire
e88e9c357f
fix formatting 2017-08-19 16:49:19 -04:00
Philippe Grégoire
69c6de9f9c
explorer/os: get ID from /etc/os-release 
/etc/os-release was introduced by systemd[1] and is now
more and more common; even on systems without systemd (e.g. lede).
In addition to detecting the OS based on specific attributes,
this file provides the ID marker to describe the OS.

This commit adds support for OS detection via /etc/os-release.
According to [2], it is already lowercase.

[1] http://0pointer.de/blog/projects/os-release
[2] https://www.freedesktop.org/software/systemd/man/os-release.html
 2017-08-19 16:41:50 -04:00
Darko Poljak
ceb97fd0ee Fix for mistake in 982bb286f4. 2017-08-19 19:12:30 +02:00
Darko Poljak
982bb286f4 Cleanup options' help and cdist man page. 2017-08-17 08:24:58 +02:00
Philippe Gregoire
61b52ac806 Set default remote_cmds_cleanup_pattern 
Fixes an exception when --remote-copy and --remote-exec are used.
 2017-08-14 16:13:57 -04:00
Philippe Gregoire
7b0b3d9415 Fix remote cmds cleanup 
When --remote-copy and --remote-exec are provided,
args.remote_cmds_cleanup_pattern is not set.

This patches fixes the evaluation of args.remote_cmds_cleanup_pattern
and prevents cdist from throwing an exception when --remote-copy
and --remote-exec are used.
 2017-08-14 14:25:19 -04:00
Darko Poljak
b6467e716e Merge remote-tracking branch 'ungleich/master' into jobs-locking 2017-08-13 12:27:57 +02:00
Darko Poljak
75fe3272b3 Add file locking for -j parallel execution. 2017-08-13 12:26:20 +02:00
Darko Poljak
87fe52ea61 Default logging level is WARNING. 2017-08-12 23:02:31 +02:00
Darko Poljak
314a931b84 Respect cdist log level in emulator. 2017-08-12 21:40:23 +02:00
Darko Poljak
59782ad64e Fix unit test. 2017-08-11 01:20:45 +02:00
Darko Poljak
2b0e8160cf Merge pull request #543 from darko-poljak/ssh-mux-sigpipe 
Fix ssh connection multiplexing race condition #542
 2017-08-10 23:42:16 +02:00
Darko Poljak
8bb70055f4 Merge branch 'master' into archiving 2017-08-10 19:11:35 +02:00
Darko Poljak
ca1cc0f64a object_id = '/' is invalid 2017-08-10 19:08:44 +02:00
Darko Poljak
68cb13881f Add archiving support. 2017-08-09 16:56:02 +02:00
Nico Schottelius
260303dd14 Fix gpasswd call in __user_groups: order incorrect 
From the manpage:

       -a, --add user
           Add the user to the named group.

       -d, --delete user
           Remove the user from the named group.
 2017-08-03 15:11:35 +02:00
Darko Poljak
1b0f560608 Add missing args to method call. 2017-07-27 09:51:23 +02:00
Darko Poljak
0a85d913cc Optimize dir transfer. 2017-07-27 09:49:06 +02:00
Darko Poljak
0d734c872d Fix log var assignment. 2017-07-27 09:36:00 +02:00
Darko Poljak
3db987b913 Merge pull request #549 from 4nd3r/__timezone 
__timezone: always exit 0
 2017-07-27 09:01:15 +02:00
Ander Punnar
b7b1101f11 always exit 0 2017-07-27 01:28:26 +03:00
Darko Poljak
23fbabe303 Further improve parallel execution. 2017-07-26 17:39:07 +02:00
Darko Poljak
d1a044cc23 multiprocessing.Pool -> concurrent.futures.ProcessPoolExecutor 2017-07-26 12:01:19 +02:00
Darko Poljak
7c7a98d083 pep8 2017-07-25 12:43:54 +02:00
Darko Poljak
32838a096d Refine inventory logging to adhere new cdist logging. 2017-07-25 12:40:12 +02:00
Darko Poljak
0af64c01bf Add -p HOST_MAX argument. 2017-07-25 11:12:18 +02:00
Darko Poljak
bb2cc68169 Fix broken text 2017-07-24 19:13:40 +02:00
Darko Poljak
4a54d1420e Remove unwanted fixme 2017-07-24 19:12:43 +02:00
Darko Poljak
9b5220a29c Merge pull request #546 from greendeath/master 
Updated to docker-compose version 1.14
 2017-07-21 21:49:02 +02:00
Dominique Roux
5ccfec9c18 Updated to docker-compose version 1.14 2017-07-21 21:18:16 +02:00
Darko Poljak
060ddc2a17 Merge remote-tracking branch 'ungleich/master' into ssh-mux-sigpipe 2017-07-21 17:23:07 +02:00
Ander Punnar
6bfe02094d year is 2017 2017-07-21 10:23:05 +03:00
Ander Punnar
2c56622eeb check file first 2017-07-21 10:22:54 +03:00
Ander Punnar
c706b9eefb check current timezone before doing anything 2017-07-21 10:19:02 +03:00
Darko Poljak
e2a1519332 Merge inventory from beta branch. 2017-07-20 22:04:44 +02:00
Darko Poljak
a20b7167cd pep8 2017-07-19 07:58:14 +02:00
Darko Poljak
01d7f63fcb Merge remote-tracking branch 'ungleich/master' into ssh-mux-sigpipe 2017-07-19 07:55:19 +02:00
Darko Poljak
2beb55be54 Remove FIXME comment due to fix appliance 2017-07-19 07:52:57 +02:00
Darko Poljak
126a1812a5 Fix parallel object prepare and run steps. Add nonparallel type marker. 2017-07-15 22:18:20 +02:00
Darko Poljak
31899b2263 Add missing shebangs. 2017-07-15 22:16:25 +02:00
Darko Poljak
b50e605441 Merge pull request #544 from darko-poljak/ignore-dot-files-under-conf-types 
Ignore directory entries that begin with dot('.').
 2017-07-14 14:49:20 +02:00
Steven Armstrong
1fe12f81a9 Merge branch 'feature/install' 2017-07-07 02:12:38 +02:00
Steven Armstrong
d9a358bdf3 add forgotten symlink 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2017-07-07 02:10:06 +02:00
Darko Poljak
6b3b5c735e Merge pull request #541 from 4nd3r/__file 
fix __file
 2017-07-06 22:56:54 +02:00
Darko Poljak
f9b632eebb Improve listdir. 2017-07-06 17:22:25 +02:00
Darko Poljak
80c3dd7572 Ignore directory entries that begin with dot('.'). 2017-07-06 13:30:57 +02:00
Darko Poljak
9c914308f6 Fix ssh connection multiplexing race condition #542 
Increase ControlPersist to 2h.
After host run run ssh mux master exit command.
If custom remote exec/copy is specified then do nothing.
 2017-07-06 12:43:17 +02:00
Steven Armstrong
9fe2420547 also log start of config run 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2017-07-05 16:40:02 +02:00
Steven Armstrong
a1d73f7281 log changing object as Processing instead of Updating 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2017-07-04 23:49:43 +02:00
Steven Armstrong
f6e1174adb start moving info log messages to verbose 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2017-07-04 23:49:43 +02:00
Darko Poljak
cef1d215b2 Finally remove deprecated -d/--debug option. 2017-07-04 23:49:43 +02:00
Darko Poljak
015861e63b pep8 2017-07-04 23:49:43 +02:00
Darko Poljak
a37d286d67 Suppress subprocess script output in quiet mode. 2017-07-04 23:49:43 +02:00
Darko Poljak
a722f3c634 3rd iteration of logging cleanup. 2017-07-04 23:49:43 +02:00
Darko Poljak
127c05a882 2nd iteration of logging cleanup. 2017-07-04 23:49:43 +02:00
Darko Poljak
248656b81f First iteration of logging cleanup. 2017-07-04 23:49:43 +02:00
Darko Poljak
c63ab44c9c Define better warning facility. 2017-07-04 23:49:43 +02:00
Steven Armstrong
01ca5910ec increase ControlPersist to 30 to workaround #542 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2017-07-04 23:49:27 +02:00
Ander Punnar
6a6716035b one space too much 2017-07-04 19:25:08 +03:00
Ander Punnar
0e8302c204 if no --source, then create only if there's no file 2017-07-04 19:23:51 +03:00
Ander Punnar
49f9760eac +x 2017-07-03 15:18:27 +03:00
Ander Punnar
df437851f0 add -e 2017-07-02 12:19:40 +03:00
Ander Punnar
e4d9f78349 grep fixed string 2017-07-02 12:17:07 +03:00
Ander Punnar
c052e507eb shellcheck __apt_mark 2017-07-02 12:17:07 +03:00
Darko Poljak
138705e3dc Code improvements. 2017-07-02 00:32:43 +02:00
Darko Poljak
2a9bd77550 Merge custom cache path pattern from beta branch. 2017-07-01 23:59:51 +02:00
Darko Poljak
b7873abf07 Improve english based on Mesar Hameed's contribution. 2017-07-01 09:28:41 +02:00
Darko Poljak
9aa4465718 If script is executable then execute it, if not then assume it is a shell script. 2017-06-28 13:57:48 +02:00
Darko Poljak
62378dc8b9 Change shebang to #!/bin/sh -e 2017-06-28 13:19:32 +02:00
Darko Poljak
fc97381c6e Add missing shebang. 2017-06-28 12:54:10 +02:00
Darko Poljak
9312bcb6b0 chmod +x *manifest *gencode-* 2017-06-28 12:52:10 +02:00
Darko Poljak
f53615f583 Merge pull request #534 from asteven/feature/remote-out-dir 
need a way to set remote.base_path from the command line
 2017-06-27 17:56:56 +02:00
Steven Armstrong
9cee230ef5 alphabetical order ftw 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2017-06-27 17:47:30 +02:00
Steven Armstrong
93ccf925cd need a way to set remote.base_path from the command line 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2017-06-27 10:36:26 +02:00
Steven Armstrong
574f36f593 fix order of arguments 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2017-06-27 10:33:34 +02:00
Steven Armstrong
b8fcd30a37 support for bind mounts 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2017-06-27 10:33:34 +02:00
Steven Armstrong
c740c96890 set log level for cdist config based on env vars 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2017-06-27 10:33:34 +02:00
Steven Armstrong
1627b58cfc for bind mount also have to prefix device 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2017-06-27 10:33:34 +02:00
Steven Armstrong
e74d2be2d4 add support for bind mounting 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2017-06-27 10:33:34 +02:00
Steven Armstrong
efd9351500 document new parameters: device, minor 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2017-06-27 10:33:34 +02:00
Steven Armstrong
86a61bbcff need to pass a known suffix from outside 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2017-06-27 10:33:34 +02:00
Steven Armstrong
058e4d757b disabel debug log 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2017-06-27 10:33:34 +02:00
Steven Armstrong
a495a20d95 uefi support 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2017-06-27 10:33:34 +02:00
Steven Armstrong
d34843347a add __install_directory type 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2017-06-27 10:33:34 +02:00
Steven Armstrong
f9d371c6e3 use sysrq to reboot 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2017-06-27 10:33:34 +02:00
Steven Armstrong
42e197a5ba use the force when creating swap 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2017-06-27 10:33:34 +02:00
Steven Armstrong
9ee0de7c8b make uefi boot work 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2017-06-27 10:32:25 +02:00
Steven Armstrong
2ce00f3357 fix syntax error 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2017-06-27 10:27:40 +02:00
Steven Armstrong
8305477e01 fix typo 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2017-06-27 10:27:40 +02:00
Steven Armstrong
ce82e32c59 handle resolv.conf 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2017-06-27 10:27:40 +02:00
Steven Armstrong
4547d2efa1 properly escape single quotes 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2017-06-27 10:27:40 +02:00
Steven Armstrong
aea9747918 mount/umounting a chroot should not mess with resolv.conf at all 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2017-06-27 10:27:40 +02:00
Steven Armstrong
73cad9dee2 backcompat 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2017-06-27 10:27:40 +02:00
Steven Armstrong
1d42e4afcb bind mount /etc/resolv.conf instead of overwriting/removing 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2017-06-27 10:27:40 +02:00
Steven Armstrong
c6e4888c84 support for centos7 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2017-06-27 10:27:40 +02:00
Steven Armstrong
fd6258c90e unsure apt index is up2date 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2017-06-27 10:27:40 +02:00
Steven Armstrong
d05f11b0b8 deal with that stinkin cdist marker thinggy 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2017-06-27 10:27:40 +02:00
Steven Armstrong
9ad203c744 deal with that stinkin cdist marker thinggy 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2017-06-27 10:27:40 +02:00
Steven Armstrong
bb62787c7c deal with that stinkin cdist marker thinggy 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2017-06-27 10:27:40 +02:00
Steven Armstrong
f97e6c42c7 no point generating grub.conf at this time, there is no kernel installed yet 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2017-06-27 10:27:40 +02:00
Steven Armstrong
5417471dff add support for centos 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2017-06-27 10:27:40 +02:00
Steven Armstrong
2bd48f1c8d make nuking mdadm/lvm actually work 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2017-06-27 10:27:40 +02:00
Steven Armstrong
49dfcf4885 first remove lvm, then mdadm 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2017-06-27 10:27:40 +02:00
Steven Armstrong
c1141453fe fix quoting 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2017-06-27 10:27:40 +02:00
Darko Poljak
00a7f4af93 Separate functions for target host name and fqdn. 2017-06-23 20:03:28 +02:00
Darko Poljak
ad51d4e0f6 Merge pull request #532 from ungleich/prometheus-fixes 
fix missing dependencies in __prometheus_*, __go_get
 2017-06-16 10:04:58 +02:00
Nico Schottelius
e7fa238b2a Fix mkfs.vfat support (no -q) 2017-06-16 05:30:40 +02:00
Kamila Souckova
5d148a58d2 fix missing dependencies in __prometheus_*, __go_get 2017-06-15 11:13:39 +02:00
Darko Poljak
e32f2110ab Document object prepare and object run parallelization. 2017-06-13 22:54:40 +02:00
Darko Poljak
e774fc2b2a Merge pull request #507 from darko-poljak/the-good-the-bad-and-the-ugly 
The good the bad and the ugly - object prepare/run parallelization
 2017-06-13 22:45:09 +02:00
Darko Poljak
9aeea937c4 Fix spelling. 2017-06-13 18:04:41 +02:00
Darko Poljak
e375bd464d Merge remote-tracking branch 'ungleich/master' into the-good-the-bad-and-the-ugly 2017-06-12 13:15:00 +02:00
Darko Poljak
b821391f7a Merge pull request #530 from ungleich/grafana_dashboard 
new type: __grafana_dashboard
 2017-06-11 13:59:17 +02:00
Kamila Souckova
4c7327e814 consider de(bi|vu)an version 2017-06-09 18:40:47 +02:00
Nico Schottelius
3a7013d7a1 Merge branch 'master' of github.com:telmich/cdist 2017-06-03 18:16:25 +02:00
Nico Schottelius
91ff80fa6a Add devuan support for __start_on_boot 2017-06-03 18:15:44 +02:00
Kamila Souckova
ba933f1470 Merge branch 'master' into grafana_dashboard 2017-06-02 22:32:08 +02:00
Kamila Souckova
f87cce28d1 new type: __grafana_dashboard 2017-06-02 15:28:52 +02:00
Kamila Souckova
2272539c16 is it Christmas today? So many new awesome types! 2017-06-01 23:52:23 +02:00
Darko Poljak
3a25fc74b9 Merge pull request #525 from ungleich/daemontools 
new type: __daemontools_service
 2017-06-01 23:06:12 +02:00
Kamila Souckova
42bc5e28b9 WHY can't I write a man page? 2017-06-01 23:01:03 +02:00
Kamila Souckova
c16277bb8f manpage dæmons won't stop 2017-06-01 22:55:58 +02:00
Kamila Souckova
5ac324cd91 sacrifice to the evil manpage demons 2017-06-01 22:26:18 +02:00
Kamila Souckova
d30103e9d2 __daemontools*: add/improve; + add man pages 2017-06-01 17:43:43 +02:00
Kamila Souckova
06e1ddcf47 __consul_agent: mention http-check in man page 2017-05-31 18:57:21 +02:00
Kamila Souckova
5ec8ac90d9 consul: add http check; add new version 2017-05-31 18:21:24 +02:00
Darko Poljak
29bebc4af4 Shorten ssh control path. 
On macos the path is too long due to long default TMP dir.
 2017-05-31 09:55:33 +02:00
Kamila Souckova
cf0ab2a5bd new type: __daemontools_service 2017-05-29 16:23:24 +02:00
Nico Schottelius
fc9d7af18c Add Devuan support for __sysctl 2017-05-16 12:09:38 +02:00
Kamila Součková
abd5f11b98 man.rst: fix underline 2017-05-05 15:29:48 +02:00
Kamila Souckova
8d4fd9e7d8 add __go_get, __golang_from_vendor manpages 2017-05-04 17:46:37 +02:00
Kamila Souckova
21a29ab5aa add __go_get, __golang_from_vendor 2017-05-04 17:46:20 +02:00
Dominique Roux
d3aafc4523 changed docker-compose version to 1.12.0 2017-04-19 11:51:04 +02:00
Kamila Souckova
46bbafa509 __start_on_boot: add support for devuan 2017-03-22 12:33:16 +01:00
Darko Poljak
517493ea92 reStructuredText fixes. 2017-03-08 19:36:34 +01:00
Darko Poljak
57032af356 Fix code-block argument missing. 2017-03-08 19:16:23 +01:00
Darko Poljak
da4118dcf3 pep8 2017-03-08 19:07:02 +01:00
Dmitry Bogatov
6d277ef1f1 New type: __dot_file 2017-03-07 21:50:59 +01:00
Steven Armstrong
448126f498 no need to log stdout at log level info 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2017-02-17 12:31:22 +01:00
Steven Armstrong
d5b1246791 change ControlPersist from 125 to 10 seconds 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2017-02-16 22:43:27 +01:00
Steven Armstrong
9d9fc98556 Merge remote-tracking branch 'ungleich/master' 2017-02-16 22:42:32 +01:00
Dmitry Bogatov
c4c2d45e59 New type: __hosts 2017-02-02 19:47:11 +01:00
Darko Poljak
574688c6e1 Rm due to new patch from Dmitry. 2017-02-02 19:47:02 +01:00
Darko Poljak
d3b3fef63b Merge remote-tracking branch 'ungleich/master' into cdist-type__hosts 2017-02-02 19:45:48 +01:00
Steven Armstrong
444790aed2 explicitly create cache dir 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2017-02-01 23:10:26 +01:00
Darko Poljak
b03bed2425 Better describe -v option. 2017-01-28 13:49:19 +01:00
Darko Poljak
2087f7a28a Un-suppress manifest stdout. 2017-01-20 15:22:25 +01:00
Darko Poljak
8e5e8c040d Merge pull request #482 from andres-erbsen/user-groups-freebsd 
__user_groups: refactor, support FreeBSD
 2017-01-14 10:53:01 +01:00
Darko Poljak
86678b5beb Cleanup __user_groups oldusermod explorer. 2017-01-11 21:32:52 +01:00
Daniel Heule
0ad767fa29 fix filter for new cron on sles12 sp2 2017-01-11 16:44:17 +01:00
Dominique Roux
4742913244 fixed type 2017-01-02 11:48:07 +01:00
Dominique Roux
07906451b2 updated man.rst 2016-12-31 11:06:06 +01:00
Dominique Roux
0dbe9e1428 updated man.rst 2016-12-31 11:03:28 +01:00
Dominique Roux
54a58abcaa Changed man.rst of __docker and __docker_compose 
- Added state parameter for both types in the man.rst
- Changed --state absent behavior of __docker_compose
-- only remove docker-compose binary not whole docker
 2016-12-29 14:47:29 +01:00
Dominique Roux
95b92627aa Added --state absent functionality to docker types 
Changed types:
__docker
__docker_compose
 2016-12-29 14:36:46 +01:00
Dominique Roux
6fa7bfbfb5 Better bugfix: 
- Download the docker-compose binary first to /tmp then move it to
its target location
 2016-12-27 13:20:57 +01:00
Dominique Roux
7a5244bf7c Bugfixed __docker_compose: 
If docker-compose is already running, curl won't override the binary
I add an if the file does not exist before download
 2016-12-21 23:03:24 +01:00
Darko Poljak
2b45405898 Update docs for types that used man.rst as symbolic links. 2016-12-16 08:19:41 +01:00
Darko Poljak
0462b4afc9 Merge pull request #348 from dheule/bugfix_type__cron 
bugfix of raw_command
 2016-12-14 09:04:54 +01:00
Darko Poljak
d07f262eb6 Merge pull request #508 from greendeath/feature/__docker_compose 
Created __docker_compose type for cdist
 2016-12-13 11:38:01 +01:00
Dominique Roux
d6f972057e updated documentation 2016-12-13 08:16:24 +01:00
Dominique Roux
f180cbcb09 documented --version parameter 2016-12-13 08:09:14 +01:00
Dominique Roux
db50e2e9e2 Added parameter --version to define the docker-compose version 2016-12-12 19:43:15 +01:00
Dominique Roux
afd0d8c8c8 Added / Changed license to GPLv3+ 2016-12-12 09:09:48 +01:00
Dominique Roux
7abb96b48d Created __docker_compose type for cdist 
Features:
- Install __docker_compose
 2016-12-11 22:12:44 +01:00
Darko Poljak
8d2d538660 Fix typo. 2016-12-11 21:17:22 +01:00
Darko Poljak
e5a6599ccb Create mp_pool_run helper function for running in parallel. 2016-12-08 21:48:59 +01:00
Darko Poljak
ede5282d93 Merge remote-tracking branch 'ungleich/master' into the-good-the-bad-and-the-ugly 2016-12-08 20:06:59 +01:00
Darko Poljak
b0911ab87d Improve __apt_mark (Ander Punnar from beta) 2016-12-08 20:04:17 +01:00
Darko Poljak
8776a2ee06 concurrent.futures -> multiprocessing 2016-12-08 17:36:57 +01:00
Darko Poljak
e6b9fc90ba Add log messages. 2016-12-08 14:11:30 +01:00
Darko Poljak
ca3a8ddf67 no clear() in python < 3.3; if only one then do it sequentially 2016-12-08 00:47:07 +01:00
Darko Poljak
e79519afce Merge remote-tracking branch 'ungleich/master' into the-good-the-bad-and-the-ugly 2016-12-08 00:42:17 +01:00
Darko Poljak
d17c517a0c enable-beta -> beta 2016-12-07 22:43:53 +01:00
Darko Poljak
1952d43073 Initial try for parallelization. 2016-12-07 19:06:51 +01:00
Darko Poljak
258a6c7f56 Merge branch 'the-good-the-bad-and-the-ugly-gunfight' into the-good-the-bad-and-the-ugly 2016-12-07 18:57:58 +01:00
Darko Poljak
bc5f6c8923 Merge pull request #504 from darko-poljak/the-good-the-bad-and-the-ugly 
The Good, the Bad and the Ugly
 2016-12-07 18:45:56 +01:00
Darko Poljak
341de216a6 Fix missing vars. 2016-12-07 18:39:43 +01:00
Darko Poljak
3e763e9e6c list -> set for beta commands and args 2016-12-07 18:36:19 +01:00
Darko Poljak
6c1b215db8 Begin parallelizing object prepare and run. 2016-12-06 14:27:17 +01:00
Darko Poljak
eb56c6ef59 experimentel -> experimental 2016-12-05 08:53:48 +01:00
Darko Poljak
b0c9e097f9 Merge pull request #354 from tpo/__package_dpkg2 
Please merge __package_dpkg type
 2016-12-05 08:47:35 +01:00
Dominique Roux
1ee6c2e7b1 added line after 33, changed experimentel to experimental 2016-12-05 07:57:30 +01:00
Darko Poljak
609977b7ff ugly->bad 2016-12-04 20:27:42 +01:00
Darko Poljak
d0f5d2c459 ugly -> bad 2016-12-03 18:24:37 +01:00
Dominique Roux
fc18e0f99c migrated man.text -> man.rst 2016-12-03 18:14:58 +01:00
Darko Poljak
e6fc74c081 ugly -> bad 2016-12-03 18:12:38 +01:00
Darko Poljak
8c53ce78f5 Started the good, the bad and the ugly - code cleanup. 2016-12-03 10:46:49 +01:00
Dominique Roux
3054bae8c2 Added __docker type from asteven, implemented debian support 2016-12-02 14:34:01 +01:00
Tomáš Pospíšek
4370efdbb8 Update man.rst 
fix title as requested here https://github.com/ungleich/cdist/pull/354#issuecomment-264117501
 2016-12-02 09:39:53 +01:00
Darko Poljak
f1cd824a7d Merge pull request #360 from tpo/__postgres_extension 
postgres extension
 2016-12-01 10:01:55 +01:00
Tomas Pospisek
6bcfdec154 remove reference to cdist_type, use GPL3+ 
as requested by darko-poljak here:
https://github.com/ungleich/cdist/pull/360#issuecomment-264110087
 2016-12-01 09:54:27 +01:00
Tomas Pospisek
267d8239c1 remove reference to cdist_type, use GPL3+ 
as requested by darko-poljak here:
https://github.com/ungleich/cdist/pull/360#issuecomment-264110087
 2016-12-01 09:50:05 +01:00
Tomas Pospisek
60906c0228 rewrite man page in rst 
Only minimal changes needed.

This was done to satisfy darko-poljak's request here:
https://github.com/ungleich/cdist/pull/360#issuecomment-263491151
 2016-12-01 09:27:56 +01:00
Tomas Pospisek
8e3281aa7c rewrite man page in rst 
Only minimal changes needed.

This was done to satisfy darko-poljak's request here:
https://github.com/ungleich/cdist/pull/354#issuecomment-263492801
 2016-12-01 09:09:57 +01:00
Darko Poljak
ca424a34e6 Fix shell IPv6 testing (for -e). 2016-11-28 08:13:59 +01:00
Darko Poljak
e663aaee08 Merge remote-tracking branch 'ungleich/master' into support-ipv6 2016-11-28 08:00:46 +01:00
Darko Poljak
1cc01bf598 Merge pull request #496 from AnotherKamila/master 
__user type: fix for FreeBSD
 2016-11-25 20:31:26 +01:00
Carlos Ortigoza Dempster
39f69ddedf Adding consul 0.7.1 files to __consul type 2016-11-25 14:19:01 -04:00
Carlos Ortigoza Dempster
6bc2503996 Adding consul 0.7.0 files 2016-11-25 14:15:00 -04:00
Kamila Souckova
c4996396c6 __user type: fix for FreeBSD 2016-11-22 18:21:03 +01:00
Ander Punnar
35975582f0 suppress output 2016-11-07 16:55:51 +02:00
Ander Punnar
b3cf70ae42 remove auto and manual states 2016-11-07 15:51:50 +02:00
Ander Punnar
45e45016a7 retrieve the mark before with an explorer 2016-11-07 15:45:54 +02:00
Ander Punnar
6f69cd6a11 fix man 2016-11-07 13:36:27 +02:00
Ander Punnar
6fd9dac145 add __apt_mark 2016-11-07 11:19:48 +02:00
Darko Poljak
6ce6c7830b Better test for IPv6 address. 2016-11-05 16:38:49 +01:00
Ander Punnar
4ef057c65d add docs 2016-11-04 10:14:42 +02:00
Ander Punnar
39c3ac43ec __package_upgrade_all shouldn't dist-upgrade by default. also add clean. 2016-11-04 09:53:00 +02:00
Darko Poljak
9268062de5 Fix target_host vars in Code. 2016-11-03 13:26:50 +01:00
Darko Poljak
4ddf6557e3 IPv6 fix in gencode scripts. 2016-11-02 13:55:25 +01:00
Darko Poljak
ca9dd7338a Support IPv6 in python code. 2016-11-02 13:35:48 +01:00
Darko Poljak
c293a9b2ce Add missing param. 2016-11-01 08:11:37 +01:00
Darko Poljak
93c80c9f4d Remove outdated __cdist_preos. 2016-10-15 19:04:14 +02:00
Darko Poljak
a05ae761a4 man.text -> man.rst 2016-10-14 21:16:28 +02:00
Darko Poljak
750f90db4c Make install command beta. 2016-10-13 21:35:41 +02:00
Darko Poljak
acf94abe26 pep8 2016-10-13 21:24:29 +02:00
Darko Poljak
cca6693b2e Merge install feature from 4.0-pre-not-stable. 2016-10-13 21:16:59 +02:00
Darko Poljak
aceb4ac13d Update telmich -> ungleich and mailing list refs. 2016-10-12 20:15:07 +02:00
Darko Poljak
ce4803a201 telmich -> ungleich 2016-10-12 16:56:29 +02:00
Darko Poljak
8b7cdd510a Merge pull request #477 from smwltr/git_repo_url 
change git.schottelius.org in docs because does not exist
 2016-10-12 16:51:11 +02:00
Darko Poljak
9cc585c17d Merge pull request #481 from andres-erbsen/package_pkg_openbsd-version 
__package_pkg_openbsd: support --version
 2016-10-09 14:25:40 +02:00
Darko Poljak
e349d10ed7 Merge pull request #485 from dheule/suse_os_version_explorer 
use /etc/os-release instead of /etc/SuSE-release
 2016-10-09 14:20:04 +02:00
Darko Poljak
d49af95d3c Add warning message for faulty dependencies case. 2016-10-08 11:40:32 +02:00
Steven Armstrong
4c1c1e990d Merge remote-tracking branch 'ungleich/master' 2016-10-05 23:22:44 +02:00
Steven Armstrong
8e967424de consul syslog config option should be called enable_syslog instead 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2016-10-05 23:22:36 +02:00
Daniel Heule
bee5593570 use /etc/os-release instead of /etc/SuSE-release 2016-10-04 11:29:48 +02:00
Darko Poljak
74652cec13 Write more informative warning messages. 2016-09-21 19:22:24 +02:00
Darko Poljak
f7381e261a Add new type __firewalld_start. 2016-09-17 09:48:15 +02:00
Andres Erbsen
493c8d61f4 __user_groups: refactor, support FreeBSD 2016-09-11 22:28:51 -04:00
Nico Schottelius
7329b528f6 Merge pull request #479 from andres-erbsen/hostname-openbsd 
__hostname: openbsd support
 2016-09-03 20:37:41 +02:00
Nico Schottelius
cd7852695e Merge pull request #480 from andres-erbsen/package-openbsd 
__package: call __package_pkg_openbsd on openbsd
 2016-09-03 20:36:13 +02:00
Dmitry Bogatov
1875bce52e Add support for guixsd into os explorer 2016-09-02 21:33:11 +02:00
Andres Erbsen
db32d0de3a __package_pkg_openbsd: support --version 2016-09-02 12:17:25 -04:00
Andres Erbsen
1a4bec21bf __package: call __package_pkg_openbsd on openbsd 2016-09-02 12:16:17 -04:00
Andres Erbsen
3b91443f81 __hostname: openbsd support 2016-09-02 12:11:10 -04:00
Darko Poljak
72001b237e Remove relict comment. 2016-08-24 13:46:47 +02:00
smwalter
232a909851 change documentation from git://git.schottelius.org/cdist to git://github.com/ungleich/cdist because git.schottelius.org does not exist. 2016-08-24 17:34:18 +09:00
Dominique Roux
428c06c8d3 Hotfix: Changed sources of all consul version + cksum files 2016-08-23 16:40:13 +02:00
Dominique Roux
cd8373fe50 Hotfix: Changed source of consul 0.5.1 2016-08-23 15:55:07 +02:00
Darko Poljak
2d72c08e9b Fix spelling. 2016-08-22 09:24:48 +02:00
Darko Poljak
b5a79fbc8f Fix spelling (Dmitry Bogatov patch). 2016-08-22 08:11:49 +02:00
Nico Schottelius
b08ea652a3 Merge pull request #475 from darko-poljak/target_host_cache 
Add target_host file with original host to cache since cache dir is hash
 2016-08-21 22:14:34 +02:00
Darko Poljak
b5262c850e Exit cleanly in case of non UTF-8 file. 2016-08-21 21:48:21 +02:00
Darko Poljak
b83e6993c1 Make comment better. 2016-08-21 17:10:24 +02:00
Darko Poljak
f7ca14119a Merge remote-tracking branch 'ungleich/master' into cdist-type__hosts 2016-08-19 21:59:04 +02:00
Darko Poljak
7f1e41f769 Move hostfile line processing to new method. 2016-08-19 21:56:24 +02:00
Darko Poljak
7aa4b2d40a Support comments in hostfile, skip empty lines. 2016-08-19 13:37:57 +02:00
Darko Poljak
dd1b95f596 Add target_host file with original host to cache since cache dir is hash. 2016-08-19 12:27:35 +02:00
Darko Poljak
f40e6659f7 Make man pages for new types to be by convention. Fix spellings. 2016-08-18 10:41:58 +02:00
Darko Poljak
680806ce76 Fix getting host_name and host_fqdn. 2016-08-17 20:46:56 +02:00
Darko Poljak
2fb551131e Fix error when non-existing host is used. 2016-08-17 20:27:51 +02:00
Darko Poljak
7cc7c18e77 Add hint for command line flag for enable-beta. 2016-08-15 16:37:11 +02:00
Darko Poljak
fdf6a6570c Check for beta in scripts/cdist. 2016-08-15 16:01:39 +02:00
Darko Poljak
1c07b63f1d Add -b/--enable-beta option for enabling beta functionalities. 2016-08-15 14:20:35 +02:00
Darko Poljak
f858191976 Merge remote-tracking branch 'ungleich/master' into parallel-global-explorers-execution 2016-08-14 22:27:39 +02:00
Darko Poljak
15d6524efd Fix cdist shell. 2016-08-14 22:09:51 +02:00
Darko Poljak
d96be90f26 Fix self.target_host 2016-08-14 22:09:36 +02:00
Darko Poljak
f4c02a9bca Merge remote-tracking branch 'ungleich/master' into new-target-env-vars 2016-08-14 21:51:03 +02:00
Darko Poljak
1274b87df9 Merge remote-tracking branch 'ungleich/master' into new-target-env-vars 2016-08-14 21:50:19 +02:00
Darko Poljak
38b94d019b Merge remote-tracking branch 'ungleich/master' into new-keyboard-type 2016-08-14 21:44:52 +02:00
Darko Poljak
51ffc0f037 log.info -> log.debug for debug messages 2016-08-14 21:30:09 +02:00
Darko Poljak
c95e75ac15 Merge pull request #474 from darko-poljak/gplv3plus_licensing 
GPLv3+ re-licensing.
 2016-08-13 10:30:23 +02:00
Darko Poljak
33b6545a16 GPLv3+ relicensing. 2016-08-12 21:58:44 +02:00
Darko Poljak
5f436f21b8 Transfer and run global explorers in parallel. 2016-08-12 21:14:56 +02:00
Darko Poljak
a4c49201c0 Add jobs option for parallel execution, global explorers first. 2016-08-11 23:54:31 +02:00
Darko Poljak
8d6e0760dc Fix errors in remote.py unit test. 2016-08-11 21:55:20 +02:00
Darko Poljak
45298b810c Add more comments. 2016-08-11 00:04:37 +02:00
Darko Poljak
dbcc94ab65 Add derived env vars for target hostname and fqdn. 2016-08-10 23:56:56 +02:00
Darko Poljak
d82bd52b04 Fix no newline at the end of file. 2016-08-10 18:37:40 +02:00
Darko Poljak
b400ae9c94 Separate __keyboard type. 2016-08-10 18:34:49 +02:00
Darko Poljak
8918186d53 Merge remote-tracking branch 'ungleich/master' into keyboard-locale_system-types 2016-08-10 18:29:57 +02:00
Darko Poljak
df566f4ff8 GPLv3+ relicensing. 2016-08-10 18:15:54 +02:00
Dmitry Bogatov
ffc3451c67 GPLv3+ relicensing: Ricardo Catalinas 2016-08-10 17:40:04 +02:00
Steven Armstrong
e48486636e Merge pull request #467 from dheule/feature__filesystem 
new type __filesystem, first version

Awesome! Thanks!
 2016-08-02 16:14:09 +02:00
Daniel Heule
8747474fd5 device now defaults to object_id 2016-08-02 11:06:17 +02:00
Daniel Heule
13b2443d6b last cleanups 2016-08-02 10:07:27 +02:00
Nico Schottelius
6479ffc499 Really fix the GPLv3+ text 2016-08-02 09:25:11 +02:00
Nico Schottelius
a1ff755576 Add type __sysctl 
- Migrated asciidoc to rst
- Changed license to GPLv3+
 2016-08-02 09:22:21 +02:00
Nico Schottelius
94119003a9 Reference __locale_system in __locale type 2016-08-02 01:02:47 +02:00
Nico Schottelius
06d0eabb5f Add new type: __locale_system 
Merge the best of the proposals from Steven and Carlos
 2016-08-02 00:58:07 +02:00
Daniel Heule
36c20230b8 optimize the usage of explorers for __filesystem 2016-07-29 15:27:13 +02:00
Daniel Heule
2ed762cd72 new type __filesystem, first version 2016-07-28 14:48:32 +02:00
Darko Poljak
13a5d4963b Merge remote-tracking branch 'ungleich/master' into cdist-type__hosts 2016-07-26 12:25:45 +02:00
Darko Poljak
cef47133bc Merge remote-tracking branch 'ungleich/master' into keyboard-locale_system-types 2016-07-26 12:22:37 +02:00
Darko Poljak
1959e9cdd8 Fix error message. 2016-07-23 16:29:51 +02:00
Darko Poljak
6f28fc2db2 Fix ssh mux socket file error. 
ssh ControlPath socket file needs to be unique for each host.
To avoid using ssh ControlPath option placeholders move socket file
to host's temp directory. Since each host has unique temp
directory then, although file name for socket file is fixed, its path
is unique.
 2016-07-23 16:13:59 +02:00
Darko Poljak
dacb5720c5 Create hash func for string args to be used cdist wide. 2016-07-23 15:11:14 +02:00
Dmitry Bogatov
88ec06d06f new type: __hosts 
This type adds or removes entries from /etc/hosts,
ensuring that same hostname can never resolve to
several different ip addresses.

Signed-off-by: Dmitry Bogatov <KAction@gnu.org>
 2016-07-22 09:52:03 +02:00
Darko Poljak
4c106752f1 Add new types, __keyboard and __locale_system, contributed by Carlos Ortigoza. 2016-07-22 08:12:18 +02:00
Darko Poljak
cab0381c2a Update license to GPLv3+ for my types and cdist man pages. 2016-07-20 07:55:48 +02:00
Darko Poljak
0d82c37928 Fix spelling errors (Dmitry Bogatov). 2016-07-18 19:43:26 +02:00
Darko Poljak
87d6a9c336 Fix line begining with . is a macro for man page. 2016-07-18 19:43:05 +02:00
Darko Poljak
2eab9b9598 Rm stderr debug output, stderr is not captured. 2016-07-15 08:22:05 +02:00
Darko Poljak
7c55364cc2 Fix absent state for verbose in ccollect_source type. 2016-07-15 08:20:07 +02:00
Darko Poljak
1501590f88 Fix missing stderr in case of script error in python >= 3.5. 2016-07-13 12:21:41 +02:00
Darko Poljak
e2bb629535 Fix shell command not working after new error reporting. 2016-07-12 20:15:08 +02:00
Darko Poljak
54e845da6f pep8 2016-07-11 12:40:50 +02:00
Darko Poljak
0051240c7c log.info target_host -> hash 2016-07-11 08:50:39 +02:00
Darko Poljak
120b11e96b Fix log init error. 2016-07-10 21:43:09 +02:00
Darko Poljak
3b91ace4ea Additionaly improve hostdir fix. 2016-07-10 21:28:30 +02:00
Darko Poljak
92278ef5b0 Merge pull request #460 from asteven/fix-hostdir 
Fix hostdir
 2016-07-10 21:20:31 +02:00
Nico Schottelius
9b2800b614 Merge pull request #453 from darko-poljak/improve-docs-build 
Improve docs build
 2016-07-07 21:49:38 +09:00
Steven Armstrong
a3d15caaa1 Merge remote-tracking branch 'ungleich/master' into fix-hostdir 2016-07-07 14:41:09 +02:00
Steven Armstrong
13d315d718 do not assume target_host is anything that can be used as a directory name 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2016-07-07 14:38:36 +02:00
Stu Zhao
a6643f0d7f Explore machine type for virtualbox guest 2016-07-06 18:39:27 -04:00
Markus Koller
16cb3a5ff1
Update PXE setup for Debian 8 2016-07-06 14:57:59 +02:00
Markus Koller
e79610f23c
Don't try to use hostnamectl when systemd isn't running 2016-07-06 11:22:15 +02:00
Markus Koller
0e114c37ac
Always use current stable release for preos 2016-07-06 10:47:28 +02:00
Markus Koller
78d7d91e42
Install lsb-release in preos 
Several types use the lsb_release command to determine the distribution,
if this command is missing unexpected things will happen.
 2016-07-06 10:30:13 +02:00
Nico Schottelius
acf3b3575a Merge pull request #456 from darko-poljak/pep8 
Pep8
 2016-07-06 17:18:01 +09:00
Markus Koller
348867ff6a
Correctly set hostname in preos 2016-07-06 10:15:34 +02:00
Darko Poljak
22abe43e85 Make better msg for exec/util unsupported stderr output. 2016-07-06 08:25:31 +02:00
Darko Poljak
64efa04599 pep8 2016-07-05 20:44:24 +02:00
Darko Poljak
92d96c14b9 Undo reqs conflict detection, continue appending new reqs. 2016-07-04 10:11:11 +02:00
Darko Poljak
72345f5516 Make union of existing and new requirements instead of conflict error. 2016-06-30 20:37:08 +02:00
Darko Poljak
0dfb4aee73 sphinx> ':manpage:' -> ':strong:' 2016-06-30 15:13:33 +02:00
Darko Poljak
f98208f250 Make man pages SEE ALSO by convention. Improve docs building. 2016-06-30 12:09:07 +02:00
Nico Schottelius
55cd9963db Merge pull request #447 from sleemburg/master 
Add openvz/lxc discovery
 2016-06-30 10:51:18 +09:00
Darko Poljak
51c94e9e82 Restructure and fix and improve docs and manpages. 2016-06-29 07:48:34 +02:00
Darko Poljak
f6ea90c3a5 Update remote.py according to new exec_util api. 2016-06-24 11:18:24 +02:00
Darko Poljak
b89077f9a5 Better sphinx manpage ext. Add custom dotman Makefile target for custom .cdist directory. 2016-06-23 16:08:59 +02:00
Darko Poljak
d48b65ed53 Fix process error handling in local. 2016-06-23 10:56:37 +02:00
Steven Armstrong
ce26deb706 add support for new check types 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2016-06-22 23:58:14 +02:00
Steven Armstrong
6944998a19 add new --wait parameter for consul-template 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2016-06-22 23:57:25 +02:00
Steven Armstrong
75b32328b6 use latest consul-template version by default 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2016-06-22 23:56:57 +02:00
Steven Armstrong
96b49f4e99 consul-template is no longer distributed as a tar. it is now a zip archive 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2016-06-22 23:56:27 +02:00
Steven Armstrong
1ed0d6bbe3 source for old consul-template versions have changed 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2016-06-22 23:55:20 +02:00
Steven Armstrong
4a7823d9b5 new consul-template version 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2016-06-22 23:54:58 +02:00
Stephan Leemburg
9300eda3c6 Add scientific 2016-06-22 13:32:51 +02:00
Stephan Leemburg
98160624a0 Add openvz/lxc discovery 2016-06-22 13:21:10 +02:00
Darko Poljak
a12b74b2f5 Resolve conflict. 2016-06-22 12:56:53 +02:00
Darko Poljak
e66bedb43f Update changelog. 2016-06-22 12:50:35 +02:00
Darko Poljak
cfe422a5ab Merge branch 'master' into feature_files_export 2016-06-22 12:26:10 +02:00
Darko Poljak
9a154725b5 Merge branch 'master' into fix-dependency-conflict 2016-06-22 12:22:43 +02:00
Darko Poljak
194f5af7b2 Merge branch 'master' into better-remote-err-reporting 2016-06-22 12:14:47 +02:00
Darko Poljak
d7583e7a1a Add __files to shell env. 2016-06-12 17:55:29 +02:00
Darko Poljak
0049b62cca Add files conf subdirectory for static files. 2016-06-11 12:02:13 +02:00
Darko Poljak
e3636e6ffc Merge branch 'master' into feature_files_export 2016-06-10 21:04:43 +02:00
Darko Poljak
bd9008794c Conflicting requirements bugfix. 2016-06-10 07:50:07 +02:00
Darko Poljak
fd8e10e12a Improve error reporting for local and remote run. 2016-06-06 22:11:55 +02:00
Jake Guffey
bcd5e9827b Fix man pages 
Migrate (re-migrate) from text -> rst and update docs to reflect new developments
 2016-06-05 22:16:42 -04:00
Jake Guffey
bcd4e5f29b Removed debugging from __jail_freebsd10/gencode-local 2016-06-05 21:57:56 -04:00
Jake Guffey
2f68e21a96 Add support for FreeBSD 10.x jails 
Separate __jail type into distinct __jail_freebsd9 and __jail_freebsd10 types
 2016-06-05 21:57:21 -04:00
Steven Armstrong
dbcdc8a8ba use pool.sks-keyservers.net instead of subkeys.pgp.net 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2016-05-25 14:40:55 +02:00
Darko Poljak
54834e277d Merge branch 'master' into new-docs-format 2016-05-25 07:39:53 +02:00
Darko Poljak
cf32b669ff Write sphinx rst docs. 2016-05-22 17:16:03 +02:00
Darko Poljak
fa5175fee5 Allow both hosts sources: command line args and file. 2016-05-22 09:45:08 +02:00
Darko Poljak
4fce4a631c Add -f option for reading hosts from file or stdin. 2016-05-22 09:22:39 +02:00
Darko Poljak
c4f782d194 Fix spelling error in __group man. 2016-05-13 22:44:54 +02:00
Darko Poljak
103e520d5a Fix suffix description for __block type. 2016-05-13 22:29:08 +02:00
Darko Poljak
8a079b3440 Fix spelling errors - Bogatov's patch. 2016-05-05 09:58:35 +02:00
Darko Poljak
cf451f0bea Merge with master. 2016-04-28 09:09:32 +02:00
Darko Poljak
e933e8cd75 Add missing name parameter. 2016-04-22 14:41:31 +02:00
Nico Schottelius
2a27eebbe4 Merge pull request #430 from darko-poljak/type_pyvenv 
Type __pyvenv
 2016-04-21 09:39:01 +02:00
Darko Poljak
360ab47be0 Fix '=' length. 2016-04-21 09:23:19 +02:00
Darko Poljak
b40034a54a Remove unnecessary global explorer. 2016-04-21 08:27:08 +02:00
Darko Poljak
b7da9d1ef5 Remove unnecessary global explorer. 2016-04-21 08:26:57 +02:00
Darko Poljak
5e0975a304 Remove unnecessary global explorer. 2016-04-21 08:26:47 +02:00
Darko Poljak
7aa197b731 Rm unnecessary details from __package_pip man. 2016-04-21 08:26:07 +02:00
Darko Poljak
66c2e16a24 __package_pip: always use su for runas parameter. 2016-04-21 08:24:47 +02:00
Darko Poljak
2ea85c773c Remove old style defaults. 2016-04-20 08:14:44 +02:00
Darko Poljak
e76d2af358 Remove old style defaults. 2016-04-20 08:13:47 +02:00
Darko Poljak
f24d264480 Updated usage comment. 2016-04-15 12:04:31 +02:00
Darko Poljak
5c33d22925 Prefer su over sudo. 2016-04-15 10:50:51 +02:00
Darko Poljak
cd78d4140a Add global explorers su, sudo and sucmd. 2016-04-15 08:37:33 +02:00
Darko Poljak
a1e86a481c Updated man. 2016-04-13 22:34:10 +02:00
Darko Poljak
d9b2f1a540 Add parameter --pyvenv. 2016-04-13 22:32:15 +02:00
Darko Poljak
4d5fa3087f Update comment info. 2016-04-13 20:14:06 +02:00
Darko Poljak
3296158a37 Remove virtualenv params not present in pyvenv. 2016-04-13 08:27:23 +02:00
Darko Poljak
85af0c1bb0 Remove virtualenv params not present in pyvenv. 2016-04-13 08:26:58 +02:00
Darko Poljak
49423e174b Use pyvenv instead of virtualenv. 2016-04-13 08:24:44 +02:00
smwltr
1882040a25 Adding suuport for OS Devuan 2016-04-12 12:18:47 +09:00
Darko Poljak
d313971e1a Create __pyvenv type and modify __package_pip accordingly. 2016-04-11 19:21:11 +02:00
Nico Schottelius
b12df5f125 Merge pull request #428 from dheule/bugfix_for_systemd 
remove a copy paste artefact which is wrong there
 2016-04-06 15:47:09 +02:00
Daniel Heule
ac171ba219 remove a copy paste artefact which is wrong there 2016-04-06 17:29:23 +02:00
Darko Poljak
e4cbb382ab PATH resolution for true/false. 2016-04-05 20:23:13 +02:00
Darko Poljak
3062421cf5 Fix bug with parallel hosts operation and specified output path. 2016-04-04 08:03:54 +02:00