diff options
author | Micah Anderson <micah@riseup.net> | 2013-06-25 16:57:07 -0400 |
---|---|---|
committer | Micah Anderson <micah@riseup.net> | 2013-06-25 16:57:07 -0400 |
commit | 8f58a40ad81b32e1abed80485d388753deafb87b (patch) | |
tree | 327fb24935966e567675ede5c57bb1b579c63061 /manifests/unattended_upgrades.pp | |
parent | f11e3d475345059220402a44a97da491c85d2b5a (diff) | |
parent | 2e3c8fe71cec14411ccee2736f342440a7fedb92 (diff) |
Merge branch 'bug/fix_push' into leap
This gets us fixes for the unattended_upgrades in wheezy, as well as the custom_key_dir class parameter replacement of the global variable
Conflicts:
manifests/unattended_upgrades.pp
Diffstat (limited to 'manifests/unattended_upgrades.pp')
-rw-r--r-- | manifests/unattended_upgrades.pp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/manifests/unattended_upgrades.pp b/manifests/unattended_upgrades.pp index 3492e5f..17455fe 100644 --- a/manifests/unattended_upgrades.pp +++ b/manifests/unattended_upgrades.pp @@ -6,13 +6,12 @@ class apt::unattended_upgrades { } apt_conf { '50unattended-upgrades': - source => [ - "puppet:///modules/site_apt/${::lsbdistcodename}/50unattended-upgrades", - 'puppet:///modules/site_apt/50unattended-upgrades', - "puppet:///modules/apt/${::lsbdistcodename}/50unattended-upgrades", - 'puppet:///modules/apt/50unattended-upgrades' ], - require => Package['unattended-upgrades'], - refresh_apt => false + source => [ + "puppet:///modules/site_apt/${::lsbdistid}/50unattended-upgrades.${::lsbdistcodename}", + "puppet:///modules/site_apt/${::lsbdistid}/50unattended-upgrades", + "puppet:///modules/apt/${::lsbdistid}/50unattended-upgrades.${::lsbdistcodename}", + "puppet:///modules/apt/${::lsbdistid}/50unattended-upgrades" ], + require => Package['unattended-upgrades'], } Apt_conf['50unattended-upgrades'] { |