swedenconnect/eid-ops
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

updated post-tasks file

Browse source
This commit is contained in:
Maria Haider 2021-10-07 15:28:51 +02:00
parent 2c3c85b810
commit 7eacba464c
Signed by: mariah
GPG key ID: 7414A760CA747E57
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
global/post-tasks.d/015cosmos-trust
View file

@ -32,7 +32,7 @@ for k in $COSMOS_KEYS/*.pub; do
# Silently ignore empty files # Silently ignore empty files
continue continue
fi fi
pubkeys_in_file=$(cosmos gpg --with-colons --with-fingerprint < $k | grep "^pub:") pubkeys_in_file=$(cosmos gpg --with-colons --with-fingerprint < $k 2>&1 | grep "^pub:")
non_expired_pubkeys_in_file=$(echo ${pubkeys_in_file} | awk -F: '$2 != "e" { print $0 }') non_expired_pubkeys_in_file=$(echo ${pubkeys_in_file} | awk -F: '$2 != "e" { print $0 }')
if [[ ! $non_expired_pubkeys_in_file ]]; then if [[ ! $non_expired_pubkeys_in_file ]]; then
echo -e "$0: ${red}Ignoring file with expired pubkey: ${k}${reset}" echo -e "$0: ${red}Ignoring file with expired pubkey: ${k}${reset}"
@ -46,10 +46,10 @@ for k in $COSMOS_KEYS/*.pub; do
if [[ ! ${KEYRING[$fp]} ]]; then if [[ ! ${KEYRING[$fp]} ]]; then
echo -e "$0: ${bold}Importing new key ${fp}${reset} from ${k}" echo -e "$0: ${bold}Importing new key ${fp}${reset} from ${k}"
cosmos gpg --import < $k cosmos gpg --no-tty --import < $k
elif [[ ${EXPIRED[$fp]} ]]; then elif [[ ${EXPIRED[$fp]} ]]; then
echo -e "$0: ${bold}Re-importing expired key ${fp}${reset} from ${k}" echo -e "$0: ${bold}Re-importing expired key ${fp}${reset} from ${k}"
cosmos gpg --import < $k cosmos gpg --no-tty --import < $k
fi fi
done done