Merge branch 'master' into 'master'

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

View file

@ -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 -%>
};