diff options
| author | Micah <micah@riseup.net> | 2015-05-06 17:58:37 +0000 |
|---|---|---|
| committer | Micah <micah@riseup.net> | 2015-05-06 17:58:37 +0000 |
| commit | d483ddbbf0801345433e8b46e6b6976814266f6b (patch) | |
| tree | b1b65b72ec1f699952a2436feab6800d72593dc1 | |
| parent | 74db9ebf282b7ef4488ae8e6b82652d1a2e7eac1 (diff) | |
| parent | f1a53bcfa7702f3bd1f86486d10b1f10cd0f2663 (diff) | |
| download | puppet-apt-d483ddbbf0801345433e8b46e6b6976814266f6b.tar.gz puppet-apt-d483ddbbf0801345433e8b46e6b6976814266f6b.tar.bz2 | |
Merge branch 'master' into 'master'
Fix error in 50unattended-upgrades.erb syntax, remove lsb fact
See merge request !10
| -rw-r--r-- | templates/50unattended-upgrades.erb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/templates/50unattended-upgrades.erb b/templates/50unattended-upgrades.erb index 4492c2d..94059d5 100644 --- a/templates/50unattended-upgrades.erb +++ b/templates/50unattended-upgrades.erb @@ -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 -%> |