Deploy: use per-node eyaml keys

diff --git a/lib/hydra/deploy b/lib/hydra/deploy
index 4c6d967cc3e7cfe79aed647d40956079f5e0b1c9..ed41d08eaa1f78bc84beab78961ce7b2bf344237 100644 (file)
--- a/lib/hydra/deploy
+++ b/lib/hydra/deploy
@@ -120,12 +120,12 @@ function hydra_deploy_copy_keys {
 
   $DEPLOY_COMMAND mkdir -p $FOLDER/etc/puppet/keys
 
-  if [ -e "$HYDRA_FOLDER/puppet/keys/private_key.pkcs7.pem" ]; then
-    hydra_deploy_copy $location $HYDRA_FOLDER/puppet/keys/private_key.pkcs7.pem $DEPLOY_DEST/etc/puppet/keys/private_key.pkcs7.pem
+  if [ -e "$HYDRA_FOLDER/puppet/keys/$FQDN/eyaml/private_key.pkcs7.pem" ]; then
+    hydra_deploy_copy $location $HYDRA_FOLDER/puppet/keys/$FQDN/eyaml/private_key.pkcs7.pem $DEPLOY_DEST/etc/puppet/keys/private_key.pkcs7.pem
   fi
 
-  if [ -e "$HYDRA_FOLDER/puppet/keys/public_key.pkcs7.pem" ]; then
-    hydra_deploy_copy $location $HYDRA_FOLDER/puppet/keys/public_key.pkcs7.pem $DEPLOY_DEST/etc/puppet/keys/public_key.pkcs7.pem
+  if [ -e "$HYDRA_FOLDER/puppet/keys/$FQDN/eyaml/public_key.pkcs7.pem" ]; then
+    hydra_deploy_copy $location $HYDRA_FOLDER/puppet/keys/$FQDN/eyaml/public_key.pkcs7.pem $DEPLOY_DEST/etc/puppet/keys/public_key.pkcs7.pem
   fi
 }