From: Silvio Rhatto <rhatto@riseup.net>
Date: Tue, 4 Apr 2017 15:18:19 +0000 (-0300)
Subject: Fix test for single-key setup at eyaml
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=b2cce712c726fb32255010d59715616d6bc594d8;p=hydra.git

Fix test for single-key setup at eyaml
---

diff --git a/share/hydra/eyaml b/share/hydra/eyaml
index b07d991..c66eaf5 100755
--- a/share/hydra/eyaml
+++ b/share/hydra/eyaml
@@ -47,7 +47,7 @@ PRIV_CRYPT="nodes/$FQDN/eyaml/private_key.pkcs7.pem.asc"
 PUB_CRYPT="nodes/$FQDN/eyaml/public_key.pkcs7.pem"
 
 # Test for single-key setup
-if [ -e "$HYDRA_FOLDER/puppet/keys/private_key.pkcs7.pem" ] && [ ! -h "$HYDRA_FOLDER/puppet/keys/private_key.pkcs7.pem" ]; then
+if [ -e "$HYDRA_FOLDER/keyring/keys/domains/$DOMAIN/eyaml/private_key.pkcs7.pem.asc" ] && [ ! -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"