ungleich-public/cdist
ungleich-public/cdist
7
4
Fork 10
Code Issues 58 Pull requests 15 Projects Releases Wiki Activity

WIP: Refinements on __apt_source & --signed-by #337

Draft
fancsali wants to merge 3 commits from fancsali/cdist:apt-source-signed-by into master
pull from: fancsali/cdist:apt-source-signed-by
merge into: ungleich-public:master
Conversation 1 Commits 3 Files changed 5 +14 -8
5 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cdist/conf/type/__apt_source/files/source.list.template
View file

@ -2,6 +2,8 @@
set -u set -u
entry="$uri $distribution $component" entry="$uri $distribution $component"
options="$forcedarch $signed_by"
options=${options## }; options=${options%% }
nico commented 2022-07-16 12:05:25 +00:00
Review
Copy link

Why is the front & back whitespace stripping necessary?

Why is the front & back whitespace stripping necessary?
fancsali commented 2022-07-16 21:14:03 +00:00
Review
Copy link

Because $signed_by and $forcedarch can both be empty, so we might end up with something like signed-by=ABCDEF or arch=amd64 .

Besides $signed_by itself is multi-valued and assembled by a for-loop.

Because `$signed_by` and `$forcedarch` can both be empty, so we might end up with something like ` signed-by=ABCDEF` or `arch=amd64 `. Besides `$signed_by` itself is multi-valued and assembled by a for-loop.
cat << DONE cat << DONE
# Created by cdist ${__type##*/} # Created by cdist ${__type##*/}
@ -9,8 +11,8 @@ cat << DONE
# #
# $name # $name
deb ${options} $entry deb ${options:+[${options}] }$entry
DONE DONE
if [ -f "$__object/parameter/include-src" ]; then if [ -f "$__object/parameter/include-src" ]; then
echo "deb-src $entry" echo "deb-src ${signed_by:+[${signed_by}] }$entry"
fi fi

10
cdist/conf/type/__apt_source/man.rst
View file

@ -23,9 +23,6 @@ OPTIONAL PARAMETERS
arch arch
set this if you need to force and specific arch (ubuntu specific) set this if you need to force and specific arch (ubuntu specific)
signed-by
provide a GPG key fingerprint or keyring path for signature checks
state state
'present' or 'absent', defaults to 'present' 'present' or 'absent', defaults to 'present'
@ -37,6 +34,12 @@ component
space delimited list of components to enable. Defaults to an empty string. space delimited list of components to enable. Defaults to an empty string.
OPTIONAL MULTIPLE PARAMETERS
----------------------------
signed-by
provide a GPG key fingerprint or keyring path for signature checks.
BOOLEAN PARAMETERS BOOLEAN PARAMETERS
------------------ ------------------
include-src include-src
@ -68,6 +71,7 @@ EXAMPLES
AUTHORS AUTHORS
------- -------
Steven Armstrong <steven-cdist--@--armstrong.cc> Steven Armstrong <steven-cdist--@--armstrong.cc>
Daniel Fancsali <fancsali--@--gmail.com>
COPYING COPYING

4
cdist/conf/type/__apt_source/manifest
View file

@ -31,11 +31,11 @@ fi
component="$(cat "$__object/parameter/component")" component="$(cat "$__object/parameter/component")"
if [ -f "$__object/parameter/arch" ]; then if [ -f "$__object/parameter/arch" ]; then
options="arch=$(cat "$__object/parameter/arch")" forcedarch="arch=$(cat "$__object/parameter/arch")"
fi fi
if [ -f "$__object/parameter/signed-by" ]; then if [ -f "$__object/parameter/signed-by" ]; then
options="$options signed-by=$(cat "$__object/parameter/signed-by")" signed_by="${signed_by:${signed_by} }signed-by=$(cat "$__object/parameter/signed-by")"
fi fi
if [ "$options" ]; then if [ "$options" ]; then

1
cdist/conf/type/__apt_source/parameter/optional
View file

@ -2,4 +2,3 @@ state
distribution distribution
component component
arch arch
signed-by

1
cdist/conf/type/__apt_source/parameter/optional_multiple Normal file
View file

@ -0,0 +1 @@
signed-by