diff options
| author | Varac <varac@leap.se> | 2017-06-27 19:58:25 +0200 |
|---|---|---|
| committer | Varac <varac@leap.se> | 2017-06-27 19:58:25 +0200 |
| commit | 4557c84397916e99313577e24062a772921fca0e (patch) | |
| tree | 73110cd07b1c15bf3458b5eaa4e3b3ea73596f95 | |
| parent | e24292f13a6bef60ee7b8f2aa0ac2174ad96397e (diff) | |
| parent | fc907004a75ab2f8f8302706150b68a9cdd6baf0 (diff) | |
Merge branch 'fix_unattended_upgrades'
3 files changed, 6 insertions, 8 deletions
diff --git a/puppet/modules/site_apt/files/Debian/51unattended-upgrades-leap b/puppet/modules/site_apt/files/Debian/51unattended-upgrades-leap deleted file mode 100644 index bbaac6a2..00000000 --- a/puppet/modules/site_apt/files/Debian/51unattended-upgrades-leap +++ /dev/null @@ -1,6 +0,0 @@ -// this file is managed by puppet ! - -Unattended-Upgrade::Allowed-Origins { - "leap.se:stable"; -} - diff --git a/puppet/modules/site_apt/manifests/unattended_upgrades.pp b/puppet/modules/site_apt/manifests/unattended_upgrades.pp index 42f1f4c6..ddadd35a 100644 --- a/puppet/modules/site_apt/manifests/unattended_upgrades.pp +++ b/puppet/modules/site_apt/manifests/unattended_upgrades.pp @@ -11,8 +11,7 @@ class site_apt::unattended_upgrades { # configure LEAP upgrades apt::apt_conf { '51unattended-upgrades-leap': - source => [ - "puppet:///modules/site_apt/${::lsbdistid}/51unattended-upgrades-leap"], + content => template('site_apt/51unattended-upgrades-leap'), require => Package['unattended-upgrades'], refresh_apt => false, } diff --git a/puppet/modules/site_apt/templates/51unattended-upgrades-leap b/puppet/modules/site_apt/templates/51unattended-upgrades-leap new file mode 100644 index 00000000..3e28531f --- /dev/null +++ b/puppet/modules/site_apt/templates/51unattended-upgrades-leap @@ -0,0 +1,5 @@ +// this file is managed by puppet ! + +Unattended-Upgrade::Origins-Pattern { + "site=deb.leap.se,component=<%= @apt_platform_component %>"; +} |