summaryrefslogtreecommitdiff
path: root/puppet/modules/site_apt/manifests
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2015-05-06 22:33:23 +0200
committervarac <varacanero@zeromail.org>2015-05-06 22:33:23 +0200
commit35e1e99d5cee374a3d3c1d1605aaa6ef5b60ac1d (patch)
tree50595a28bd0036e99af67207baae7c4d6b867aaa /puppet/modules/site_apt/manifests
parent6a8a321ba50740181c27a6b9e8a82efd9edc3788 (diff)
parent93e7f4738f0596a052ce7181586b13d0da064ebb (diff)
Merge branch '0.7.0' into develop
Diffstat (limited to 'puppet/modules/site_apt/manifests')
-rw-r--r--puppet/modules/site_apt/manifests/unattended_upgrades.pp9
1 files changed, 4 insertions, 5 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
}
}