diff options
| author | varac <varacanero@zeromail.org> | 2016-01-06 10:58:45 +0100 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2016-01-06 10:58:45 +0100 |
| commit | d459567bf246eee85cd101c2e2f17f451e6230b8 (patch) | |
| tree | 19f67e954d34dbb695e98b33c11c0ccb31026782 /manifests | |
| parent | e12c5bfd6c9ff5d1dc5e14c227e8c15388ecb042 (diff) | |
| parent | fa1751c4de0154de7431ea18f57ddaeff329cf73 (diff) | |
Merge remote-tracking branch 'shared/master' into leap_master
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/init.pp | 9 | ||||
| -rw-r--r-- | manifests/preferences_snippet.pp | 3 |
2 files changed, 5 insertions, 7 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'] } } } diff --git a/manifests/preferences_snippet.pp b/manifests/preferences_snippet.pp index 0c7b7bb..99feac4 100644 --- a/manifests/preferences_snippet.pp +++ b/manifests/preferences_snippet.pp @@ -31,7 +31,8 @@ define apt::preferences_snippet ( file { "/etc/apt/preferences.d/${name}": ensure => $ensure, - owner => root, group => 0, mode => '0644'; + owner => root, group => 0, mode => '0644', + before => Exec['refresh_apt']; } case $source { |