diff options
| author | varac <varacanero@zeromail.org> | 2013-04-14 14:55:15 +0200 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2013-04-14 14:55:15 +0200 |
| commit | cd87ef7ff8a7af82575e2a3b254e469b2da412f2 (patch) | |
| tree | 5c92e64727696c3884babe4615172338a78fc742 /manifests | |
| parent | dcbf50776f4cb6fc2e1e2a9065e1a7308025d5b9 (diff) | |
| parent | 355372f31cc93ea975c89dc2977d942ee048fe9d (diff) | |
| download | puppet-apt-cd87ef7ff8a7af82575e2a3b254e469b2da412f2.tar.gz puppet-apt-cd87ef7ff8a7af82575e2a3b254e469b2da412f2.tar.bz2 | |
Merge branch 'nadir_issue_4227' into nadir_master
Conflicts:
manifests/unattended_upgrades.pp
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/unattended_upgrades.pp | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/manifests/unattended_upgrades.pp b/manifests/unattended_upgrades.pp index b9d19c3..a038cab 100644 --- a/manifests/unattended_upgrades.pp +++ b/manifests/unattended_upgrades.pp @@ -6,17 +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 - } - - Apt_conf['50unattended-upgrades'] { - notify => undef + 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'], } if $apt::custom_preferences != false { |