From: Jameson Graef Rollins <jrollins@phys.columbia.edu>
Date: Fri, 11 Jul 2008 00:19:11 +0000 (-0400)
Subject: Tweak key publication command.
X-Git-Tag: monkeysphere_0.4-1~6
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;ds=sidebyside;h=cabc89111693c8f928a7685f55a385ccf75daf86;p=monkeysphere.git

Tweak key publication command.
---

diff --git a/src/monkeysphere-server b/src/monkeysphere-server
index 68c4b24..67466d2 100755
--- a/src/monkeysphere-server
+++ b/src/monkeysphere-server
@@ -360,7 +360,7 @@ fingerprint_server_key() {
 
 # publish server key to keyserver
 publish_server_key() {
-    read -p "really publish key to $KEYSERVER? (y/N) " OK; OK=${OK:=N}
+    read -p "Really publish key to $KEYSERVER? (y/N) " OK; OK=${OK:=N}
     if [ ${OK/y/Y} != 'Y' ] ; then
 	failure "aborting."
     fi
@@ -369,8 +369,11 @@ publish_server_key() {
     # FIXME: need to figure out better way to identify host key
     # dummy command so as not to publish fakes keys during testing
     # eventually:
-    #gpg_authentication "--keyring $GNUPGHOME_HOST/pubring.gpg --keyserver $KEYSERVER --send-keys $(hostname -f)"
-    failure "NOT PUBLISHED (to avoid permanent publication errors during monkeysphere development)."
+    #gpg_authentication "--keyserver $KEYSERVER --send-keys $(hostname -f)"
+    echo "NOT PUBLISHED (to avoid permanent publication errors during monkeysphere development)."
+    echo "The following command should publish the key:"
+    echo "monkeysphere-server gpg-authentication-cmd '--keyserver $KEYSERVER --send-keys $(hostname -f)'"
+    exit 255
 }
 
 # retrieve key from web of trust, import it into the host keyring, and