X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=REFERENCE.md;h=3a3e9a8447cca140e50cc4400240c5a7cb499106;hb=b5387f1872ee46cc15b175a30b174832d62cb9a9;hp=4fd85ebf5605ecaedb2172dbf241a82fc74d61bb;hpb=0ba71b2d553c88cb5d149ea4030b388ab9013da0;p=puppet-modules%2Fpuppetlabs-apt.git diff --git a/REFERENCE.md b/REFERENCE.md index 4fd85eb..3a3e9a8 100644 --- a/REFERENCE.md +++ b/REFERENCE.md @@ -20,7 +20,7 @@ * [`apt::conf`](#aptconf): Specifies a custom Apt configuration file. * [`apt::key`](#aptkey): Manages the GPG keys that Apt uses to authenticate packages. -* [`apt::mark`](#aptmark): defined typeapt::mark +* [`apt::mark`](#aptmark): Manages apt-mark settings * [`apt::pin`](#aptpin): Manages Apt pins. Does not trigger an apt-get update run. * [`apt::ppa`](#aptppa): Manages PPA repositories using `add-apt-repository`. Not supported on Debian. * [`apt::setting`](#aptsetting): Manages Apt configuration files. @@ -375,7 +375,12 @@ Data type: `Hash` -Default value: `$apt::params::source_key_defaults` +Default value: `{ + 'server' => $keyserver, + 'options' => undef, + 'content' => undef, + 'source' => undef, + }` ### `apt::backports` @@ -392,7 +397,7 @@ class { 'apt::backports': repos => 'main universe multiverse restricted', key => { id => '630239CC130E1A7FD81A27B140976EAF437D05B5', - server => 'hkps.pool.sks-keyservers.net', + server => 'keyserver.ubuntu.com', }, } ``` @@ -536,7 +541,7 @@ Manages the GPG keys that Apt uses to authenticate packages. ```puppet apt::key { 'puppetlabs': id => '6F6B15509CF8E59E6E469F327F438280EF8D349F', - server => 'hkps.pool.sks-keyservers.net', + server => 'keyserver.ubuntu.com', options => 'http-proxy="http://proxyuser:proxypass@example.org:3128"', } ``` @@ -615,7 +620,7 @@ Default value: `$::apt::key_options` ### `apt::mark` -defined typeapt::mark +Manages apt-mark settings #### Parameters @@ -629,7 +634,7 @@ Data type: `Enum['auto','manual','hold','unhold']` auto, manual, hold, unhold specifies the behavior of apt in case of no more dependencies installed -https://manpages.debian.org/sretch/apt/apt-mark.8.en.html +https://manpages.debian.org/stable/apt/apt-mark.8.en.html ### `apt::pin` @@ -909,7 +914,7 @@ apt::source { 'puppetlabs': repos => 'main', key => { id => '6F6B15509CF8E59E6E469F327F438280EF8D349F', - server => 'hkps.pool.sks-keyservers.net', + server => 'keyserver.ubuntu.com', }, } ``` @@ -925,6 +930,7 @@ The following parameters are available in the `apt::source` defined type: * [`repos`](#repos) * [`include`](#include) * [`key`](#key) +* [`keyring`](#keyring) * [`pin`](#pin) * [`architecture`](#architecture) * [`allow_unsigned`](#allow_unsigned) @@ -988,8 +994,17 @@ Default value: `{}` Data type: `Optional[Variant[String, Hash]]` Creates a declaration of the apt::key defined type. Valid options: a string to be passed to the `id` parameter of the `apt::key` -defined type, or a hash of `parameter => value` pairs to be passed to `apt::key`'s `id`, `server`, `content`, `source`, and/or -`options` parameters. +defined type, or a hash of `parameter => value` pairs to be passed to `apt::key`'s `id`, `server`, `content`, `source`, `weak_ssl`, +and/or `options` parameters. + +Default value: ``undef`` + +##### `keyring` + +Data type: `Optional[Stdlib::AbsolutePath]` + +Absolute path to a file containing the PGP keyring used to sign this repository. Value is used to set signed-by on the source entry. +See https://wiki.debian.org/DebianRepository/UseThirdParty for details. Default value: ``undef``