forked from ungleich-public/cdist
Compare commits
19 Commits
Author | SHA1 | Date |
---|---|---|
lubo | 3e82b0085b | |
Mark Verboom | b7394ff4c2 | |
fancsali | 61fc5e5de8 | |
marcoduif | 2b102f303a | |
Nico Schottelius | e57cf1e70a | |
Nico Schottelius | 7dd2d1025a | |
nico14571 | 513a8ae177 | |
nico14571 | 2a2f91959e | |
nico14571 | fcf76cdb2c | |
Michelle | 1450861e26 | |
Michelle | 08a6b467fa | |
Nico Schottelius | ed3da3c829 | |
Nico Schottelius | b974969f28 | |
Nico Schottelius | bdfd92dc37 | |
nico14571 | 5c85b04309 | |
Nico Schottelius | f36069754c | |
nico14571 | d4dfe95a97 | |
Mark Verboom | 62db96bb37 | |
Mark Verboom | c85184dcb4 |
|
@ -534,7 +534,8 @@ eof
|
||||||
;;
|
;;
|
||||||
|
|
||||||
version)
|
version)
|
||||||
printf "VERSION = \"%s\"\n" "$(git describe)" > cdist/version.py
|
target_version="$(git describe | sed 's/-/.dev/; s/-/+/g')"
|
||||||
|
printf "VERSION = \"%s\"\n" "${target_version}" > cdist/version.py
|
||||||
;;
|
;;
|
||||||
|
|
||||||
target-version)
|
target-version)
|
||||||
|
|
|
@ -472,9 +472,6 @@ def get_parsers():
|
||||||
parser['info'].set_defaults(func=cdist.info.Info.commandline)
|
parser['info'].set_defaults(func=cdist.info.Info.commandline)
|
||||||
|
|
||||||
# Scan = config + further
|
# Scan = config + further
|
||||||
parser['scan'] = parser['sub'].add_parser('scan', add_help=False,
|
|
||||||
parents=[parser['config']])
|
|
||||||
|
|
||||||
parser['scan'] = parser['sub'].add_parser(
|
parser['scan'] = parser['sub'].add_parser(
|
||||||
'scan', parents=[parser['loglevel'],
|
'scan', parents=[parser['loglevel'],
|
||||||
parser['beta'],
|
parser['beta'],
|
||||||
|
|
|
@ -515,7 +515,7 @@ check_vm_arch_specific() {
|
||||||
&& return 0
|
&& return 0
|
||||||
fi
|
fi
|
||||||
if has_cpuinfo \
|
if has_cpuinfo \
|
||||||
&& grep -q -i -e '^flags.*:.*\(hypervisor\|vmm\)' /proc/cpuinfo
|
&& grep -q -i -e '^flags.*:.*\(hypervisor\|vmm\)\( \|$\)' /proc/cpuinfo
|
||||||
then
|
then
|
||||||
return 0
|
return 0
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -82,6 +82,7 @@ in
|
||||||
# ceres versions don't have a number, so we decode by codename:
|
# ceres versions don't have a number, so we decode by codename:
|
||||||
case ${devuan_version}
|
case ${devuan_version}
|
||||||
in
|
in
|
||||||
|
(daedalus/ceres) echo 4.99 ;;
|
||||||
(chimaera/ceres) echo 3.99 ;;
|
(chimaera/ceres) echo 3.99 ;;
|
||||||
(beowulf/ceres) echo 2.99 ;;
|
(beowulf/ceres) echo 2.99 ;;
|
||||||
(ascii/ceres) echo 1.99 ;;
|
(ascii/ceres) echo 1.99 ;;
|
||||||
|
|
|
@ -23,7 +23,7 @@ package
|
||||||
Package name, glob or regular expression to match (multiple) packages. If not specified `__object_id` is used.
|
Package name, glob or regular expression to match (multiple) packages. If not specified `__object_id` is used.
|
||||||
|
|
||||||
priority
|
priority
|
||||||
The priority value to assign to matching packages. Deafults to 500. (To match the default target distro's priority)
|
The priority value to assign to matching packages. Defaults to 500. (To match the default target distro's priority)
|
||||||
|
|
||||||
state
|
state
|
||||||
Will be passed to underlying `__file` type; see there for valid values and defaults.
|
Will be passed to underlying `__file` type; see there for valid values and defaults.
|
||||||
|
|
|
@ -21,6 +21,7 @@
|
||||||
name="$__object_id"
|
name="$__object_id"
|
||||||
state="$(cat "$__object/parameter/state")"
|
state="$(cat "$__object/parameter/state")"
|
||||||
uri="$(cat "$__object/parameter/uri")"
|
uri="$(cat "$__object/parameter/uri")"
|
||||||
|
options=""
|
||||||
|
|
||||||
if [ -f "$__object/parameter/distribution" ]; then
|
if [ -f "$__object/parameter/distribution" ]; then
|
||||||
distribution="$(cat "$__object/parameter/distribution")"
|
distribution="$(cat "$__object/parameter/distribution")"
|
||||||
|
|
|
@ -85,7 +85,7 @@ if [ -z "${certbot_fullpath}" ]; then
|
||||||
esac
|
esac
|
||||||
;;
|
;;
|
||||||
freebsd)
|
freebsd)
|
||||||
__package py37-certbot
|
__package py39-certbot
|
||||||
certbot_fullpath="/usr/local/bin/certbot"
|
certbot_fullpath="/usr/local/bin/certbot"
|
||||||
;;
|
;;
|
||||||
ubuntu)
|
ubuntu)
|
||||||
|
|
|
@ -19,5 +19,5 @@
|
||||||
# along with cdist. If not, see <http://www.gnu.org/licenses/>.
|
# along with cdist. If not, see <http://www.gnu.org/licenses/>.
|
||||||
#
|
#
|
||||||
|
|
||||||
__package luarocks --state installed
|
__package luarocks --state present
|
||||||
__package make --state installed
|
__package make --state present
|
||||||
|
|
|
@ -20,4 +20,4 @@
|
||||||
|
|
||||||
user="$(cat "$__object/parameter/user" 2>/dev/null || echo "$__object_id")"
|
user="$(cat "$__object/parameter/user" 2>/dev/null || echo "$__object_id")"
|
||||||
|
|
||||||
(id -G -n "$user" | tr ' ' '\n' | sort) 2>/dev/null || true
|
(id -G -n "$user" | tr ' ' '\n') 2>/dev/null || true
|
||||||
|
|
|
@ -26,13 +26,15 @@ os=$(cat "$__global/explorer/os")
|
||||||
mkdir "$__object/files"
|
mkdir "$__object/files"
|
||||||
# file has to be sorted for comparison with `comm`
|
# file has to be sorted for comparison with `comm`
|
||||||
sort "$__object/parameter/group" > "$__object/files/group.sorted"
|
sort "$__object/parameter/group" > "$__object/files/group.sorted"
|
||||||
|
# Use local sort for remote groups
|
||||||
|
sort "$__object/explorer/group" > "$__object/files/group-remote.sorted"
|
||||||
|
|
||||||
case "$state_should" in
|
case "$state_should" in
|
||||||
present)
|
present)
|
||||||
changed_groups="$(comm -13 "$__object/explorer/group" "$__object/files/group.sorted")"
|
changed_groups="$(comm -13 "$__object/files/group-remote.sorted" "$__object/files/group.sorted")"
|
||||||
;;
|
;;
|
||||||
absent)
|
absent)
|
||||||
changed_groups="$(comm -12 "$__object/explorer/group" "$__object/files/group.sorted")"
|
changed_groups="$(comm -12 "$__object/files/group-remote.sorted" "$__object/files/group.sorted")"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,14 @@
|
||||||
Changelog
|
Changelog
|
||||||
---------
|
---------
|
||||||
|
|
||||||
|
7.0.1:
|
||||||
|
* Core: Remove double definition of scan parser (Nico Schottelius)
|
||||||
|
* Type __apt_mark: Narrow down grep for hold packages (marcoduif)
|
||||||
|
* Type __apt_source: Set required options variable (Mark Verboom)
|
||||||
|
* Type __letsencrypt_cert: Update python version (Michelle)
|
||||||
|
* Explorer os_version: Add support for Daedalus (Michelle)
|
||||||
|
* Explorer machine_type: Correct incorrect VMM matching (Mark Verboom)
|
||||||
|
|
||||||
7.0.0: 2022-07-31
|
7.0.0: 2022-07-31
|
||||||
* Explorer machine_type: Rewrite (Dennis Camera)
|
* Explorer machine_type: Rewrite (Dennis Camera)
|
||||||
* New type: __sed (Ander Punnar)
|
* New type: __sed (Ander Punnar)
|
||||||
|
|
Loading…
Reference in New Issue