Compare commits

..

5 Commits

Author SHA1 Message Date
fancsali 3f9f3e07e0 Handle signed-by option in __apt_source
Allow users to specify a GPG key fingerprint or keyring file to be
included as the 'signed-by' option.
2022-07-01 14:38:32 +01:00
fancsali bd44c023d3 Fix typos; add default priority; comments in generated files 2022-03-09 16:17:11 +01:00
Nico Schottelius e0150e7796 ++changes 2022-03-09 16:16:49 +01:00
nico14571 15e1ce6450 Merge pull request 'Added rm of tmpfile.' (#330) from mark/cdist:__ssh_authorized_keys-rm into master
Reviewed-on: #330
2022-03-09 15:12:21 +00:00
Mark Verboom 08ff41efde Added rm of tmpfile. 2022-03-08 12:04:58 +01:00
6 changed files with 10 additions and 1 deletions

View File

@ -57,6 +57,11 @@ __file "/etc/apt/preferences.d/$name" \
--owner root --group root --mode 0644 \
--state "$state" \
--source - << EOF
# Created by cdist ${__type##*/}
# Do not change. Changes will be overwritten.
#
# $name
Package: $package
Pin: $pin
Pin-Priority: $priority

View File

@ -0,0 +1 @@
500

View File

@ -1,2 +1,3 @@
state
package
priority

View File

@ -1,2 +1 @@
distribution
priority

View File

@ -40,6 +40,7 @@ if [ -f "$file" ]; then
grep -v -F -x '$line' '$file' >\$tmpfile
fi
cat "\$tmpfile" >"$file"
rm -f "\$tmpfile"
DONE
}

View File

@ -12,6 +12,8 @@ next:
* 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)
* Type __ssh_authorized_key: Also remove tmpfile if removing line (Mark Verboom)
* Type __apt_pin: Add default priority, add comment in generated files (Daniel Fancsali)
6.9.8: 2021-08-24
* Type __rsync: Rewrite (Ander Punnar)