From 90a51c3ef89689e0659574336db20f4a2d014f53 Mon Sep 17 00:00:00 2001 From: Jerome Charaoui Date: Wed, 6 May 2015 17:14:53 -0400 Subject: Fix 50unattended-upgrades template for squeeze, better pattern for later release --- templates/50unattended-upgrades.erb | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'templates') diff --git a/templates/50unattended-upgrades.erb b/templates/50unattended-upgrades.erb index 94059d5..2bcfab0 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 { + "o=Debian,l=Debian-Security"; + "o=Debian,a=${distro-id}-lts"; <% end -%> }; -- cgit v1.2.3 From 07424069c2cb66c484e2bfe160a1aba2efd610ce Mon Sep 17 00:00:00 2001 From: Jerome Charaoui Date: Thu, 7 May 2015 12:52:25 -0400 Subject: Fix typos in unattended-upgrades template --- templates/50unattended-upgrades.erb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'templates') diff --git a/templates/50unattended-upgrades.erb b/templates/50unattended-upgrades.erb index 2bcfab0..73ffa60 100644 --- a/templates/50unattended-upgrades.erb +++ b/templates/50unattended-upgrades.erb @@ -7,12 +7,12 @@ Unattended-Upgrade::Allowed-Origins { "${distro_id}:${distro_codename}-backports"; <% elsif scope.lookupvar('::operatingsystem') == 'Debian' and scope.lookupvar('::operatingsystemmajrelease') == 6 -%> Unattended-Upgrade::Allowed-Origins { - "${distro-id}:oldoldstable"; - "${distro-id}:squeeze-lts"; + "${distro_id}:oldoldstable"; + "${distro_id}:squeeze-lts"; <% else -%> Unattended-Upgrade::Origins-Pattern { "o=Debian,l=Debian-Security"; - "o=Debian,a=${distro-id}-lts"; + "o=Debian,a=${distro_id}-lts"; <% end -%> }; @@ -21,7 +21,7 @@ Unattended-Upgrade::Package-Blacklist { <% @blacklisted_packages.each do |pkg| -%> "<%= pkg %>"; <% end -%> -} +}; <% end -%> APT::Periodic::Update-Package-Lists "1"; -- cgit v1.2.3 From ae4771b452332fdec335891cfed2c200b566d2f3 Mon Sep 17 00:00:00 2001 From: Jerome Charaoui Date: Thu, 7 May 2015 18:37:24 -0400 Subject: Adjusted sources.list template: LTS is now 'oldoldstable' --- templates/Debian/sources.list.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'templates') diff --git a/templates/Debian/sources.list.erb b/templates/Debian/sources.list.erb index 37f1c35..d043b70 100644 --- a/templates/Debian/sources.list.erb +++ b/templates/Debian/sources.list.erb @@ -43,7 +43,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 %> -- cgit v1.2.3 From 87bfb868d7625100086a26a81743f5adbabbb988 Mon Sep 17 00:00:00 2001 From: Jerome Charaoui Date: Mon, 11 May 2015 09:55:26 -0400 Subject: Avoid unattended security upgrades from stable if running oldstable --- templates/50unattended-upgrades.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'templates') diff --git a/templates/50unattended-upgrades.erb b/templates/50unattended-upgrades.erb index 73ffa60..23c5c89 100644 --- a/templates/50unattended-upgrades.erb +++ b/templates/50unattended-upgrades.erb @@ -11,8 +11,8 @@ Unattended-Upgrade::Allowed-Origins { "${distro_id}:squeeze-lts"; <% else -%> Unattended-Upgrade::Origins-Pattern { - "o=Debian,l=Debian-Security"; - "o=Debian,a=${distro_id}-lts"; + "origin=Debian,archive=<%= scope.lookupvar('::apt::release') %>,label=Debian-Security"; + "origin=Debian,archive=${distro_codename}-lts"; <% end -%> }; -- cgit v1.2.3 From 5ea69cb0390deac15d57aefc361a895a0c9a6e96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antoine=20Beaupr=C3=A9?= Date: Tue, 9 Jun 2015 11:25:34 -0400 Subject: allow possibility of disabling backports --- templates/Debian/sources.list.erb | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'templates') diff --git a/templates/Debian/sources.list.erb b/templates/Debian/sources.list.erb index d043b70..a19893d 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_volatile=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') -%> -- cgit v1.2.3 From dbee5c9487c8d06f27f1a3bb17f70bf870490258 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antoine=20Beaupr=C3=A9?= Date: Tue, 9 Jun 2015 11:28:54 -0400 Subject: typo --- templates/Debian/sources.list.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'templates') diff --git a/templates/Debian/sources.list.erb b/templates/Debian/sources.list.erb index a19893d..ce43135 100644 --- a/templates/Debian/sources.list.erb +++ b/templates/Debian/sources.list.erb @@ -19,7 +19,7 @@ deb-src <%= security_url %> <%= codename %>/updates <%= lrepos %> # There is no security support for <%= release %> <% end -%> -<% if use_volatile=scope.lookupvar('apt::use_backports') -%> +<% if use_backports=scope.lookupvar('apt::use_backports') -%> # backports <% if (release == "testing" || release == "unstable" || release == "experimental") -%> # There is no backports archive for <%= release %> -- cgit v1.2.3 From 3da1db27075082603a862c8fd5c3c1396e062bc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antoine=20Beaupr=C3=A9?= Date: Tue, 9 Jun 2015 11:34:51 -0400 Subject: also control backports on ubuntu --- templates/Ubuntu/sources.list.erb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'templates') diff --git a/templates/Ubuntu/sources.list.erb b/templates/Ubuntu/sources.list.erb index 8d2585d..f3ef37c 100644 --- a/templates/Ubuntu/sources.list.erb +++ b/templates/Ubuntu/sources.list.erb @@ -19,8 +19,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 -%> -- cgit v1.2.3 From d87876a16fdf6cb710210b1a11572d553dec755a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antoine=20Beaupr=C3=A9?= Date: Tue, 9 Jun 2015 11:35:41 -0400 Subject: also disable volatile on ubuntu if relevant --- templates/Ubuntu/sources.list.erb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'templates') diff --git a/templates/Ubuntu/sources.list.erb b/templates/Ubuntu/sources.list.erb index f3ef37c..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 %> -- cgit v1.2.3