X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=README.md;h=423c6c69fed29c3013d12380d1a52a28108beb7a;hb=89c747ab3b2caad9b36b8ce53a693537f4db6f36;hp=49266cc913b3837839694b9b52de0c05b42f1c67;hpb=015009d5530576136e5a5432e672125da0881d39;p=puppet-modules%2Fpuppetlabs-apt.git diff --git a/README.md b/README.md index 49266cc..423c6c6 100644 --- a/README.md +++ b/README.md @@ -62,7 +62,7 @@ Declare the `apt::key` class: ```puppet apt::key { 'puppetlabs': - id => '47B320EB4C7C375AA9DAE1A01054B7A24BD6EC30', + id => '6F6B15509CF8E59E6E469F327F438280EF8D349F', server => 'pgp.mit.edu', options => 'http-proxy="http://proxyuser:proxypass@example.org:3128"', } @@ -147,7 +147,7 @@ apt::source { 'puppetlabs': location => 'http://apt.puppetlabs.com', repos => 'main', key => { - 'id' => '47B320EB4C7C375AA9DAE1A01054B7A24BD6EC30', + 'id' => '6F6B15509CF8E59E6E469F327F438280EF8D349F', 'server' => 'pgp.mit.edu', }, }, @@ -178,7 +178,7 @@ apt::sources: location: 'http://apt.puppetlabs.com' repos: 'main' key: - id: '47B320EB4C7C375AA9DAE1A01054B7A24BD6EC30' + id: '6F6B15509CF8E59E6E469F327F438280EF8D349F' server: 'pgp.mit.edu' ``` @@ -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: {}. @@ -420,8 +422,8 @@ Manages PPA repositories using `add-apt-repository`. Not supported on Debian. * `package_name`: Names the package that provides the `apt-add-repository` command. Valid options: a string. Defaults: * Lucid and Precise: 'python-software-properties' - * Trusty, Utopic, and Vivid: 'software-properties-common' - * All others: undef + * Trusty and newer: 'software-properties-common' + * All others: 'python-software-properties' * `release`: *Optional if lsb-release is installed (unless you're using a different release than indicated by lsb-release, e.g., Linux Mint).* Specifies the operating system of your node. Valid options: a string containing a valid LSB distribution codename. Default: "$lsbdistcodename".