X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=README.md;h=3168f518cb212451ed2db81e11d629adf68b04b9;hb=d7af638793b6f5b6c5af6562923fa9ee0b025e1d;hp=422a862f5f5433f2727fc9f32bca2e88045b0b84;hpb=e651d7d25c43577738f060d1a2d31a58e273934b;p=puppet-modules%2Fpuppetlabs-apt.git diff --git a/README.md b/README.md index 422a862..3168f51 100644 --- a/README.md +++ b/README.md @@ -58,11 +58,11 @@ include apt **Warning:** Using short key IDs presents a serious security issue, potentially leaving you open to collision attacks. We recommend you always use full fingerprints to identify your GPG keys. This module allows short keys, but issues a security warning if you use them. -Declare the `apt::key` class: +Declare the `apt::key` defined type: ```puppet apt::key { 'puppetlabs': - id => '47B320EB4C7C375AA9DAE1A01054B7A24BD6EC30', + id => '6F6B15509CF8E59E6E469F327F438280EF8D349F', server => 'pgp.mit.edu', options => 'http-proxy="http://proxyuser:proxypass@example.org:3128"', } @@ -147,10 +147,10 @@ apt::source { 'puppetlabs': location => 'http://apt.puppetlabs.com', repos => 'main', key => { - 'id' => '47B320EB4C7C375AA9DAE1A01054B7A24BD6EC30', + 'id' => '6F6B15509CF8E59E6E469F327F438280EF8D349F', 'server' => 'pgp.mit.edu', }, -}, +} ``` ### Configure Apt from Hiera @@ -178,7 +178,7 @@ apt::sources: location: 'http://apt.puppetlabs.com' repos: 'main' key: - id: '47B320EB4C7C375AA9DAE1A01054B7A24BD6EC30' + id: '6F6B15509CF8E59E6E469F327F438280EF8D349F' server: 'pgp.mit.edu' ``` @@ -192,21 +192,21 @@ apt::source { "archive.ubuntu.com-${lsbdistcodename}": key => '630239CC130E1A7FD81A27B140976EAF437D05B5', repos => 'main universe multiverse restricted', } - + apt::source { "archive.ubuntu.com-${lsbdistcodename}-security": location => 'http://archive.ubuntu.com/ubuntu', key => '630239CC130E1A7FD81A27B140976EAF437D05B5', repos => 'main universe multiverse restricted', release => "${lsbdistcodename}-security" } - + apt::source { "archive.ubuntu.com-${lsbdistcodename}-updates": location => 'http://archive.ubuntu.com/ubuntu', key => '630239CC130E1A7FD81A27B140976EAF437D05B5', repos => 'main universe multiverse restricted', release => "${lsbdistcodename}-updates" } - + apt::source { "archive.ubuntu.com-${lsbdistcodename}-backports": location => 'http://archive.ubuntu.com/ubuntu', key => '630239CC130E1A7FD81A27B140976EAF437D05B5', @@ -260,6 +260,8 @@ Main class, includes all other classes. ##### Parameters (all optional) +* `confs`: Creates new `apt::conf` resources. Valid options: a hash to be passed to the [`create_resources` function](https://docs.puppetlabs.com/references/latest/function.html#createresources). Default: {}. + * `keys`: Creates new `apt::key` resources. Valid options: a hash to be passed to the [`create_resources` function](https://docs.puppetlabs.com/references/latest/function.html#createresources). Default: {}. * `ppas`: Creates new `apt::ppa` resources. Valid options: a hash to be passed to the [`create_resources` function](https://docs.puppetlabs.com/references/latest/function.html#createresources). Default: {}.