Fixes eyaml

diff --git a/share/hydra/eyaml b/share/hydra/eyaml
index 17edf58dcf09e6b4966cfd9f835d74b1890e98fe..24e714d24f2e653f92e328f0540cf362ae1fd4e4 100755 (executable)
--- 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