Merge branch 'master' into 'master'

Fix error in 50unattended-upgrades.erb syntax, remove lsb fact

See merge request !10
This commit is contained in:
Micah 2015-05-06 17:58:37 +00:00
commit d483ddbbf0

View file

@ -5,8 +5,7 @@ Unattended-Upgrade::Allowed-Origins {
"${distro_id}:${distro_codename}-security";
"${distro_id}:${distro_codename}-updates";
"${distro_id}:${distro_codename}-backports";
<% else -%>
<% if scope.lookupvar('::lsbdistcodename') == 'squeeze' -%>
<% elsif scope.lookupvar('::operatingsystem') == 'Debian' and scope.lookupvar('::operatingsystemmajrelease') == 6 -%>
"${distro-id} ${distro-codename}-security";
"${distro-id} ${distro-codename}-lts";
<% else -%>