From 5a8d214529429b5dd898e0df29d69e0acf5271df Mon Sep 17 00:00:00 2001 From: Jerome Charaoui 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 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 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 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 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 ---------------- 3 files changed, 42 deletions(-) delete mode 100644 files/Debian/50unattended-upgrades delete mode 100644 files/Debian/50unattended-upgrades.squeeze delete mode 100644 files/Ubuntu/50unattended-upgrades (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"; -- cgit v1.2.3