diff options
author | Gabriel Filion <lelutin@gmail.com> | 2010-10-25 12:17:50 -0400 |
---|---|---|
committer | Gabriel Filion <lelutin@gmail.com> | 2010-10-25 14:15:12 -0400 |
commit | 4ebb7d463ed6e85a715f0a311378bf673a907042 (patch) | |
tree | e5635c1b42e2e1f71643126c0c58a55db29adeee /manifests/unattended_upgrades.pp | |
parent | 26714ae4d2992c85082ec37e6c40d725d097f79a (diff) | |
download | puppet-apt-4ebb7d463ed6e85a715f0a311378bf673a907042.tar.gz puppet-apt-4ebb7d463ed6e85a715f0a311378bf673a907042.tar.bz2 |
Fix apt::preferences::absent
Currently, setting the $custom_preferences variable to false fails
because of the /etc/apt/preferences concatenated_file being re-defined.
Fix this by setting dependencies on the resource only when we expect to
create the /etc/apt/preferences file. Also, since there is no "ensure"
parameter to concatenated_file, use a simple file resource to ensure
that it is removed.
Signed-off-by: Gabriel Filion <lelutin@gmail.com>
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], + } + } } |