diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2014-03-08 19:44:24 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2014-03-08 19:44:24 -0300 |
| commit | 61969d022aeeaa39822758ba5eadf5a37ef4ec20 (patch) | |
| tree | 30dc35615ed51fb36d6a59b82b0d79e44d233a57 | |
| parent | 7b60ac4e7dfecf54953df6d588c5af0864e56ee7 (diff) | |
| download | hydra-61969d022aeeaa39822758ba5eadf5a37ef4ec20.tar.gz hydra-61969d022aeeaa39822758ba5eadf5a37ef4ec20.tar.bz2 | |
Optional argument to import a non-default key (useful for backup restoration) at import-key
| -rw-r--r-- | TODO.md | 1 | ||||
| -rwxr-xr-x | share/hydra/import-key | 7 |
2 files changed, 6 insertions, 2 deletions
@@ -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)" |