diff options
| author | intrigeri <intrigeri@boum.org> | 2010-11-21 16:50:43 +0100 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2010-11-21 16:50:43 +0100 |
| commit | 3de76e7b05224b9696a75908b0a4259349e20823 (patch) | |
| tree | 428799424b34d7911e6dd39a0ab2ef94c7900525 /manifests/unattended_upgrades.pp | |
| parent | f25a8a91099d6c1ef512a5fb21581abc62e1519a (diff) | |
| parent | 92aa5a51e95d74604a40318558aa98f70fcf7720 (diff) | |
Merge commit '92aa5a51e95d74604a40318558aa98f70fcf7720'.
A bunch of painlessly merged commits.
Conflicts:
manifests/init.pp
Diffstat (limited to 'manifests/unattended_upgrades.pp')
| -rw-r--r-- | manifests/unattended_upgrades.pp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/manifests/unattended_upgrades.pp b/manifests/unattended_upgrades.pp index fb04193..f52448d 100644 --- a/manifests/unattended_upgrades.pp +++ b/manifests/unattended_upgrades.pp @@ -7,8 +7,12 @@ class apt::unattended_upgrades { apt_conf { "50unattended-upgrades": source => ["puppet:///modules/site-apt/50unattended-upgrades", "puppet:///modules/apt/50unattended-upgrades" ], - - before => Concatenated_file[apt_config], require => Package['unattended-upgrades'], } + + if $custom_preferences != false { + Apt_conf["50unattended-upgrades"] { + before => Concatenated_file[apt_config], + } + } } |