diff options
| author | varac <varacanero@zeromail.org> | 2015-05-06 22:33:23 +0200 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2015-05-06 22:33:23 +0200 |
| commit | 35e1e99d5cee374a3d3c1d1605aaa6ef5b60ac1d (patch) | |
| tree | 50595a28bd0036e99af67207baae7c4d6b867aaa /puppet/modules/site_apt | |
| parent | 6a8a321ba50740181c27a6b9e8a82efd9edc3788 (diff) | |
| parent | 93e7f4738f0596a052ce7181586b13d0da064ebb (diff) | |
Merge branch '0.7.0' into develop
Diffstat (limited to 'puppet/modules/site_apt')
| -rw-r--r-- | puppet/modules/site_apt/manifests/unattended_upgrades.pp | 9 | ||||
| -rw-r--r-- | puppet/modules/site_apt/templates/50unattended-upgrades (renamed from puppet/modules/site_apt/files/Debian/50unattended-upgrades) | 2 |
2 files changed, 5 insertions, 6 deletions
diff --git a/puppet/modules/site_apt/manifests/unattended_upgrades.pp b/puppet/modules/site_apt/manifests/unattended_upgrades.pp index daebffab..40111deb 100644 --- a/puppet/modules/site_apt/manifests/unattended_upgrades.pp +++ b/puppet/modules/site_apt/manifests/unattended_upgrades.pp @@ -1,10 +1,9 @@ -class site_apt::unattended_upgrades inherits apt::unattended_upgrades { +class site_apt::unattended_upgrades { # override unattended-upgrades package resource to make sure # that it is upgraded on every deploy (#6245) - include ::apt::unattended_upgrades - - Package['unattended-upgrades'] { - ensure => latest + class { 'apt::unattended_upgrades': + config_content => template('site_apt/50unattended-upgrades'), + ensure_version => latest } } diff --git a/puppet/modules/site_apt/files/Debian/50unattended-upgrades b/puppet/modules/site_apt/templates/50unattended-upgrades index f2f574fc..9ae3ab84 100644 --- a/puppet/modules/site_apt/files/Debian/50unattended-upgrades +++ b/puppet/modules/site_apt/templates/50unattended-upgrades @@ -1,7 +1,7 @@ // this file is managed by puppet ! Unattended-Upgrade::Allowed-Origins { - "${distro_id}:stable"; + "${distro_id}:oldstable"; "${distro_id}:${distro_codename}-security"; "${distro_id}:${distro_codename}-updates"; "${distro_id} Backports:${distro_codename}-backports"; |