Merge remote-tracking branch 'shared/master' into feature/8-make_dist-upgrade_timeout_configurable

This commit is contained in:
intrigeri 2016-06-29 18:47:14 +00:00
commit 92e7d506c0

View file

@ -23,12 +23,13 @@
* [apt::preseeded_package](#apt-preseeded_package) * [apt::preseeded_package](#apt-preseeded_package)
* [apt::sources_list](#apt-sources_list) * [apt::sources_list](#apt-sources_list)
* [apt::key](#apt-key) * [apt::key](#apt-key)
* [apt::key::plain](#apt-key-plain) * [`apt::key::plain`](#apt-key-plain)
* [apt::upgrade_package](#apt-upgrade_package) * [apt::upgrade_package](#apt-upgrade_package)
* [Resources](#ressources) * [Resources](#ressources)
* [File\['apt_config'\]](#fileapt_config) * [File\['apt_config'\]](#fileapt_config)
* [Exec\['apt_updated'\]](#execapt_updated) * [Exec\['apt_updated'\]](#execapt_updated)
* [Tests](#tests) * [Tests](#tests)
* [Acceptance Tests](#acceptance-tests)
* [Licensing](#licensing) * [Licensing](#licensing)
@ -76,17 +77,16 @@ Ubuntu support is lagging behind but not absent either.
instantiating the class with those variables instead. For example, if you instantiating the class with those variables instead. For example, if you
had the following in your manifests: had the following in your manifests:
$apt_debian_url = 'http://localhost:9999/debian/' $apt_debian_url = 'http://localhost:9999/debian/'
$apt_use_next_release = true $apt_use_next_release = true
include apt include apt
you will need to remove the variables, and the include and instead do you will need to remove the variables, and the include and instead do
the following: the following:
class { class { 'apt':
'apt': debian_url => 'http://localhost:9999/debian/',
debian_url => 'http://localhost:9999/debian/', use_next_release => true;
use_next_release => true;
} }
previously, you could manually set `$lsbdistcodename` which would enable forced previously, you could manually set `$lsbdistcodename` which would enable forced
@ -98,26 +98,24 @@ Ubuntu support is lagging behind but not absent either.
you to trigger upgrades: you to trigger upgrades:
include apt::dist_upgrade include apt::dist_upgrade
class { class { 'apt':
'apt': codename => 'wheezy',
codename => 'wheezy', notify => Exec['apt_dist-upgrade'];
notify => Exec['apt_dist-upgrade'];
} }
* the `apticron` class has been moved to a parameterized class. if you were * the `apticron` class has been moved to a parameterized class. if you were
including this class before, you will need to move to instantiating the including this class before, you will need to move to instantiating the
class instead. For example, if you had the following in your manifests: class instead. For example, if you had the following in your manifests:
$apticron_email = 'foo@example.com' $apticron_email = 'foo@example.com'
$apticron_notifynew = '1' $apticron_notifynew = '1'
... any $apticron_* variables ... any $apticron_* variables
include apticron include apticron
you will need to remove the variables, and the include and instead do the you will need to remove the variables, and the include and instead do the
following: following:
class { class { 'apt::apticron':
'apt::apticron':
email => 'foo@example.com', email => 'foo@example.com',
notifynew => '1'; notifynew => '1';
} }
@ -127,16 +125,15 @@ Ubuntu support is lagging behind but not absent either.
to move to instantiating the class with those variables instead. For example, to move to instantiating the class with those variables instead. For example,
if you had the following in your manifests: if you had the following in your manifests:
$apt_listchanges_email = 'foo@example.com' $apt_listchanges_email = 'foo@example.com'
... any $apt_listchanges_* variables ... any $apt_listchanges_* variables
include apt::listchanges include apt::listchanges
you will need to remove the variables, and the include and instead do the you will need to remove the variables, and the include and instead do the
following: following:
class { class { 'apt::listchanges':
'apt::listchanges': email => 'foo@example.com';
email => 'foo@example.com';
} }
* the `apt::proxy_client` class has been moved to a paramterized class. if you * the `apt::proxy_client` class has been moved to a paramterized class. if you
@ -144,18 +141,17 @@ Ubuntu support is lagging behind but not absent either.
to move to instantiating the class with those variables instead. For example, to move to instantiating the class with those variables instead. For example,
if you had the following in your manifests: if you had the following in your manifests:
$apt_proxy = 'http://proxy.domain' $apt_proxy = 'http://proxy.domain'
$apt_proxy_port = 666 $apt_proxy_port = 666
include apt::proxy_client include apt::proxy_client
you will need to remove the variables, and the include and instead do the you will need to remove the variables, and the include and instead do the
following: following:
class { class { 'apt::proxy_client':
'apt::proxy_client': proxy => 'http://proxy.domain',
proxy => 'http://proxy.domain', port => '666';
port => '666'; }
}
# Requirements<a name="requirements"></a> # Requirements<a name="requirements"></a>
@ -567,7 +563,7 @@ use `apt::key::plain`.
The `.gpg` extension is compulsory for `apt` to pickup the key properly. The `.gpg` extension is compulsory for `apt` to pickup the key properly.
## apt::key::plain<a name="apt-key-plain"></a> ## `apt::key::plain`<a name="apt-key-plain"></a>
Deploys a secure apt OpenPGP key. This usually accompanies the Deploys a secure apt OpenPGP key. This usually accompanies the
sources.list snippets above for third party repositories. For example, sources.list snippets above for third party repositories. For example,