From 06f282523fdeb06b00d20d1e38f7ddf5604ffd84 Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@leap.se>
Date: Wed, 6 May 2015 13:06:28 -0400
Subject: fix unattended-upgrades now that jessie has been released

Change-Id: I69e6a0f8e676be72bce492af32fef76c9167f5ee
---
 puppet/modules/apt                                       |  2 +-
 .../modules/site_apt/files/Debian/50unattended-upgrades  | 16 ----------------
 puppet/modules/site_apt/manifests/unattended_upgrades.pp |  9 ++++-----
 puppet/modules/site_apt/templates/50unattended-upgrades  | 16 ++++++++++++++++
 4 files changed, 21 insertions(+), 22 deletions(-)
 delete mode 100644 puppet/modules/site_apt/files/Debian/50unattended-upgrades
 create mode 100644 puppet/modules/site_apt/templates/50unattended-upgrades

(limited to 'puppet')

diff --git a/puppet/modules/apt b/puppet/modules/apt
index 64fb988c..fca10348 160000
--- a/puppet/modules/apt
+++ b/puppet/modules/apt
@@ -1 +1 @@
-Subproject commit 64fb988c0e37d64fb3e241dc95f156072e43bf2a
+Subproject commit fca103484ddc1f647a54135b6a902edabf459554
diff --git a/puppet/modules/site_apt/files/Debian/50unattended-upgrades b/puppet/modules/site_apt/files/Debian/50unattended-upgrades
deleted file mode 100644
index f2f574fc..00000000
--- a/puppet/modules/site_apt/files/Debian/50unattended-upgrades
+++ /dev/null
@@ -1,16 +0,0 @@
-// this file is managed by puppet !
-
-Unattended-Upgrade::Allowed-Origins {
-        "${distro_id}:stable";
-        "${distro_id}:${distro_codename}-security";
-        "${distro_id}:${distro_codename}-updates";
-        "${distro_id} Backports:${distro_codename}-backports";
-        "leap.se:stable";
-};
-
-APT::Periodic::Update-Package-Lists "1";
-APT::Periodic::Download-Upgradeable-Packages "1";
-APT::Periodic::Unattended-Upgrade "1";
-
-Unattended-Upgrade::Mail "root";
-Unattended-Upgrade::MailOnlyOnError "true";
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/templates/50unattended-upgrades b/puppet/modules/site_apt/templates/50unattended-upgrades
new file mode 100644
index 00000000..9ae3ab84
--- /dev/null
+++ b/puppet/modules/site_apt/templates/50unattended-upgrades
@@ -0,0 +1,16 @@
+// this file is managed by puppet !
+
+Unattended-Upgrade::Allowed-Origins {
+        "${distro_id}:oldstable";
+        "${distro_id}:${distro_codename}-security";
+        "${distro_id}:${distro_codename}-updates";
+        "${distro_id} Backports:${distro_codename}-backports";
+        "leap.se:stable";
+};
+
+APT::Periodic::Update-Package-Lists "1";
+APT::Periodic::Download-Upgradeable-Packages "1";
+APT::Periodic::Unattended-Upgrade "1";
+
+Unattended-Upgrade::Mail "root";
+Unattended-Upgrade::MailOnlyOnError "true";
-- 
cgit v1.2.3