]> gitweb.fluxo.info Git - hydra.git/commitdiff
Fix test for single-key setup at eyaml
authorSilvio Rhatto <rhatto@riseup.net>
Tue, 4 Apr 2017 15:18:19 +0000 (12:18 -0300)
committerSilvio Rhatto <rhatto@riseup.net>
Tue, 4 Apr 2017 15:18:19 +0000 (12:18 -0300)
share/hydra/eyaml

index b07d991eb2d779c07f235b74bb04b2ffc5b42e9e..c66eaf5c092130028ee306fc54911636e91fcc99 100755 (executable)
@@ -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"