aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xshare/hydra/newkeys10
1 files changed, 5 insertions, 5 deletions
diff --git a/share/hydra/newkeys b/share/hydra/newkeys
index 738b446..deb9b6e 100755
--- a/share/hydra/newkeys
+++ b/share/hydra/newkeys
@@ -103,10 +103,10 @@ function hydra_newkeys_borg {
if [ -e "$HYDRA_FOLDER/puppet/config/secrets/node/$node.yaml" ]; then
# Add Borg passphrase into secret node config
#keyringer $HYDRA decrypt nodes/$NODE/borg/key.passwd | \
- #hydra fluxo eyaml $NODE encrypt --stdin -o block -q -l nodo::subsystem::backup::borg::password >> $HYDRA_FOLDER/puppet/config/secrets/node/$NODE.yaml
+ #hydra $HYDRA eyaml $NODE encrypt --stdin -o block -q -l nodo::subsystem::backup::borg::password >> $HYDRA_FOLDER/puppet/config/secrets/node/$NODE.yaml
#PASSWORD="`keyringer $HYDRA decrypt nodes/$node/borg/key.passwd`"
- #echo -n "$PASSWORD" | hydra fluxo eyaml $node encrypt --stdin -o block -q -l nodo::subsystem::backup::borg::password >> $HYDRA_FOLDER/puppet/config/secrets/node/$node.yaml
- echo -n "$password" | hydra fluxo eyaml $node encrypt --stdin -o block -q -l nodo::subsystem::backup::borg::password >> $HYDRA_FOLDER/puppet/config/secrets/node/$node.yaml
+ #echo -n "$PASSWORD" | hydra $HYDRA eyaml $node encrypt --stdin -o block -q -l nodo::subsystem::backup::borg::password >> $HYDRA_FOLDER/puppet/config/secrets/node/$node.yaml
+ echo -n "$password" | hydra $HYDRA eyaml $node encrypt --stdin -o block -q -l nodo::subsystem::backup::borg::password >> $HYDRA_FOLDER/puppet/config/secrets/node/$node.yaml
fi
# Cleanup
@@ -134,9 +134,9 @@ function hydra_genpairs {
# Add OpenPGP passphrase into secret node config
# We cannot simple pipe keyringer output into hiera-eyaml otherwiser the newline after the password will be interpreted as part of the password
#keyringer $HYDRA decrypt nodes/$node/gpg/key.passwd | \
- #hydra fluxo eyaml $node encrypt --stdin -o block -q -l nodo::subsystem::backup::password >> $HYDRA_FOLDER/puppet/config/secrets/node/$node.yaml
+ #hydra $HYDRA eyaml $node encrypt --stdin -o block -q -l nodo::subsystem::backup::password >> $HYDRA_FOLDER/puppet/config/secrets/node/$node.yaml
PASSWORD="`keyringer $HYDRA decrypt nodes/$node/gpg/key.passwd`"
- echo -n "$PASSWORD" | hydra fluxo eyaml $node encrypt --stdin -o block -q -l nodo::subsystem::backup::password >> $HYDRA_FOLDER/puppet/config/secrets/node/$node.yaml
+ echo -n "$PASSWORD" | hydra $HYDRA eyaml $node encrypt --stdin -o block -q -l nodo::subsystem::backup::password >> $HYDRA_FOLDER/puppet/config/secrets/node/$node.yaml
fi
elif [ "$which" == "ssh" ]; then
keyringer $HYDRA genpair ssh nodes/$node/ssh/id_rsa $node