diff options
author | varac <varacanero@zeromail.org> | 2015-12-09 16:31:35 +0100 |
---|---|---|
committer | varac <varacanero@zeromail.org> | 2015-12-13 17:56:17 +0100 |
commit | d67dfe4beb6cc21660281a5c02a4c4b7a061fa1c (patch) | |
tree | 80cd3cafaa51cd9bd15ad12ff7b0d1219d058fb4 | |
parent | abe5212b01a9ed889a486795b26e845f56e334a2 (diff) |
[feat] Don't run an additional apt-get update
When adding custom keys, an additional `apt-get update` would
be run before the Exec['refresh_apt'], which don't make sense.
-rw-r--r-- | manifests/init.pp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index 6732ade..1e7ddd7 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -123,17 +123,14 @@ class apt( mode => '0755', } exec { 'custom_keys': - command => "find ${apt_base_dir}/keys.d -type f -exec apt-key add '{}' \\; && /usr/bin/apt-get update", + command => "find ${apt_base_dir}/keys.d -type f -exec apt-key add '{}' \\;", subscribe => File["${apt_base_dir}/keys.d"], refreshonly => true, + notify => Exec[refresh_apt] } if $custom_preferences != false { Exec['custom_keys'] { - before => [ Exec[refresh_apt], File['apt_config'] ] - } - } else { - Exec['custom_keys'] { - before => Exec[refresh_apt] + before => File['apt_config'] } } } |