summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2013-03-14 20:01:35 +0100
committervarac <varacanero@zeromail.org>2013-03-14 20:01:35 +0100
commitc8a28eb80ec87e65d5cacb2d109d4c0bcbbc76db (patch)
tree27f5320b7ab634d9bb7034a6b39e9373bce5f86f
parentf16a0727dce187d07389388da8b816f7b520205d (diff)
apt keys: always deploy before Exec[refresh_apt], also with $custom_preferencesdeploy_key_before_update
-rw-r--r--manifests/init.pp6
1 files changed, 5 insertions, 1 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index 020c1cc..0f60efb 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -128,7 +128,11 @@ class apt(
}
if $custom_preferences != false {
Exec['custom_keys'] {
- before => File['apt_config'],
+ before => [ Exec[refresh_apt], File['apt_config'] ]
+ }
+ } else {
+ Exec['custom_keys'] {
+ before => Exec[refresh_apt]
}
}
}