aboutsummaryrefslogtreecommitdiff
path: root/share
diff options
context:
space:
mode:
Diffstat (limited to 'share')
-rwxr-xr-xshare/hydra/eyaml6
1 files changed, 3 insertions, 3 deletions
diff --git a/share/hydra/eyaml b/share/hydra/eyaml
index 17edf58..24e714d 100755
--- a/share/hydra/eyaml
+++ b/share/hydra/eyaml
@@ -53,7 +53,7 @@ PUB_CRYPT="nodes/$FQDN/eyaml/public_key.pkcs7.pem"
if [ -e "$HYDRA_FOLDER/puppet/keys/private_key.pkcs7.pem" ] && [ ! -h "$HYDRA_FOLDER/puppet/keys/private_key.pkcs7.pem" ]; then
PRIV="$HYDRA_FOLDER/puppet/keys/private_key.pkcs7.pem"
PUB="$HYDRA_FOLDER/puppet/keys/public_key.pkcs7.pem"
- PRIV_CRYPT="domains/$DOMAIN/eyaml/private_key.pkcs7.pem.asc"
+ PRIV_CRYPT="domains/$DOMAIN/eyaml/private_key.pkcs7.pem"
PUB_CRYPT="domains/$DOMAIN/eyaml/public_key.pkcs7.pem"
fi
@@ -62,10 +62,10 @@ ARGS="--pkcs7-private-key $PRIV --pkcs7-public-key $PUB"
# Generate keypair if needed
if [ ! -e "$PRIV" ]; then
- if [ -e "$HYDRA_FOLDER/keyring/keys/$PRIV_CRYPT" ]; then
+ if [ -e "$HYDRA_FOLDER/keyring/keys/$PRIV_CRYPT.asc" ]; then
echo "Getting eyaml keys for $FDQN from keyringer..."
keyringer $HYDRA decrypt $PRIV_CRYPT > $PRIV
- keyringer $HYDRA decrypt $PUB_CRYOT > $PUB
+ keyringer $HYDRA decrypt $PUB_CRYPT > $PUB
else
echo "Generating eyaml keys for $FQDN..."
eyaml createkeys $ARGS