summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--files/Debian/50unattended-upgrades12
-rw-r--r--files/Debian/50unattended-upgrades.lenny13
-rw-r--r--files/Debian/50unattended-upgrades.squeeze7
-rw-r--r--files/Debian/50unattended-upgrades.wheezy15
4 files changed, 10 insertions, 37 deletions
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";