Skip to content

Commit df5a5f4

Browse files
authored
Merge pull request #994 from puppetlabs/release
Release mergeback version 8.1.0
2 parents 4aed9b7 + 5a00944 commit df5a5f4

File tree

3 files changed

+30
-6
lines changed

3 files changed

+30
-6
lines changed

CHANGELOG.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,20 @@
22

33
All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
44

5+
## [v8.1.0](https://github.com/puppetlabs/puppetlabs-apt/tree/v8.1.0) (2021-07-26)
6+
7+
[Full Changelog](https://github.com/puppetlabs/puppetlabs-apt/compare/v8.0.2...v8.1.0)
8+
9+
### Added
10+
11+
- \[MODULES-9695\] - Add support for signed-by in source entries [\#991](https://github.com/puppetlabs/puppetlabs-apt/pull/991) ([johanfleury](https://github.com/johanfleury))
12+
13+
### Fixed
14+
15+
- \(IAC-1597\) Increasing MAX\_RETRY\_COUNT [\#987](https://github.com/puppetlabs/puppetlabs-apt/pull/987) ([pmcmaw](https://github.com/pmcmaw))
16+
17+
- apt::source: pass the weak\_ssl param to apt::key [\#993](https://github.com/puppetlabs/puppetlabs-apt/pull/993) ([kenyon](https://github.com/kenyon))
18+
519
## [v8.0.2](https://github.com/puppetlabs/puppetlabs-apt/tree/v8.0.2) (2021-03-29)
620

721
[Full Changelog](https://github.com/puppetlabs/puppetlabs-apt/compare/v8.0.1...v8.0.2)

REFERENCE.md

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
* [`apt::conf`](#aptconf): Specifies a custom Apt configuration file.
2222
* [`apt::key`](#aptkey): Manages the GPG keys that Apt uses to authenticate packages.
23-
* [`apt::mark`](#aptmark): defined typeapt::mark
23+
* [`apt::mark`](#aptmark): Manages apt-mark settings
2424
* [`apt::pin`](#aptpin): Manages Apt pins. Does not trigger an apt-get update run.
2525
* [`apt::ppa`](#aptppa): Manages PPA repositories using `add-apt-repository`. Not supported on Debian.
2626
* [`apt::setting`](#aptsetting): Manages Apt configuration files.
@@ -620,7 +620,7 @@ Default value: `$::apt::key_options`
620620

621621
### <a name="aptmark"></a>`apt::mark`
622622

623-
defined typeapt::mark
623+
Manages apt-mark settings
624624

625625
#### Parameters
626626

@@ -634,7 +634,7 @@ Data type: `Enum['auto','manual','hold','unhold']`
634634

635635
auto, manual, hold, unhold
636636
specifies the behavior of apt in case of no more dependencies installed
637-
https://manpages.debian.org/sretch/apt/apt-mark.8.en.html
637+
https://manpages.debian.org/stable/apt/apt-mark.8.en.html
638638

639639
### <a name="aptpin"></a>`apt::pin`
640640

@@ -930,6 +930,7 @@ The following parameters are available in the `apt::source` defined type:
930930
* [`repos`](#repos)
931931
* [`include`](#include)
932932
* [`key`](#key)
933+
* [`keyring`](#keyring)
933934
* [`pin`](#pin)
934935
* [`architecture`](#architecture)
935936
* [`allow_unsigned`](#allow_unsigned)
@@ -993,8 +994,17 @@ Default value: `{}`
993994
Data type: `Optional[Variant[String, Hash]]`
994995

995996
Creates a declaration of the apt::key defined type. Valid options: a string to be passed to the `id` parameter of the `apt::key`
996-
defined type, or a hash of `parameter => value` pairs to be passed to `apt::key`'s `id`, `server`, `content`, `source`, and/or
997-
`options` parameters.
997+
defined type, or a hash of `parameter => value` pairs to be passed to `apt::key`'s `id`, `server`, `content`, `source`, `weak_ssl`,
998+
and/or `options` parameters.
999+
1000+
Default value: ``undef``
1001+
1002+
##### <a name="keyring"></a>`keyring`
1003+
1004+
Data type: `Optional[Stdlib::AbsolutePath]`
1005+
1006+
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.
1007+
See https://wiki.debian.org/DebianRepository/UseThirdParty for details.
9981008

9991009
Default value: ``undef``
10001010

metadata.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "puppetlabs-apt",
3-
"version": "8.0.2",
3+
"version": "8.1.0",
44
"author": "puppetlabs",
55
"summary": "Provides an interface for managing Apt source, key, and definitions with Puppet",
66
"license": "Apache-2.0",

0 commit comments

Comments
 (0)