X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=README.md;h=9c2ded4b12abc33c40ae8ce23378e85f7512e525;hb=e014fc04ed8358e4f7c2e87f7434df9817a4c7bb;hp=6ea11d7f6d4cc30b081ca20269a2aaa8b87445e0;hpb=91092bdc80f5b46bfd38ad4cd53bb5f6bf096e3c;p=puppet-modules%2Fpuppetlabs-apt.git diff --git a/README.md b/README.md index 6ea11d7..9c2ded4 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"', } @@ -91,6 +91,15 @@ class { 'apt': }, } ``` +When `Exec['apt_update']` is triggered, it will generate a `Notice` message. Because the default [logging level for agents](https://docs.puppet.com/puppet/latest/configuration.html#loglevel) is `notice`, this will cause the repository update to appear in logs and agent reports. Some tools, such as [The Foreman](https://www.theforeman.org), report the update notice as a significant change. By setting the [loglevel](https://docs.puppet.com/puppet/latest/metaparameter.html#loglevel) metaparameter for `Exec['apt_update']` above the agent logging level, one can eliminate these updates from reports: +```puppet +class { 'apt': + update => { + frequency => 'daily', + loglevel => 'debug', + }, +} +``` ### Pin a specific release @@ -147,10 +156,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 +187,7 @@ apt::sources: location: 'http://apt.puppetlabs.com' repos: 'main' key: - id: '47B320EB4C7C375AA9DAE1A01054B7A24BD6EC30' + id: '6F6B15509CF8E59E6E469F327F438280EF8D349F' server: 'pgp.mit.edu' ``` @@ -192,21 +201,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 +269,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: {}. @@ -268,7 +279,7 @@ Main class, includes all other classes. * 'host': Specifies a proxy host to be stored in `/etc/apt/apt.conf.d/01proxy`. Valid options: a string containing a hostname. Default: undef. - * 'port': Specifies a proxy port to be stored in `/etc/apt/apt.conf.d/01proxy`. Valid options: a string containing a port number. Default: '8080'. + * 'port': Specifies a proxy port to be stored in `/etc/apt/apt.conf.d/01proxy`. Valid options: an integer containing a port number. Default: 8080. * 'https': Specifies whether to enable https proxies. Valid options: 'true' and 'false'. Default: 'false'. @@ -311,8 +322,7 @@ Manages backports. * `location`: Specifies an Apt repository containing the backports to manage. Valid options: a string containing a URL. Defaults: - * Debian (squeeze): 'http://httpredir.debian.org/debian-backports' - * Debian (other): 'http://httpredir.debian.org/debian' + * Debian: 'http://deb.debian.org/debian' * Ubuntu: 'http://archive.ubuntu.com/ubuntu' * `pin`: *Optional.* Specifies a pin priority for the backports. Valid options: a number or string to be passed to the `id` parameter of the `apt::pin` defined type, or a hash of `parameter => value` pairs to be passed to `apt::pin`'s corresponding parameters. Default: '200'. @@ -358,16 +368,6 @@ The `apt::key` defined type makes use of the `apt_key` type, but includes extra * `server`: Specifies a keyserver to provide the GPG key. Valid options: a string containing a domain name or a full URL (http://, https://, or hkp://). Default: 'keyserver.ubuntu.com'. -* `key`: Specifies a GPG key to authenticate Apt package signatures. Valid options: a string containing a key ID (8 or 16 hexadecimal characters, optionally prefixed with "0x") or a full key fingerprint (40 hexadecimal characters). Default: undef. **Note** This parameter is deprecated and will be removed in a future release. - -* `key_content`: Supplies the entire GPG key. Useful in case the key can't be fetched from a remote location and using a file resource is inconvenient. Valid options: a string. Default: undef. **Note** This parameter is deprecated and will be removed in a future release. - -* `key_source`: Specifies the location of an existing GPG key file to copy. Valid options: a string containing a URL (ftp://, http://, or https://) or an absolute path. Default: undef. **Note** This parameter is deprecated and will be removed in a future release. - -* `key_server`: Specifies a keyserver to provide the GPG key. Valid options: a string containing a domain name or a full URL (http://, https://, or hkp://). Default: 'keyserver.ubuntu.com'. **Note** This parameter is deprecated and will be removed in a future release. - -* `key_options`: Passes additional options to `apt-key adv --keyserver-options`. Valid options: a string. Default: undef. **Note** This parameter is deprecated and will be removed in a future release. - #### Defined Type: `apt::pin` Manages Apt pins. Does not trigger an `apt-get update` run. @@ -420,12 +420,12 @@ 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". -#### Defined Type: `apt:setting` +#### Defined Type: `apt::setting` Manages Apt configuration files. @@ -471,20 +471,6 @@ Manages the Apt sources in `/etc/apt/sources.list.d/`. * `repos`: Specifies a component of the Apt repository. Valid options: a string. Default: 'main'. -* `include_deb`: Specify whether to request the distrubution's compiled binaries. Valid options: 'true' and 'false'. Default: undef. **Note**: This parameter is deprecated and will be removed in future versions of the module. - -* `include_src`: Specifies whether to request the distribution's uncompiled source code. Valid options: 'true' and 'false'. Default: undef. **Note**: This parameter is deprecated and will be removed in future versions of the module. - -* `required_packages`: Installs packages required for this Apt source via an exec. Default: 'false'. **Note**: This parameter is deprecated and will be removed in future versions of the module. - -* `key_content`: Specifies the content to be passed to `apt::key`. Default: undef. **Note**: This parameter is deprecated and will be removed in future versions of the module. - -* `key_server`: Specifies the server to be passed to `apt::key`. Default: undef. **Note**: This parameter is deprecated and will be removed in future versions of the module. - -* `key_source`: Specifies the source to be passed to `apt::key`. Default: undef. **Note**: This parameter is deprecated and will be removed in future versions of the module. - -* `trusted_source`: Specifies whether to authenticate packages from this release, even if the Release file is not signed or the signature can't be checked. Valid options: 'true' and 'false'. Default: undef. This parameter is **deprecated** and will be removed in a future version of the module. - * `notify_update`: *Optional.* Specifies whether to trigger an `apt-get update` run. Valid options: 'true' and 'false'. Default: 'true'. #### Type: `apt_key`