From: Joerg Jaspert Date: Fri, 25 Mar 2011 15:48:47 +0000 (+0100) Subject: just one admin keyring X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4db5d5e09a9c6d827ad2dfce208e4e7368ce220c;p=dak just one admin keyring Signed-off-by: Joerg Jaspert --- diff --git a/scripts/debian/buildd-add-keys b/scripts/debian/buildd-add-keys index 4cb56be8..ddb56a42 100755 --- a/scripts/debian/buildd-add-keys +++ b/scripts/debian/buildd-add-keys @@ -56,7 +56,7 @@ trap cleanup ERR EXIT TERM HUP INT QUIT base="${base}/scripts/builddkeyrings" INCOMING="${base}/incoming" ERRORS="${base}/errors" -ADMINS="${base}/admins" +ADMINS="${base}/adminkeys.gpg" # Default options for our gpg calls DEFGPGOPT="--no-default-keyring --batch --no-tty --no-options --exit-on-status-write-error --no-greeting" @@ -121,7 +121,7 @@ for file in $(ls -1 ${INCOMING}/*.key); do exec 5> "${GPGLOGS}" # So lets run gpg, status/logger into the two files, to "decrypt" the keyfile - if ! gpg ${DEFGPGOPT} --keyring "${ADMINS}/${ARCH}.gpg" --status-fd 4 --logger-fd 5 --decrypt "${INCOMING}/${file}" > "${GPGOUTF}"; then + if ! gpg ${DEFGPGOPT} --keyring "${ADMINS}" --status-fd 4 --logger-fd 5 --decrypt "${INCOMING}/${file}" > "${GPGOUTF}"; then ret=$? log "gpg returned with ${ret}, not adding key from file ${file}" DATE=$(date -Is) diff --git a/scripts/debian/buildd-remove-keys b/scripts/debian/buildd-remove-keys index 45c4b206..c07ff04b 100755 --- a/scripts/debian/buildd-remove-keys +++ b/scripts/debian/buildd-remove-keys @@ -56,7 +56,7 @@ trap cleanup ERR EXIT TERM HUP INT QUIT base="${base}/scripts/builddkeyrings" INCOMING="${base}/incoming" ERRORS="${base}/errors" -ADMINS="${base}/admins" +ADMINS="${base}/adminkeys.gpg" REMOVED="${base}/removed-buildd-keys.gpg" # Default options for our gpg calls @@ -122,7 +122,7 @@ for file in $(ls -1 ${INCOMING}/*.del ); do exec 5> "${GPGLOGS}" # So lets run gpg, status/logger into the two files, to "decrypt" the keyfile - if ! gpg ${DEFGPGOPT} --keyring "${ADMINS}/${ARCH}.gpg" --status-fd 4 --logger-fd 5 --decrypt "${INCOMING}/${file}" > "${GPGOUTF}"; then + if ! gpg ${DEFGPGOPT} --keyring "${ADMINS}" --status-fd 4 --logger-fd 5 --decrypt "${INCOMING}/${file}" > "${GPGOUTF}"; then ret=$? log "gpg returned with ${ret}, not removing key using ${file}" DATE=$(date -Is)