summaryrefslogtreecommitdiff
path: root/puppet
diff options
context:
space:
mode:
authorMicah Anderson <micah@leap.se>2015-05-06 13:06:28 -0400
committerMicah Anderson <micah@leap.se>2015-05-06 16:27:40 -0400
commit06f282523fdeb06b00d20d1e38f7ddf5604ffd84 (patch)
tree7594423c1623d357ac032088f5ea3109492fb3bf /puppet
parent05f4ab41911375ac037cb85bbdb9ad7916f6a4ec (diff)
fix unattended-upgrades now that jessie has been released
Change-Id: I69e6a0f8e676be72bce492af32fef76c9167f5ee
Diffstat (limited to 'puppet')
m---------puppet/modules/apt0
-rw-r--r--puppet/modules/site_apt/manifests/unattended_upgrades.pp9
-rw-r--r--puppet/modules/site_apt/templates/50unattended-upgrades (renamed from puppet/modules/site_apt/files/Debian/50unattended-upgrades)2
3 files changed, 5 insertions, 6 deletions
diff --git a/puppet/modules/apt b/puppet/modules/apt
-Subproject 64fb988c0e37d64fb3e241dc95f156072e43bf2
+Subproject fca103484ddc1f647a54135b6a902edabf45955
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";