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/init.pp | |
parent | f25a8a91099d6c1ef512a5fb21581abc62e1519a (diff) | |
parent | 92aa5a51e95d74604a40318558aa98f70fcf7720 (diff) |
Merge commit '92aa5a51e95d74604a40318558aa98f70fcf7720'.
A bunch of painlessly merged commits.
Conflicts:
manifests/init.pp
Diffstat (limited to 'manifests/init.pp')
-rw-r--r-- | manifests/init.pp | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index 54b4fe4..c48cb6e 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -104,6 +104,8 @@ class apt { include apt::preferences::absent } default: { + # When squeeze becomes the stable branch, transform this file's header + # into a preferences.d file include apt::preferences } } @@ -119,12 +121,13 @@ class apt { ], } - if $apt_unattended_upgrades { - include apt::unattended_upgrades - } - - # watch apt.conf.d + # watch .d directories and ensure they are present file { "/etc/apt/apt.conf.d": ensure => directory, checksum => mtime; } + file { "/etc/apt/sources.list.d": + ensure => directory, + checksum => mtime, + notify => Exec['refresh_apt'], + } exec { # "&& sleep 1" is workaround for older(?) clients @@ -164,7 +167,11 @@ class apt { alias => "custom_keys", subscribe => File["${apt_base_dir}/keys.d"], refreshonly => true, - before => Concatenated_file[apt_config]; + } + if $custom_preferences != false { + Exec["custom_keys"] { + before => Concatenated_file[apt_config], + } } } |