opuppet/module-apt
4
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'remove_double_apt_get_update' into 'master'

Browse source 
[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.

See merge request !31
This commit is contained in:
ng 2015-12-16 07:39:12 +00:00
commit c410b5c8de
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
manifests/init.pp
View file

@ -123,17 +123,14 @@ class apt(
mode => '0755', mode => '0755',
} }
exec { 'custom_keys': 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"], subscribe => File["${apt_base_dir}/keys.d"],
refreshonly => true, refreshonly => true,
notify => Exec[refresh_apt]
} }
if $custom_preferences != false { if $custom_preferences != false {
Exec['custom_keys'] { Exec['custom_keys'] {
before => [ Exec[refresh_apt], File['apt_config'] ] before => File['apt_config']
}
} else {
Exec['custom_keys'] {
before => Exec[refresh_apt]
} }
} }
} }