projects
/
monkeysphere.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'dkg/master'
[monkeysphere.git]
/
src
/
subcommands
/
mh
/
import-key
diff --git
a/src/subcommands/mh/import-key
b/src/subcommands/mh/import-key
old mode 100755
(executable)
new mode 100644
(file)
index
bbeb37f
..
386e02d
--- a/
src/subcommands/mh/import-key
+++ b/
src/subcommands/mh/import-key
@@
-1,14
+1,17
@@
-#!/usr/bin/env bash
+# -*-shell-script-*-
+# This should be sourced by bash (though we welcome changes to make it POSIX sh compliant)
# Monkeysphere host import-key subcommand
#
# The monkeysphere scripts are written by:
# Monkeysphere host import-key subcommand
#
# The monkeysphere scripts are written by:
-# Jameson Rollins <jrollins@fi
fthhorseman
.net>
+# Jameson Rollins <jrollins@fi
nestructure
.net>
# 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, and are all released under the GPL, version 3
-# or later.
+# They are Copyright 2008-2009 and are all released under the GPL,
+# version 3 or later.
+
+import_key() {
local hostName=$(hostname -f)
local keyFile="/etc/ssh/ssh_host_rsa_key"
local hostName=$(hostname -f)
local keyFile="/etc/ssh/ssh_host_rsa_key"
@@
-81,4
+84,6
@@
gpg_authentication "--export-options export-minimal --armor --export 0x${fingerp
log info "SSH host public key in OpenPGP form: ${SYSDATADIR}/ssh_host_rsa_key.pub.gpg"
# show info about new key
log info "SSH host public key in OpenPGP form: ${SYSDATADIR}/ssh_host_rsa_key.pub.gpg"
# show info about new key
-show_server_key
+show_key
+
+}