diff options
| -rwxr-xr-x | src/monkeysphere-host | 7 | ||||
| -rw-r--r-- | src/share/mh/publish_key | 3 |
2 files changed, 10 insertions, 0 deletions
diff --git a/src/monkeysphere-host b/src/monkeysphere-host index 33a67cc..17f918c 100755 --- a/src/monkeysphere-host +++ b/src/monkeysphere-host @@ -257,16 +257,22 @@ multi_key() { check_no_keys + log debug "listing primary fingerprints from $HOST_KEY_FILE" local fprs=($(list_primary_fingerprints <"$HOST_KEY_FILE")) + log debug "obtained the following fingerprints: $fprs" if [[ -z "$1" || "$1" == '--all' ]] ; then + log debug "publishing all keys" keys="${fprs[@]}" fi + log debug "using keys: $keys" + for key in $keys ; do if (( i++ > 0 )) ; then printf "\n" fi + log debug "invoking $cmd $key" "$cmd" "$key" done } @@ -338,6 +344,7 @@ show_key() { # defaults LOG_LEVEL=${MONKEYSPHERE_LOG_LEVEL:=$LOG_LEVEL} KEYSERVER=${MONKEYSPHERE_KEYSERVER:=$KEYSERVER} +log debug "using keyserver: $KEYSERVER" CHECK_KEYSERVER=${MONKEYSPHERE_CHECK_KEYSERVER:=$CHECK_KEYSERVER} MONKEYSPHERE_USER=${MONKEYSPHERE_MONKEYSPHERE_USER:=$MONKEYSPHERE_USER} MONKEYSPHERE_GROUP=$(get_primary_group "$MONKEYSPHERE_USER") diff --git a/src/share/mh/publish_key b/src/share/mh/publish_key index 52c8b86..c8da847 100644 --- a/src/share/mh/publish_key +++ b/src/share/mh/publish_key @@ -19,6 +19,7 @@ local keyID="$1" local GNUPGHOME if [ "$PROMPT" != "false" ] ; then + log debug "Because \$MONKEYSPHERE_PROMPT is set to $PROMPT, interactively confirm publishing key" printf "Really publish key '$keyID' to $KEYSERVER? (Y/n) " >&2 read OK; OK=${OK:=Y} if [ "${OK/y/Y}" != 'Y' ] ; then @@ -44,11 +45,13 @@ su_monkeysphere_user \ KEYSERVER_OPTIONS="" for anchorfile in "${SYSCONFIGDIR}/monkeysphere-host-x509-anchors.crt" "${SYSCONFIGDIR}/monkeysphere-x509-anchors.crt"; do if [ -z "$KEYSERVER_OPTIONS" ] && [ -r "$anchorfile" ] ; then + log debug "using trust anchor file: $anchorfile" KEYSERVER_OPTIONS="--keyserver-options 'ca-cert-file=$anchorfile'" fi done # publish key +log debug "publishing key with the following gpg command line and options:" su_monkeysphere_user \ "gpg --keyserver $KEYSERVER $KEYSERVER_OPTIONS --send-keys '0x${keyID}!'" |