diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2013-01-18 10:51:59 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2013-01-18 10:51:59 -0200 |
| commit | c2219fa645251599b797b2574e6a68212d676f66 (patch) | |
| tree | b2b5cb63bee1abc3f2ae31b81cd417b292355b6c /manifests/unattended_upgrades.pp | |
| parent | 8bfd579a82b6f824b0184bb2e33a384254426eec (diff) | |
| parent | 14670466be5eceba043e697d5f6f0f0ada9d5b07 (diff) | |
| download | puppet-apt-c2219fa645251599b797b2574e6a68212d676f66.tar.gz puppet-apt-c2219fa645251599b797b2574e6a68212d676f66.tar.bz2 | |
Merge branch 'master' of git://labs.riseup.net/shared-apt
Conflicts:
templates/Ubuntu/sources.list.erb
Diffstat (limited to 'manifests/unattended_upgrades.pp')
| -rw-r--r-- | manifests/unattended_upgrades.pp | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/manifests/unattended_upgrades.pp b/manifests/unattended_upgrades.pp index 23d9bd7..4f1eb20 100644 --- a/manifests/unattended_upgrades.pp +++ b/manifests/unattended_upgrades.pp @@ -1,21 +1,22 @@ class apt::unattended_upgrades { package { 'unattended-upgrades': - ensure => present, + ensure => present, require => undef, } - 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" ], + 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'], } - if $custom_preferences != false { - Apt_conf["50unattended-upgrades"] { - before => Concat[apt_config], + if $apt::custom_preferences != false { + Apt_conf['50unattended-upgrades'] { + before => File['apt_config'], } } |