3 files changed, 23 insertions, 16 deletions
diff --git a/templates/50unattended-upgrades.erb b/templates/50unattended-upgrades.erb
index 94059d5..23c5c89 100644
--- a/templates/50unattended-upgrades.erb
+++ b/templates/50unattended-upgrades.erb
@@ -1,17 +1,18 @@
 // this file is managed by puppet !
 
-Unattended-Upgrade::Allowed-Origins {
 <% if scope.lookupvar('::operatingsystem') == 'Ubuntu' -%>
+Unattended-Upgrade::Allowed-Origins {
   "${distro_id}:${distro_codename}-security";
   "${distro_id}:${distro_codename}-updates";
   "${distro_id}:${distro_codename}-backports";
 <% elsif scope.lookupvar('::operatingsystem') == 'Debian' and scope.lookupvar('::operatingsystemmajrelease') == 6 -%>
-  "${distro-id} ${distro-codename}-security";
-  "${distro-id} ${distro-codename}-lts";
+Unattended-Upgrade::Allowed-Origins {
+  "${distro_id}:oldoldstable";
+  "${distro_id}:squeeze-lts";
 <% else -%>
-  # See Debian bug #704087
-  "o=Debian,a=oldstable,l=Debian-Security";
-  "o=Debian,a=stable,l=Debian-Security";
+Unattended-Upgrade::Origins-Pattern {
+  "origin=Debian,archive=<%= scope.lookupvar('::apt::release') %>,label=Debian-Security";
+  "origin=Debian,archive=${distro_codename}-lts";
 <% end -%>
 };
 
@@ -20,7 +21,7 @@ Unattended-Upgrade::Package-Blacklist {
 <% @blacklisted_packages.each do |pkg| -%>
   "<%= pkg %>";
 <% end -%>
-}
+};
 <% end -%>
 
 APT::Periodic::Update-Package-Lists "1";
diff --git a/templates/Debian/sources.list.erb b/templates/Debian/sources.list.erb
index 37f1c35..ce43135 100644
--- a/templates/Debian/sources.list.erb
+++ b/templates/Debian/sources.list.erb
@@ -19,14 +19,16 @@ deb-src <%= security_url %> <%= codename %>/updates <%= lrepos %>
 # There is no security support for <%= release %>
 <% end -%>
 
+<% if use_backports=scope.lookupvar('apt::use_backports') -%>
 # backports
-<% if (release == "testing" || release == "unstable" || release == "experimental") -%>
+<%   if (release == "testing" || release == "unstable" || release == "experimental") -%>
 # There is no backports archive for <%= release %>
-<% else -%>
+<%   else -%>
 deb <%= backports_url=scope.lookupvar('apt::backports_url') %> <%= codename %>-backports <%= lrepos %>
-<%   if include_src -%>
+<%     if include_src -%>
 deb-src <%= backports_url %> <%= codename %>-backports <%= lrepos %>
-<%   end
+<%     end
+     end
    end -%>
 
 <% if use_volatile=scope.lookupvar('apt::use_volatile') -%>
@@ -43,7 +45,7 @@ deb-src <%= debian_url %> <%= codename %>-updates <%= lrepos %>
 
 <% if use_lts=scope.lookupvar('apt::use_lts') -%>
 # LTS
-<% if release != "oldstable" -%>
+<% if release != "oldoldstable" -%>
 # There is no LTS archive for <%= release %>
 <% else -%>
 deb <%= debian_url %> <%= codename %>-lts <%= lrepos %>
diff --git a/templates/Ubuntu/sources.list.erb b/templates/Ubuntu/sources.list.erb
index 8d2585d..213f051 100644
--- a/templates/Ubuntu/sources.list.erb
+++ b/templates/Ubuntu/sources.list.erb
@@ -7,11 +7,13 @@ deb <%= ubuntu_url=scope.lookupvar('apt::ubuntu_url') %> <%= codename %> <%= lre
 deb-src <%= ubuntu_url %> <%= codename %> <%= lrepos %>
 <% end -%>
 
+<% if use_volatile=scope.lookupvar('apt::use_volatile') -%>
 # updates
 deb <%= ubuntu_url %> <%= codename %>-updates <%= lrepos %>
-<% if include_src -%>
+<%   if include_src -%>
 deb-src <%= ubuntu_url %> <%= codename %>-updates <%= lrepos %>
-<% end -%>
+<%   end
+   end -%>
 
 # security suppport
 deb <%= ubuntu_url %> <%= codename %>-security <%= lrepos %>
@@ -19,8 +21,10 @@ deb <%= ubuntu_url %> <%= codename %>-security <%= lrepos %>
 deb-src <%= ubuntu_url %> <%= codename %>-security <%= lrepos %>
 <% end -%>
 
+<% if use_backports=scope.lookupvar('apt::use_backports') -%>
 # backports
 deb <%= ubuntu_url %> <%= codename %>-backports <%= lrepos %>
-<% if include_src -%>
+<%   if include_src -%>
 deb-src <%= ubuntu_url %> <%= codename %>-backports <%= lrepos %>
-<% end -%>
+<%   end
+   end -%>