Compare commits
35 Commits
Author | SHA1 | Date |
---|---|---|
evilham | 560374a686 | |
evilham | fc9bd40c9a | |
evilham | 5b7cca99f7 | |
evilham | 15c642a9b7 | |
Darko Poljak | bf222d0543 | |
poljakowski | 433399d4dc | |
poljakowski | 12c536dbf9 | |
poljakowski | 67a6965e1d | |
poljakowski | 398ee1e416 | |
poljakowski | b209adcfca | |
ander | 72ff48154c | |
matze | 3d7b31cbb4 | |
matze | d246e06710 | |
matze | 12787ffe2c | |
matze | 7b6789ddeb | |
ander | cd4acde67e | |
ander | 5bf0c71e7a | |
ander | aabef7f44a | |
ander | b7f392fa37 | |
ander | 90488fcebc | |
ander | 0f6e48dbc6 | |
ander | d7fdc8006f | |
ander | fcd730f905 | |
Darko Poljak | b8eb6e984c | |
poljakowski | b762ea0233 | |
Dennis Camera | 05c2a62191 | |
Dennis Camera | 5af1317c29 | |
Dennis Camera | 4a05669765 | |
Dennis Camera | 23fbfaf035 | |
Dennis Camera | 2ffa895f57 | |
Dennis Camera | abc6d009b2 | |
Dennis Camera | edcac70b2a | |
ander | cf0032d667 | |
ander | 7a5896acfa | |
ander | 485283f2e5 |
File diff suppressed because it is too large
Load Diff
|
@ -22,7 +22,21 @@
|
||||||
name="$__object_id"
|
name="$__object_id"
|
||||||
destination="/etc/apt/sources.list.d/${name}.list"
|
destination="/etc/apt/sources.list.d/${name}.list"
|
||||||
|
|
||||||
|
# There are special arguments to apt(8) to prevent aborts if apt woudn't been
|
||||||
|
# updated after the 19th April 2021 till the bullseye release. The additional
|
||||||
|
# arguments acknoledge the happend suite change (the apt(8) update does the
|
||||||
|
# same by itself).
|
||||||
|
#
|
||||||
|
# Using '-o $config' instead of the --allow-releaseinfo-change-* parameter
|
||||||
|
# allows backward compatablility to pre-buster Debian versions.
|
||||||
|
#
|
||||||
|
# See more: ticket #861
|
||||||
|
# https://code.ungleich.ch/ungleich-public/cdist/-/issues/861
|
||||||
|
apt_opts="-o Acquire::AllowReleaseInfoChange::Suite=true -o Acquire::AllowReleaseInfoChange::Version=true"
|
||||||
|
|
||||||
|
# run 'apt-get update' only if something changed with our sources.list file
|
||||||
|
# it will be run a second time on error as a redundancy messure to success
|
||||||
if grep -q "^__file${destination}" "$__messages_in"; then
|
if grep -q "^__file${destination}" "$__messages_in"; then
|
||||||
printf 'apt-get update || apt-get update\n'
|
printf 'apt-get %s update || apt-get %s update\n' "$apt_opts" "$apt_opts"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
|
@ -18,9 +18,23 @@
|
||||||
# along with cdist. If not, see <http://www.gnu.org/licenses/>.
|
# along with cdist. If not, see <http://www.gnu.org/licenses/>.
|
||||||
#
|
#
|
||||||
|
|
||||||
|
|
||||||
|
# There are special arguments to apt(8) to prevent aborts if apt woudn't been
|
||||||
|
# updated after the 19th April 2021 till the bullseye release. The additional
|
||||||
|
# arguments acknoledge the happend suite change (the apt(8) update does the
|
||||||
|
# same by itself).
|
||||||
|
#
|
||||||
|
# Using '-o $config' instead of the --allow-releaseinfo-change-* parameter
|
||||||
|
# allows backward compatablility to pre-buster Debian versions.
|
||||||
|
#
|
||||||
|
# See more: ticket #861
|
||||||
|
# https://code.ungleich.ch/ungleich-public/cdist/-/issues/861
|
||||||
|
apt_opts="-o Acquire::AllowReleaseInfoChange::Suite=true -o Acquire::AllowReleaseInfoChange::Version=true"
|
||||||
|
|
||||||
# run 'apt-get update' if anything in /etc/apt is newer then /var/lib/apt/lists
|
# run 'apt-get update' if anything in /etc/apt is newer then /var/lib/apt/lists
|
||||||
|
# it will be run a second time on error as a redundancy messure to success
|
||||||
cat << DONE
|
cat << DONE
|
||||||
if find /etc/apt -mindepth 1 -cnewer /var/lib/apt/lists | grep . > /dev/null; then
|
if find /etc/apt -mindepth 1 -cnewer /var/lib/apt/lists | grep . > /dev/null; then
|
||||||
apt-get update || apt-get update
|
apt-get $apt_opts update || apt-get $apt_opts update
|
||||||
fi
|
fi
|
||||||
DONE
|
DONE
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
'file' has been deprecated in favour of 'line' in order to provide idempotency.
|
|
@ -15,7 +15,7 @@ case $os in
|
||||||
# Differntation not needed anymore
|
# Differntation not needed anymore
|
||||||
apt_source_distribution=stable
|
apt_source_distribution=stable
|
||||||
;;
|
;;
|
||||||
10*)
|
10*|11*)
|
||||||
# Differntation not needed anymore
|
# Differntation not needed anymore
|
||||||
apt_source_distribution=stable
|
apt_source_distribution=stable
|
||||||
;;
|
;;
|
||||||
|
|
|
@ -41,7 +41,7 @@ if [ -z "${certbot_fullpath}" ]; then
|
||||||
require="__apt_source/stretch-backports" __package_apt certbot \
|
require="__apt_source/stretch-backports" __package_apt certbot \
|
||||||
--target-release stretch-backports
|
--target-release stretch-backports
|
||||||
;;
|
;;
|
||||||
10*)
|
10*|11*)
|
||||||
__package_apt certbot
|
__package_apt certbot
|
||||||
;;
|
;;
|
||||||
|
|
||||||
|
|
|
@ -81,12 +81,24 @@ aptget="DEBIAN_FRONTEND=noninteractive apt-get --quiet --yes -o Dpkg::Options::=
|
||||||
|
|
||||||
case "$state_should" in
|
case "$state_should" in
|
||||||
present)
|
present)
|
||||||
|
# There are special arguments to apt(8) to prevent aborts if apt woudn't been
|
||||||
|
# updated after the 19th April 2021 till the bullseye release. The additional
|
||||||
|
# arguments acknoledge the happend suite change (the apt(8) update does the
|
||||||
|
# same by itself).
|
||||||
|
#
|
||||||
|
# Using '-o $config' instead of the --allow-releaseinfo-change-* parameter
|
||||||
|
# allows backward compatablility to pre-buster Debian versions.
|
||||||
|
#
|
||||||
|
# See more: ticket #861
|
||||||
|
# https://code.ungleich.ch/ungleich-public/cdist/-/issues/861
|
||||||
|
apt_opts="-o Acquire::AllowReleaseInfoChange::Suite=true -o Acquire::AllowReleaseInfoChange::Version=true"
|
||||||
|
|
||||||
# following is bit ugly, but important hack.
|
# following is bit ugly, but important hack.
|
||||||
# due to how cdist config run works, there isn't
|
# due to how cdist config run works, there isn't
|
||||||
# currently better way to do it :(
|
# currently better way to do it :(
|
||||||
cat << EOF
|
cat << EOF
|
||||||
if [ ! -f /var/cache/apt/pkgcache.bin ] || [ "\$( stat --format %Y /var/cache/apt/pkgcache.bin )" -lt "\$( date +%s -d '-1 day' )" ]
|
if [ ! -f /var/cache/apt/pkgcache.bin ] || [ "\$( stat --format %Y /var/cache/apt/pkgcache.bin )" -lt "\$( date +%s -d '-1 day' )" ]
|
||||||
then echo apt-get update > /dev/null 2>&1 || true
|
then echo apt-get $apt_opts update > /dev/null 2>&1 || true
|
||||||
fi
|
fi
|
||||||
EOF
|
EOF
|
||||||
if [ -n "$version" ]; then
|
if [ -n "$version" ]; then
|
||||||
|
|
|
@ -41,7 +41,19 @@ fi
|
||||||
case "$type" in
|
case "$type" in
|
||||||
yum) ;;
|
yum) ;;
|
||||||
apt)
|
apt)
|
||||||
echo "apt-get --quiet update"
|
# There are special arguments to apt(8) to prevent aborts if apt woudn't been
|
||||||
|
# updated after the 19th April 2021 till the bullseye release. The additional
|
||||||
|
# arguments acknoledge the happend suite change (the apt(8) update does the
|
||||||
|
# same by itself).
|
||||||
|
#
|
||||||
|
# Using '-o $config' instead of the --allow-releaseinfo-change-* parameter
|
||||||
|
# allows backward compatablility to pre-buster Debian versions.
|
||||||
|
#
|
||||||
|
# See more: ticket #861
|
||||||
|
# https://code.ungleich.ch/ungleich-public/cdist/-/issues/861
|
||||||
|
apt_opts="-o Acquire::AllowReleaseInfoChange::Suite=true -o Acquire::AllowReleaseInfoChange::Version=true"
|
||||||
|
|
||||||
|
echo "apt-get --quiet $apt_opts update"
|
||||||
echo "apt-cache updated (age was: $currage)" >> "$__messages_out"
|
echo "apt-cache updated (age was: $currage)" >> "$__messages_out"
|
||||||
;;
|
;;
|
||||||
pacman)
|
pacman)
|
||||||
|
|
|
@ -0,0 +1,16 @@
|
||||||
|
#!/bin/sh -e
|
||||||
|
|
||||||
|
if [ -f "$__object/parameter/file" ]
|
||||||
|
then
|
||||||
|
file="$( cat "$__object/parameter/file" )"
|
||||||
|
else
|
||||||
|
file="/$__object_id"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ ! -e "$file" ]
|
||||||
|
then
|
||||||
|
echo "$file does not exist" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
cat "$file"
|
|
@ -0,0 +1,58 @@
|
||||||
|
#!/bin/sh -e
|
||||||
|
|
||||||
|
if [ -f "$__object/parameter/file" ]
|
||||||
|
then
|
||||||
|
file="$( cat "$__object/parameter/file" )"
|
||||||
|
else
|
||||||
|
file="/$__object_id"
|
||||||
|
fi
|
||||||
|
|
||||||
|
script="$( cat "$__object/parameter/script" )"
|
||||||
|
|
||||||
|
if [ "$script" = '-' ]
|
||||||
|
then
|
||||||
|
script="$( cat "$__object/stdin" )"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# since stdin is not available in explorer, we pull file from target with explorer
|
||||||
|
|
||||||
|
file_from_target="$__object/explorer/file"
|
||||||
|
|
||||||
|
sed_cmd='sed'
|
||||||
|
|
||||||
|
if [ -f "$__object/parameter/regexp-extended" ]
|
||||||
|
then
|
||||||
|
sed_cmd="$sed_cmd -E"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# do sed dry run, diff result and if no change, then there's nothing to do
|
||||||
|
# also redirect diff's output to stderr for debugging purposes
|
||||||
|
|
||||||
|
if echo "$script" | "$sed_cmd" -f - "$file_from_target" | diff -u "$file_from_target" - >&2
|
||||||
|
then
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
# we can't use -i, because it's not posix, so we fly with tempfile and cp
|
||||||
|
# and we use cp because we want to preserve destination file's attributes
|
||||||
|
|
||||||
|
# shellcheck disable=SC2016
|
||||||
|
echo 'tmp="$__object/tempfile"'
|
||||||
|
|
||||||
|
echo "$sed_cmd -f - '$file' > \"\$tmp\" << EOF"
|
||||||
|
|
||||||
|
echo "$script"
|
||||||
|
|
||||||
|
echo 'EOF'
|
||||||
|
|
||||||
|
echo "cp \"\$tmp\" '$file'"
|
||||||
|
|
||||||
|
# shellcheck disable=SC2016
|
||||||
|
echo 'rm -f "$tmp"'
|
||||||
|
|
||||||
|
echo 'change' >> "$__messages_out"
|
||||||
|
|
||||||
|
if [ -f "$__object/parameter/onchange" ]
|
||||||
|
then
|
||||||
|
cat "$__object/parameter/onchange"
|
||||||
|
fi
|
|
@ -0,0 +1,57 @@
|
||||||
|
cdist-type__sed(7)
|
||||||
|
==================
|
||||||
|
|
||||||
|
NAME
|
||||||
|
----
|
||||||
|
cdist-type__sed - Transform text files with ``sed``
|
||||||
|
|
||||||
|
|
||||||
|
DESCRIPTION
|
||||||
|
-----------
|
||||||
|
Transform text files with ``sed``.
|
||||||
|
|
||||||
|
|
||||||
|
REQUIRED MULTIPLE PARAMETERS
|
||||||
|
----------------------------
|
||||||
|
script
|
||||||
|
``sed`` script.
|
||||||
|
If ``-`` then the script is read from ``stdin``.
|
||||||
|
|
||||||
|
|
||||||
|
OPTIONAL PARAMETERS
|
||||||
|
-------------------
|
||||||
|
file
|
||||||
|
Path to the file. Defaults to ``$__object_id``.
|
||||||
|
|
||||||
|
onchange
|
||||||
|
Execute this command if ``sed`` changes file.
|
||||||
|
|
||||||
|
|
||||||
|
BOOLEAN PARAMETERS
|
||||||
|
------------------
|
||||||
|
regexp-extended
|
||||||
|
Use extended regular expressions in the script.
|
||||||
|
Might not be supported with every ``sed`` version.
|
||||||
|
|
||||||
|
|
||||||
|
EXAMPLES
|
||||||
|
--------
|
||||||
|
|
||||||
|
.. code-block:: sh
|
||||||
|
|
||||||
|
__sed /tmp/foobar --script 's/foo/bar/'
|
||||||
|
|
||||||
|
echo 's/foo/bar/' | __sed foobar --file /tmp/foobar --script -
|
||||||
|
|
||||||
|
|
||||||
|
AUTHORS
|
||||||
|
-------
|
||||||
|
Ander Punnar <ander-at-kvlt-dot-ee>
|
||||||
|
|
||||||
|
|
||||||
|
COPYING
|
||||||
|
-------
|
||||||
|
Copyright \(C) 2021 Ander Punnar. You can redistribute it and/or modify it
|
||||||
|
under the terms of the GNU General Public License as published by the Free
|
||||||
|
Software Foundation, either version 3 of the License, or (at your option)
|
||||||
|
any later version.
|
|
@ -0,0 +1 @@
|
||||||
|
regexp-extended
|
|
@ -0,0 +1,2 @@
|
||||||
|
file
|
||||||
|
onchange
|
|
@ -0,0 +1 @@
|
||||||
|
script
|
|
@ -1,6 +1,16 @@
|
||||||
Changelog
|
Changelog
|
||||||
---------
|
---------
|
||||||
|
|
||||||
|
next:
|
||||||
|
* Explorer machine_type: Rewrite (Dennis Camera)
|
||||||
|
* New type: __sed (Ander Punnar)
|
||||||
|
* Type __apt_update_index: Fix complaint about suite change (Matthias Stecher)
|
||||||
|
* Type __package_update_index: Fix complaint about suite change (Matthias Stecher)
|
||||||
|
* Type __apt_source: Fix complaint about suite change (Matthias Stecher)
|
||||||
|
* Type __package_apt: Fix complaint about suite change (Matthias Stecher)
|
||||||
|
* Type __debconf_set_selections: Fix bug where --file was unsupported (Evilham)
|
||||||
|
* Types __letsencrypt_cert, __grafana_dashboard: Improve bullseye support (Evilham)
|
||||||
|
|
||||||
6.9.8: 2021-08-24
|
6.9.8: 2021-08-24
|
||||||
* Type __rsync: Rewrite (Ander Punnar)
|
* Type __rsync: Rewrite (Ander Punnar)
|
||||||
* New type: __apt_pin (Daniel Fancsali)
|
* New type: __apt_pin (Daniel Fancsali)
|
||||||
|
|
Loading…
Reference in New Issue