Merge branch '0.7.0' into develop

5 files changed, 5 insertions, 6 deletions

diff --git a/puppet/modules/apt b/puppet/modules/apt
-Subproject e8580d1da21d6f1024376d8bfa4858fe52acda6
+Subproject fca103484ddc1f647a54135b6a902edabf45955
diff --git a/puppet/modules/common b/puppet/modules/common
-Subproject 0961ad453b8befb4ea61bbd19f6ecea32b9619c
+Subproject ae149624f9bc551865b93b9b7155af2de8deeb7
diff --git a/puppet/modules/postfix b/puppet/modules/postfix
-Subproject 1103a73ab4253712c6446bba7a443619fe51671
+Subproject f7fc77ec14eedafc08895c7d2555d457c758b34
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";