opuppet/module-apt
4
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' into 'master'

Browse source 
Fix 50unattended-upgrades template for squeeze, better pattern for later release

See merge request !12
This commit is contained in:
Matt Taggart 2015-05-06 21:47:46 +00:00
commit a28c04239c
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
templates/50unattended-upgrades.erb
View file

@ -1,17 +1,18 @@
// this file is managed by puppet ! // this file is managed by puppet !
Unattended-Upgrade::Allowed-Origins {
<% if scope.lookupvar('::operatingsystem') == 'Ubuntu' -%> <% if scope.lookupvar('::operatingsystem') == 'Ubuntu' -%>
Unattended-Upgrade::Allowed-Origins {
"${distro_id}:${distro_codename}-security"; "${distro_id}:${distro_codename}-security";
"${distro_id}:${distro_codename}-updates"; "${distro_id}:${distro_codename}-updates";
"${distro_id}:${distro_codename}-backports"; "${distro_id}:${distro_codename}-backports";
<% elsif scope.lookupvar('::operatingsystem') == 'Debian' and scope.lookupvar('::operatingsystemmajrelease') == 6 -%> <% elsif scope.lookupvar('::operatingsystem') == 'Debian' and scope.lookupvar('::operatingsystemmajrelease') == 6 -%>
"${distro-id} ${distro-codename}-security"; Unattended-Upgrade::Allowed-Origins {
"${distro-id} ${distro-codename}-lts"; "${distro-id}:oldoldstable";
"${distro-id}:squeeze-lts";
<% else -%> <% else -%>
# See Debian bug #704087 Unattended-Upgrade::Origins-Pattern {
"o=Debian,a=oldstable,l=Debian-Security"; "o=Debian,l=Debian-Security";
"o=Debian,a=stable,l=Debian-Security"; "o=Debian,a=${distro-id}-lts";
<% end -%> <% end -%>
}; };