diff options
| author | Matt Taggart <taggart@riseup.net> | 2015-05-06 21:47:46 +0000 |
|---|---|---|
| committer | Matt Taggart <taggart@riseup.net> | 2015-05-06 21:47:46 +0000 |
| commit | a28c04239cac7be6381b7259714696ce1a18fde7 (patch) | |
| tree | 975c64667c3269ee4b69a212e86ef8c503257f2d | |
| parent | a4d788d778ad9b517c840c157d0c0119443c6ac9 (diff) | |
| parent | 90a51c3ef89689e0659574336db20f4a2d014f53 (diff) | |
| download | puppet-apt-a28c04239cac7be6381b7259714696ce1a18fde7.tar.gz puppet-apt-a28c04239cac7be6381b7259714696ce1a18fde7.tar.bz2 | |
Merge branch 'master' into 'master'
Fix 50unattended-upgrades template for squeeze, better pattern for later release
See merge request !12
| -rw-r--r-- | templates/50unattended-upgrades.erb | 13 |
1 files changed, 7 insertions, 6 deletions
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 -%> }; |