From 61969d022aeeaa39822758ba5eadf5a37ef4ec20 Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Sat, 8 Mar 2014 19:44:24 -0300 Subject: Optional argument to import a non-default key (useful for backup restoration) at import-key --- TODO.md | 1 - share/hydra/import-key | 7 ++++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/TODO.md b/TODO.md index 409f524..0f16ed9 100644 --- a/TODO.md +++ b/TODO.md @@ -6,7 +6,6 @@ Hydra - bootless: properly support `$subdevice` in parted or always use first device (like `/dev/sdb1`). - puppet-setup-stored: configure storeconfigs database. - - import-key: optional argument to import a non-default key (useful for backup restoration). Hydractl -------- diff --git a/share/hydra/import-key b/share/hydra/import-key index 5658728..ffffb06 100755 --- a/share/hydra/import-key +++ b/share/hydra/import-key @@ -35,7 +35,12 @@ fi # Deploy for node in $NODES; do - hostname="`echo $node | cut -d . -f 1`" + if [ ! -z "$HOST" ]; then + hostname="$HOST" + else + hostname="`echo $node | cut -d . -f 1`" + fi + key="$(keyringer $HYDRA decrypt $hostname/gpg/key 2> /dev/null | sed -ne '1,$p')" key_id="$(echo "$key" | gpg --with-colons | grep sec | cut -d : -f 5)" -- cgit v1.2.3