From 92406aa9180b15b35a3c102fac0e70d4e620a6e1 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Sun, 14 Apr 2013 13:44:42 +0200
Subject: fix default unattended-upgrades config file

---
 files/50unattended-upgrades | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'files')

diff --git a/files/50unattended-upgrades b/files/50unattended-upgrades
index ebf9f49..329c95c 100644
--- a/files/50unattended-upgrades
+++ b/files/50unattended-upgrades
@@ -2,14 +2,14 @@
 
 Unattended-Upgrade::Origins-Pattern {
   // Debian
-  "o=${distro_id},n=${distro_codename}";
-  "o=${distro_id},n=${distro_codename}-updates";
-  "o=${distro_id},n=${distro_codename},l=Debian-security";
-  "o=${distro_id} Backports,n=${distro_codename}-backports";  
+  "${distro_id} ${distro_codename}";
+  "${distro_id} ${distro_codename}-updates";
+  "${distro_id} ${distro_codename}-security";
+  "${distro_id} Backports:${distro_codename}-backports"; 
   // Ubuntu specific 
-  "o=${distro_id},a=${distro_codename}-security";
-  "o=${distro_id},a=${distro_codename}-backports";
-  "o=${distro_id},a=${distro_codename}-proposed";
+  "${distro_id} ${distro_codename}-security";
+  "${distro_id} ${distro_codename}-backports";
+  "${distro_id} ${distro_codename}-proposed";
 };
 
 APT::Periodic::Update-Package-Lists "1";
-- 
cgit v1.2.3


From 9a3068016feffa328bf6e0f265e316eb813b7ee8 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Sun, 14 Apr 2013 14:54:10 +0200
Subject: using distribution sprecific files again

---
 files/50unattended-upgrades                | 20 --------------------
 files/Debian/50unattended-upgrades         | 14 ++++++++++++++
 files/Debian/50unattended-upgrades.lenny   | 13 +++++++++++++
 files/Debian/50unattended-upgrades.squeeze | 13 +++++++++++++
 files/Debian/50unattended-upgrades.wheezy  | 14 ++++++++++++++
 files/Ubuntu/50unattended-upgrades         | 16 ++++++++++++++++
 files/lenny/50unattended-upgrades          | 13 -------------
 files/squeeze/50unattended-upgrades        | 14 --------------
 manifests/unattended_upgrades.pp           |  8 ++++----
 9 files changed, 74 insertions(+), 51 deletions(-)
 delete mode 100644 files/50unattended-upgrades
 create mode 100644 files/Debian/50unattended-upgrades
 create mode 100644 files/Debian/50unattended-upgrades.lenny
 create mode 100644 files/Debian/50unattended-upgrades.squeeze
 create mode 100644 files/Debian/50unattended-upgrades.wheezy
 create mode 100644 files/Ubuntu/50unattended-upgrades
 delete mode 100644 files/lenny/50unattended-upgrades
 delete mode 100644 files/squeeze/50unattended-upgrades

(limited to 'files')

diff --git a/files/50unattended-upgrades b/files/50unattended-upgrades
deleted file mode 100644
index 329c95c..0000000
--- a/files/50unattended-upgrades
+++ /dev/null
@@ -1,20 +0,0 @@
-// this file is managed by puppet !
-
-Unattended-Upgrade::Origins-Pattern {
-  // Debian
-  "${distro_id} ${distro_codename}";
-  "${distro_id} ${distro_codename}-updates";
-  "${distro_id} ${distro_codename}-security";
-  "${distro_id} Backports:${distro_codename}-backports"; 
-  // Ubuntu specific 
-  "${distro_id} ${distro_codename}-security";
-  "${distro_id} ${distro_codename}-backports";
-  "${distro_id} ${distro_codename}-proposed";
-};
-
-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/files/Debian/50unattended-upgrades b/files/Debian/50unattended-upgrades
new file mode 100644
index 0000000..0901ad3
--- /dev/null
+++ b/files/Debian/50unattended-upgrades
@@ -0,0 +1,14 @@
+// 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";
+};
+
+APT::Periodic::Update-Package-Lists "1";
+APT::Periodic::Download-Upgradeable-Packages "1";
+APT::Periodic::Unattended-Upgrade "1";
+
+Unattended-Upgrade::Mail "root";
diff --git a/files/Debian/50unattended-upgrades.lenny b/files/Debian/50unattended-upgrades.lenny
new file mode 100644
index 0000000..d55bb29
--- /dev/null
+++ b/files/Debian/50unattended-upgrades.lenny
@@ -0,0 +1,13 @@
+// this file is managed by puppet !
+
+Unattended-Upgrade::Allowed-Origins {
+	"Debian oldstable";
+	"Debian-Security oldstable";
+};
+
+APT::Periodic::Update-Package-Lists "1";
+APT::Periodic::Download-Upgradeable-Packages "1";
+APT::Periodic::Unattended-Upgrade "1";
+
+Unattended-Upgrade::Mail "root";
+
diff --git a/files/Debian/50unattended-upgrades.squeeze b/files/Debian/50unattended-upgrades.squeeze
new file mode 100644
index 0000000..38da1f4
--- /dev/null
+++ b/files/Debian/50unattended-upgrades.squeeze
@@ -0,0 +1,13 @@
+// this file is managed by puppet !
+
+Unattended-Upgrade::Allowed-Origins {
+        "${distro_id} stable";
+        "${distro_id} ${distro_codename}-security";
+        "${distro_id} ${distro_codename}-backports";
+};
+
+APT::Periodic::Update-Package-Lists "1";
+APT::Periodic::Download-Upgradeable-Packages "1";
+APT::Periodic::Unattended-Upgrade "1";
+
+Unattended-Upgrade::Mail "root";
diff --git a/files/Debian/50unattended-upgrades.wheezy b/files/Debian/50unattended-upgrades.wheezy
new file mode 100644
index 0000000..4463406
--- /dev/null
+++ b/files/Debian/50unattended-upgrades.wheezy
@@ -0,0 +1,14 @@
+// this file is managed by puppet !
+
+Unattended-Upgrade::Allowed-Origins {
+        "${distro_id}:testing";
+        "${distro_id}:${distro_codename}-security";
+        "${distro_id}:${distro_codename}-updates";
+        "${distro_id} Backports:${distro_codename}-backports";
+};
+
+APT::Periodic::Update-Package-Lists "1";
+APT::Periodic::Download-Upgradeable-Packages "1";
+APT::Periodic::Unattended-Upgrade "1";
+
+Unattended-Upgrade::Mail "root";
diff --git a/files/Ubuntu/50unattended-upgrades b/files/Ubuntu/50unattended-upgrades
new file mode 100644
index 0000000..25c7758
--- /dev/null
+++ b/files/Ubuntu/50unattended-upgrades
@@ -0,0 +1,16 @@
+// this file is managed by puppet !
+
+Unattended-Upgrade::Allowed-Origins {
+  "${distro_id}:${distro_codename}-security";
+  "${distro_id}:${distro_codename}-updates";
+  "${distro_id}:${distro_codename}-backports";
+  //"${distro_id}:${distro_codename}-proposed";
+};
+
+
+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/files/lenny/50unattended-upgrades b/files/lenny/50unattended-upgrades
deleted file mode 100644
index d55bb29..0000000
--- a/files/lenny/50unattended-upgrades
+++ /dev/null
@@ -1,13 +0,0 @@
-// this file is managed by puppet !
-
-Unattended-Upgrade::Allowed-Origins {
-	"Debian oldstable";
-	"Debian-Security oldstable";
-};
-
-APT::Periodic::Update-Package-Lists "1";
-APT::Periodic::Download-Upgradeable-Packages "1";
-APT::Periodic::Unattended-Upgrade "1";
-
-Unattended-Upgrade::Mail "root";
-
diff --git a/files/squeeze/50unattended-upgrades b/files/squeeze/50unattended-upgrades
deleted file mode 100644
index 0901ad3..0000000
--- a/files/squeeze/50unattended-upgrades
+++ /dev/null
@@ -1,14 +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";
-};
-
-APT::Periodic::Update-Package-Lists "1";
-APT::Periodic::Download-Upgradeable-Packages "1";
-APT::Periodic::Unattended-Upgrade "1";
-
-Unattended-Upgrade::Mail "root";
diff --git a/manifests/unattended_upgrades.pp b/manifests/unattended_upgrades.pp
index c538831..f74fc81 100644
--- a/manifests/unattended_upgrades.pp
+++ b/manifests/unattended_upgrades.pp
@@ -7,10 +7,10 @@ class apt::unattended_upgrades {
 
   apt_conf { '50unattended-upgrades':
     source  => [
-                "puppet:///modules/site_apt/${::lsbdistcodename}/50unattended-upgrades",
-                'puppet:///modules/site_apt/50unattended-upgrades',
-                "puppet:///modules/apt/${::lsbdistcodename}/50unattended-upgrades",
-                'puppet:///modules/apt/50unattended-upgrades' ],
+                "puppet:///modules/site_apt/${::lsbdistid}/50unattended-upgrades.${::lsbdistcodename}",
+                "puppet:///modules/site_apt/${::lsbdistid}/50unattended-upgrades",
+                "puppet:///modules/apt/${::lsbdistid}/50unattended-upgrades.${::lsbdistcodename}",
+                "puppet:///modules/apt/${::lsbdistid}/50unattended-upgrades" ],
     require => Package['unattended-upgrades'],
   }
 
-- 
cgit v1.2.3


From b45052b227b01c955226362ffd9deda9d2bb4103 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Sun, 26 May 2013 14:39:41 -0300
Subject: Updating unattended-upgrades squeeze config as oldstable (2)

---
 files/Debian/50unattended-upgrades.squeeze | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'files')

diff --git a/files/Debian/50unattended-upgrades.squeeze b/files/Debian/50unattended-upgrades.squeeze
index 38da1f4..8f4a926 100644
--- a/files/Debian/50unattended-upgrades.squeeze
+++ b/files/Debian/50unattended-upgrades.squeeze
@@ -1,9 +1,9 @@
 // this file is managed by puppet !
 
 Unattended-Upgrade::Allowed-Origins {
-        "${distro_id} stable";
-        "${distro_id} ${distro_codename}-security";
-        "${distro_id} ${distro_codename}-backports";
+	"Debian oldstable";
+	"Debian-Security oldstable";
+  "${distro_id} ${distro_codename}-backports";
 };
 
 APT::Periodic::Update-Package-Lists "1";
-- 
cgit v1.2.3


From 4b2e554f8f3a84433e71955664a71ae8123c0543 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Wed, 29 May 2013 12:51:18 -0300
Subject: Changing 'testing' to 'wheezy' on 50unattended-upgrades.wheezy

---
 files/Debian/50unattended-upgrades.wheezy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'files')

diff --git a/files/Debian/50unattended-upgrades.wheezy b/files/Debian/50unattended-upgrades.wheezy
index 4463406..0901ad3 100644
--- a/files/Debian/50unattended-upgrades.wheezy
+++ b/files/Debian/50unattended-upgrades.wheezy
@@ -1,7 +1,7 @@
 // this file is managed by puppet !
 
 Unattended-Upgrade::Allowed-Origins {
-        "${distro_id}:testing";
+        "${distro_id}:stable";
         "${distro_id}:${distro_codename}-security";
         "${distro_id}:${distro_codename}-updates";
         "${distro_id} Backports:${distro_codename}-backports";
-- 
cgit v1.2.3


From 2e3c8fe71cec14411ccee2736f342440a7fedb92 Mon Sep 17 00:00:00 2001
From: Gabriel Filion <gabster@lelutin.ca>
Date: Fri, 31 May 2013 10:56:23 -0400
Subject: Regression: lost MailOnlyOnError for unattended-upgrades

Since only wheezy supports it, let's add it back only for wheezy.

Signed-off-by: Gabriel Filion <gabster@lelutin.ca>
---
 files/Debian/50unattended-upgrades.wheezy | 1 +
 1 file changed, 1 insertion(+)

(limited to 'files')

diff --git a/files/Debian/50unattended-upgrades.wheezy b/files/Debian/50unattended-upgrades.wheezy
index 0901ad3..e787bf5 100644
--- a/files/Debian/50unattended-upgrades.wheezy
+++ b/files/Debian/50unattended-upgrades.wheezy
@@ -12,3 +12,4 @@ APT::Periodic::Download-Upgradeable-Packages "1";
 APT::Periodic::Unattended-Upgrade "1";
 
 Unattended-Upgrade::Mail "root";
+Unattended-Upgrade::MailOnlyOnError "true";
-- 
cgit v1.2.3


From 5a8d214529429b5dd898e0df29d69e0acf5271df Mon Sep 17 00:00:00 2001
From: Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>
Date: Tue, 28 Oct 2014 14:02:57 -0400
Subject: Change default 50unattended-upgrades on Debian

* Use squeeze-lts origin on squeeze
* All other releases use newer Origins-Pattern format
* Drop support for lenny
---
 files/Debian/50unattended-upgrades         | 12 ++++++------
 files/Debian/50unattended-upgrades.lenny   | 13 -------------
 files/Debian/50unattended-upgrades.squeeze |  7 ++++---
 files/Debian/50unattended-upgrades.wheezy  | 15 ---------------
 4 files changed, 10 insertions(+), 37 deletions(-)
 delete mode 100644 files/Debian/50unattended-upgrades.lenny
 delete mode 100644 files/Debian/50unattended-upgrades.wheezy

(limited to 'files')

diff --git a/files/Debian/50unattended-upgrades b/files/Debian/50unattended-upgrades
index 0901ad3..88f4ab8 100644
--- a/files/Debian/50unattended-upgrades
+++ b/files/Debian/50unattended-upgrades
@@ -1,11 +1,11 @@
 // 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";
-};
+Unattended-Upgrade::Origins-Pattern {
+//      "o=Debian,n=${distro-codename}";
+//      "o=Debian,n=${distro-codename}-updates";
+//      "o=Debian,n=${distro_codename}-proposed-updates";
+        "o=Debian,n=${distro_codename},l=Debian-Security";
+}
 
 APT::Periodic::Update-Package-Lists "1";
 APT::Periodic::Download-Upgradeable-Packages "1";
diff --git a/files/Debian/50unattended-upgrades.lenny b/files/Debian/50unattended-upgrades.lenny
deleted file mode 100644
index d55bb29..0000000
--- a/files/Debian/50unattended-upgrades.lenny
+++ /dev/null
@@ -1,13 +0,0 @@
-// this file is managed by puppet !
-
-Unattended-Upgrade::Allowed-Origins {
-	"Debian oldstable";
-	"Debian-Security oldstable";
-};
-
-APT::Periodic::Update-Package-Lists "1";
-APT::Periodic::Download-Upgradeable-Packages "1";
-APT::Periodic::Unattended-Upgrade "1";
-
-Unattended-Upgrade::Mail "root";
-
diff --git a/files/Debian/50unattended-upgrades.squeeze b/files/Debian/50unattended-upgrades.squeeze
index 8f4a926..e7ba290 100644
--- a/files/Debian/50unattended-upgrades.squeeze
+++ b/files/Debian/50unattended-upgrades.squeeze
@@ -1,9 +1,10 @@
 // this file is managed by puppet !
 
 Unattended-Upgrade::Allowed-Origins {
-	"Debian oldstable";
-	"Debian-Security oldstable";
-  "${distro_id} ${distro_codename}-backports";
+//  "${distro-id} oldstable";
+//  "${distro_id} ${distro_codename}-backports";
+    "${distro-id} ${distro-codename}-security";
+    "${distro-id} ${distro-codename}-lts";
 };
 
 APT::Periodic::Update-Package-Lists "1";
diff --git a/files/Debian/50unattended-upgrades.wheezy b/files/Debian/50unattended-upgrades.wheezy
deleted file mode 100644
index e787bf5..0000000
--- a/files/Debian/50unattended-upgrades.wheezy
+++ /dev/null
@@ -1,15 +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";
-};
-
-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


From 0a1eee280f8fad6cdcdde806ffb1d172877da505 Mon Sep 17 00:00:00 2001
From: Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>
Date: Wed, 29 Oct 2014 18:14:36 -0400
Subject: Fix default 50unattended-upgrades because of Debian bug #704087

---
 files/Debian/50unattended-upgrades | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'files')

diff --git a/files/Debian/50unattended-upgrades b/files/Debian/50unattended-upgrades
index 88f4ab8..78c7187 100644
--- a/files/Debian/50unattended-upgrades
+++ b/files/Debian/50unattended-upgrades
@@ -1,10 +1,7 @@
 // this file is managed by puppet !
 
 Unattended-Upgrade::Origins-Pattern {
-//      "o=Debian,n=${distro-codename}";
-//      "o=Debian,n=${distro-codename}-updates";
-//      "o=Debian,n=${distro_codename}-proposed-updates";
-        "o=Debian,n=${distro_codename},l=Debian-Security";
+        "o=Debian,a=stable,l=Debian-Security";
 }
 
 APT::Periodic::Update-Package-Lists "1";
-- 
cgit v1.2.3


From fb9e13eebf00af2cd6a92eb600a1dd85d3eec5b2 Mon Sep 17 00:00:00 2001
From: Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>
Date: Wed, 29 Oct 2014 18:40:16 -0400
Subject: Add oldstable to default 50unattended-upgrades

---
 files/Debian/50unattended-upgrades | 1 +
 1 file changed, 1 insertion(+)

(limited to 'files')

diff --git a/files/Debian/50unattended-upgrades b/files/Debian/50unattended-upgrades
index 78c7187..075f680 100644
--- a/files/Debian/50unattended-upgrades
+++ b/files/Debian/50unattended-upgrades
@@ -1,6 +1,7 @@
 // this file is managed by puppet !
 
 Unattended-Upgrade::Origins-Pattern {
+        "o=Debian,a=oldstable,l=Debian-Security";
         "o=Debian,a=stable,l=Debian-Security";
 }
 
-- 
cgit v1.2.3


From c9ae59e1b72d41518160ff4c7b430573b10254a3 Mon Sep 17 00:00:00 2001
From: Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>
Date: Fri, 31 Oct 2014 14:09:59 -0400
Subject: Fixes placeholders in 50unattended-upgrades.squeeze

---
 files/Debian/50unattended-upgrades.squeeze | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'files')

diff --git a/files/Debian/50unattended-upgrades.squeeze b/files/Debian/50unattended-upgrades.squeeze
index e7ba290..77f715d 100644
--- a/files/Debian/50unattended-upgrades.squeeze
+++ b/files/Debian/50unattended-upgrades.squeeze
@@ -3,8 +3,8 @@
 Unattended-Upgrade::Allowed-Origins {
 //  "${distro-id} oldstable";
 //  "${distro_id} ${distro_codename}-backports";
-    "${distro-id} ${distro-codename}-security";
-    "${distro-id} ${distro-codename}-lts";
+    "${distro_id} ${distro_codename}-security";
+    "${distro_id} ${distro_codename}-lts";
 };
 
 APT::Periodic::Update-Package-Lists "1";
-- 
cgit v1.2.3


From 9192785c452ce2cfa0f58984d3aebdcaf841113a Mon Sep 17 00:00:00 2001
From: Gabriel Filion <gabster@lelutin.ca>
Date: Sat, 27 Jul 2013 13:38:27 -0400
Subject: make it possible to opt out of MailOnlyOnError

This combines all files into one template. It should make maintenance
easier.
---
 files/Debian/50unattended-upgrades         | 12 ------------
 files/Debian/50unattended-upgrades.squeeze | 14 --------------
 files/Ubuntu/50unattended-upgrades         | 16 ----------------
 manifests/unattended_upgrades.pp           | 16 ++++++++++------
 templates/50unattended-upgrades.erb        | 26 ++++++++++++++++++++++++++
 5 files changed, 36 insertions(+), 48 deletions(-)
 delete mode 100644 files/Debian/50unattended-upgrades
 delete mode 100644 files/Debian/50unattended-upgrades.squeeze
 delete mode 100644 files/Ubuntu/50unattended-upgrades
 create mode 100644 templates/50unattended-upgrades.erb

(limited to 'files')

diff --git a/files/Debian/50unattended-upgrades b/files/Debian/50unattended-upgrades
deleted file mode 100644
index 075f680..0000000
--- a/files/Debian/50unattended-upgrades
+++ /dev/null
@@ -1,12 +0,0 @@
-// this file is managed by puppet !
-
-Unattended-Upgrade::Origins-Pattern {
-        "o=Debian,a=oldstable,l=Debian-Security";
-        "o=Debian,a=stable,l=Debian-Security";
-}
-
-APT::Periodic::Update-Package-Lists "1";
-APT::Periodic::Download-Upgradeable-Packages "1";
-APT::Periodic::Unattended-Upgrade "1";
-
-Unattended-Upgrade::Mail "root";
diff --git a/files/Debian/50unattended-upgrades.squeeze b/files/Debian/50unattended-upgrades.squeeze
deleted file mode 100644
index 77f715d..0000000
--- a/files/Debian/50unattended-upgrades.squeeze
+++ /dev/null
@@ -1,14 +0,0 @@
-// this file is managed by puppet !
-
-Unattended-Upgrade::Allowed-Origins {
-//  "${distro-id} oldstable";
-//  "${distro_id} ${distro_codename}-backports";
-    "${distro_id} ${distro_codename}-security";
-    "${distro_id} ${distro_codename}-lts";
-};
-
-APT::Periodic::Update-Package-Lists "1";
-APT::Periodic::Download-Upgradeable-Packages "1";
-APT::Periodic::Unattended-Upgrade "1";
-
-Unattended-Upgrade::Mail "root";
diff --git a/files/Ubuntu/50unattended-upgrades b/files/Ubuntu/50unattended-upgrades
deleted file mode 100644
index 25c7758..0000000
--- a/files/Ubuntu/50unattended-upgrades
+++ /dev/null
@@ -1,16 +0,0 @@
-// this file is managed by puppet !
-
-Unattended-Upgrade::Allowed-Origins {
-  "${distro_id}:${distro_codename}-security";
-  "${distro_id}:${distro_codename}-updates";
-  "${distro_id}:${distro_codename}-backports";
-  //"${distro_id}:${distro_codename}-proposed";
-};
-
-
-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/manifests/unattended_upgrades.pp b/manifests/unattended_upgrades.pp
index 80939e3..b63b483 100644
--- a/manifests/unattended_upgrades.pp
+++ b/manifests/unattended_upgrades.pp
@@ -1,15 +1,19 @@
-class apt::unattended_upgrades {
+class apt::unattended_upgrades (
+  $config_content = undef,
+  $mailonlyonerror = true,
+) {
 
   package { 'unattended-upgrades':
     ensure  => present
   }
 
+  $file_content = $config_content ? {
+    undef   => template('apt/50unattended-upgrades.erb'),
+    default => $config_content
+  }
+
   apt_conf { '50unattended-upgrades':
-    source  => [
-                "puppet:///modules/site_apt/${::lsbdistid}/50unattended-upgrades.${::lsbdistcodename}",
-                "puppet:///modules/site_apt/${::lsbdistid}/50unattended-upgrades",
-                "puppet:///modules/apt/${::lsbdistid}/50unattended-upgrades.${::lsbdistcodename}",
-                "puppet:///modules/apt/${::lsbdistid}/50unattended-upgrades" ],
+    content => $file_content,
     require => Package['unattended-upgrades'],
   }
 }
diff --git a/templates/50unattended-upgrades.erb b/templates/50unattended-upgrades.erb
new file mode 100644
index 0000000..0ba0d7e
--- /dev/null
+++ b/templates/50unattended-upgrades.erb
@@ -0,0 +1,26 @@
+// this file is managed by puppet !
+
+Unattended-Upgrade::Allowed-Origins {
+<% if scope.lookupvar('::operatingsystem') == 'Ubuntu' -%>
+  "${distro_id}:${distro_codename}-security";
+  "${distro_id}:${distro_codename}-updates";
+  "${distro_id}:${distro_codename}-backports";
+<% else -%>
+<% if scope.lookupvar('::lsbdistcodename') == 'squeeze' -%>
+  "${distro-id} ${distro-codename}-security";
+  "${distro-id} ${distro-codename}-lts";
+<% else -%>
+  # See Debian bug #704087
+  "o=Debian,a=oldstable,l=Debian-Security";
+  "o=Debian,a=stable,l=Debian-Security";
+<% end -%>
+};
+
+APT::Periodic::Update-Package-Lists "1";
+APT::Periodic::Download-Upgradeable-Packages "1";
+APT::Periodic::Unattended-Upgrade "1";
+
+Unattended-Upgrade::Mail "root";
+<% if mailonlyonerror -%>
+Unattended-Upgrade::MailOnlyOnError "true";
+<% end -%>
-- 
cgit v1.2.3