summaryrefslogtreecommitdiff
path: root/global
diff options
context:
space:
mode:
authorLeif Johansson <leifj@sunet.se>2013-10-31 22:05:12 +0100
committerLeif Johansson <leifj@sunet.se>2013-10-31 22:05:12 +0100
commit0b5391c01ad7f919122e2d3737c860aec1d5cca6 (patch)
tree65e255b4cf4c533220ce6c597915547bda098688 /global
parentc97027f5b925d52ef3cb120bc22383f74f653f1a (diff)
parentdb0d42a62842ccd8103daae76e4a6ccf26cf1aac (diff)
Merge branch 'multiverse'sunet-ops-2013-10-31-v05
Diffstat (limited to 'global')
-rwxr-xr-xglobal/post-tasks.d/015cosmos-trust6
1 files changed, 5 insertions, 1 deletions
diff --git a/global/post-tasks.d/015cosmos-trust b/global/post-tasks.d/015cosmos-trust
index ad2c066..f7d103c 100755
--- a/global/post-tasks.d/015cosmos-trust
+++ b/global/post-tasks.d/015cosmos-trust
@@ -1,6 +1,10 @@
#!/bin/sh
-for k in /etc/cosmos/keys/*.pub; do
+if -z "$COSMOS_KEYS"; then
+ COSMOS_KEYS=/etc/cosmos/keys
+fi
+
+for k in $COSMOS_KEYS/*.pub; do
fp=`cosmos gpg --with-colons --with-fingerprint < $k| awk -F: '$1 == "pub" {print $5}'`
cosmos gpg --with-colons --fingerprint | grep -q ":$fp:" || cosmos gpg --import < $k
done