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

WIP: Merge __apt_pin fixes in 6.9 to master #336

Closed
fancsali wants to merge 4 commits from 6.9 into master
pull from: 6.9
merge into: ungleich-public:master
Conversation 7 Commits 4 Files changed 5 +8 -2
5 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cdist/conf/type/__apt_pin/man.rst
View file

@ -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.

5
cdist/conf/type/__apt_pin/manifest
View file

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

1
cdist/conf/type/__apt_pin/parameter/default/priority Normal file
View file

@ -0,0 +1 @@
500

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

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

1
cdist/conf/type/__apt_pin/parameter/required
View file

@ -1,2 +1 @@
distribution distribution
priority