diff options
| -rw-r--r-- | etc/monkeysphere-authentication.conf | 2 | ||||
| -rw-r--r-- | etc/monkeysphere.conf | 2 | ||||
| -rw-r--r-- | packaging/debian/changelog | 3 | ||||
| -rw-r--r-- | src/share/mh/publish_key | 7 |
4 files changed, 5 insertions, 9 deletions
diff --git a/etc/monkeysphere-authentication.conf b/etc/monkeysphere-authentication.conf index ea40966..0a28c4d 100644 --- a/etc/monkeysphere-authentication.conf +++ b/etc/monkeysphere-authentication.conf @@ -28,4 +28,4 @@ # by the home directory of the user, and '%u' will by replaced by the # username of the user. Setting this variable to 'none' prevents the # inclusion of user controlled authorized_keys file. -# RAW_AUTHORIZED_KEYS="%h/.ssh/authorized_keys" +#RAW_AUTHORIZED_KEYS="%h/.ssh/authorized_keys" diff --git a/etc/monkeysphere.conf b/etc/monkeysphere.conf index 2f0b877..20df62b 100644 --- a/etc/monkeysphere.conf +++ b/etc/monkeysphere.conf @@ -14,7 +14,7 @@ # MONKEYSPHERE_GNUPGHOME environment variable, then the value of the # GNUPGHOME environment variable will be used. If GNUPGHOME is not # set either, then the default value is listed below. -# GNUPGHOME=~/.gnupg +#GNUPGHOME=~/.gnupg # GPG keyserver to search for keys. #KEYSERVER=pool.sks-keyservers.net diff --git a/packaging/debian/changelog b/packaging/debian/changelog index 6b31e16..c825b64 100644 --- a/packaging/debian/changelog +++ b/packaging/debian/changelog @@ -7,6 +7,7 @@ monkeysphere (0.23~pre-1) UNRELEASED; urgency=low - replace monkeysphere-server with monkeysphere-{authentication,host} - fold monkeysphere-ssh-proxycommand into /usr/bin/monkeysphere + * new ability to import existing ssh key into monkeysphere * simplify adding a host to the monkeysphere, automate the process during debian installation * provide pem2openpgp for translating unencrypted PEM-encoded raw key @@ -18,7 +19,7 @@ monkeysphere (0.23~pre-1) UNRELEASED; urgency=low * check that existing authentication keys are valid in gen_key function. - -- Daniel Kahn Gillmor <dkg@pip.fifthhorseman.net> Sat, 31 Jan 2009 17:32:58 -0500 + -- Jameson Graef Rollins <jrollins@finestructure.net> Thu, 12 Feb 2009 21:50:54 -0500 monkeysphere (0.22-1) unstable; urgency=low diff --git a/src/share/mh/publish_key b/src/share/mh/publish_key index 988b450..600dfcf 100644 --- a/src/share/mh/publish_key +++ b/src/share/mh/publish_key @@ -20,12 +20,7 @@ if [ ${OK/y/Y} != 'Y' ] ; then failure "key not published." fi -# find the key fingerprint -fingerprint=$(fingerprint_host_key) - # publish host key -# FIXME: need to define how to do this -#gpg_authentication "--keyserver $KEYSERVER --send-keys '0x${fingerprint}!'" -echo "not published!!!" +gpg_sphere "--keyserver $KEYSERVER --send-keys '0x${HOST_FINGERPRINT}!'" } |