From: Silvio Rhatto <rhatto@riseup.net>
Date: Thu, 12 May 2016 20:41:36 +0000 (-0300)
Subject: Deploy: use per-node eyaml keys
X-Git-Tag: 0.2.4~173
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=7878c1ace67a28e823c7d7ea5cb158d5d051ae3f;p=hydra.git

Deploy: use per-node eyaml keys
---

diff --git a/lib/hydra/deploy b/lib/hydra/deploy
index 4c6d967..ed41d08 100644
--- 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
 }