Commit graph

842 commits

Author SHA1 Message Date
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
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
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
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
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
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
6bfe02094d year is 2017 2017-07-21 10:23:05 +03:00
2c56622eeb check file first 2017-07-21 10:22:54 +03:00
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
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
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
6a6716035b one space too much 2017-07-04 19:25:08 +03:00
0e8302c204 if no --source, then create only if there's no file 2017-07-04 19:23:51 +03:00
49f9760eac +x 2017-07-03 15:18:27 +03:00
df437851f0 add -e 2017-07-02 12:19:40 +03:00
e4d9f78349 grep fixed string 2017-07-02 12:17:07 +03:00
c052e507eb shellcheck __apt_mark 2017-07-02 12:17:07 +03: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
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
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
5d148a58d2 fix missing dependencies in __prometheus_*, __go_get 2017-06-15 11:13:39 +02:00
Darko Poljak
9aeea937c4 Fix spelling. 2017-06-13 18:04:41 +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
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
ba933f1470 Merge branch 'master' into grafana_dashboard 2017-06-02 22:32:08 +02:00
f87cce28d1 new type: __grafana_dashboard 2017-06-02 15:28:52 +02:00
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
42bc5e28b9 WHY can't I write a man page? 2017-06-01 23:01:03 +02:00
c16277bb8f manpage dæmons won't stop 2017-06-01 22:55:58 +02:00
5ac324cd91 sacrifice to the evil manpage demons 2017-06-01 22:26:18 +02:00
d30103e9d2 __daemontools*: add/improve; + add man pages 2017-06-01 17:43:43 +02:00
06e1ddcf47 __consul_agent: mention http-check in man page 2017-05-31 18:57:21 +02:00
5ec8ac90d9 consul: add http check; add new version 2017-05-31 18:21:24 +02:00
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
abd5f11b98 man.rst: fix underline 2017-05-05 15:29:48 +02:00
8d4fd9e7d8 add __go_get, __golang_from_vendor manpages 2017-05-04 17:46:37 +02:00
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
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
6d277ef1f1 New type: __dot_file 2017-03-07 21:50:59 +01:00
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
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