summaryrefslogtreecommitdiff
path: root/share
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2014-04-26 19:59:47 -0300
committerSilvio Rhatto <rhatto@riseup.net>2014-04-26 19:59:47 -0300
commitf04c05d3432cc8f59c28ce98c17dd407d658c5b6 (patch)
treed686c4d32a4c42c57f5d1e7ceeb1c4627a33885b /share
parentb52e4bc420dcb23d26b06fd7e49dd969930569f3 (diff)
downloadhydra-f04c05d3432cc8f59c28ce98c17dd407d658c5b6.tar.gz
hydra-f04c05d3432cc8f59c28ce98c17dd407d658c5b6.tar.bz2
Newkeys: more flexibility for single node generation
Diffstat (limited to 'share')
-rwxr-xr-xshare/hydra/newkeys10
1 files changed, 5 insertions, 5 deletions
diff --git a/share/hydra/newkeys b/share/hydra/newkeys
index 3f04311..c418f5c 100755
--- a/share/hydra/newkeys
+++ b/share/hydra/newkeys
@@ -26,11 +26,11 @@ function hydra_newkeys {
if [ "$1" == "all" ]; then
hydra_genpairs
elif [ "$1" == "all-ssh" ]; then
- hydra_genpairs all-ssh
+ hydra_genpairs ssh
elif [ "$1" == "all-pgp" ]; then
- hydra_genpairs all-pgp
+ hydra_genpairs pgp
elif [ ! -z "$1" ]; then
- hydra_genpairs
+ hydra_genpairs $2
exit $?
elif [ ! -e "$privkey" ] || [ ! -e "$pubkey" ]; then
hydra_genpairs
@@ -41,11 +41,11 @@ function hydra_newkeys {
function hydra_genpairs {
BASEDIR="/tmp"
- if [ "$1" != "all-pgp" ]; then
+ if [ "$1" != "pgp" ]; then
keyringer $HYDRA genpair ssh $node/ssh/id_rsa $host $privkey
fi
- if [ "$1" != "all-ssh" ]; then
+ if [ "$1" != "ssh" ]; then
keyringer $HYDRA genpair gpg $node/gpg/key $host
fi