projects
/
monkeysphere.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update zimmermann changelog about minor MS config change to the keyserver
[monkeysphere.git]
/
src
/
share
/
mh
/
publish_key
diff --git
a/src/share/mh/publish_key
b/src/share/mh/publish_key
index 48e4cbb16169222895fb0902aa171a8647c17879..f1c17234f819477b74e272bb1c37fac493b4e6b7 100644
(file)
--- a/
src/share/mh/publish_key
+++ b/
src/share/mh/publish_key
@@
-8,23
+8,24
@@
# Jamie McClelland <jm@mayfirst.org>
# Daniel Kahn Gillmor <dkg@fifthhorseman.net>
#
# Jamie McClelland <jm@mayfirst.org>
# Daniel Kahn Gillmor <dkg@fifthhorseman.net>
#
-# They are Copyright 2008-20
09, and are all released under the GPL, version 3
-# or later.
+# They are Copyright 2008-20
10, and are all released under the GPL,
+#
version 3
or later.
-# publish
server key
to keyserver
+# publish
keys
to keyserver
publish_key() {
publish_key() {
+local keyID="$1"
local GNUPGHOME
local GNUPGHOME
-if [ "$PROMPT"
= "tru
e" ] ; then
- printf "Really publish
host key
to $KEYSERVER? (Y/n) " >&2
+if [ "$PROMPT"
!= "fals
e" ] ; then
+ printf "Really publish
key '$keyID'
to $KEYSERVER? (Y/n) " >&2
read OK; OK=${OK:=Y}
if [ "${OK/y/Y}" != 'Y' ] ; then
failure "key not published."
fi
else
read OK; OK=${OK:=Y}
if [ "${OK/y/Y}" != 'Y' ] ; then
failure "key not published."
fi
else
- log debug "publishing key without prompting."
+ log debug "publishing key
'$keyID'
without prompting."
fi
# create a temporary gnupg directory from which to publish the key
fi
# create a temporary gnupg directory from which to publish the key
@@
-35,13
+36,13
@@
chown "$MONKEYSPHERE_USER":"$MONKEYSPHERE_GROUP" "$GNUPGHOME"
# trap to remove tmp dir if break
trap "rm -rf $GNUPGHOME" EXIT
# trap to remove tmp dir if break
trap "rm -rf $GNUPGHOME" EXIT
-# import the
host
key into the tmp dir
+# import the key into the tmp dir
su_monkeysphere_user \
"gpg --quiet --import" <"$HOST_KEY_FILE"
su_monkeysphere_user \
"gpg --quiet --import" <"$HOST_KEY_FILE"
-# publish
host
key
+# publish key
su_monkeysphere_user \
su_monkeysphere_user \
- "gpg --keyserver $KEYSERVER --send-keys '0x${
HOST_FINGERPRINT
}!'"
+ "gpg --keyserver $KEYSERVER --send-keys '0x${
keyID
}!'"
# remove the tmp file
trap - EXIT
# remove the tmp file
trap - EXIT