aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2016-05-12 17:41:36 -0300
committerSilvio Rhatto <rhatto@riseup.net>2016-05-12 17:41:36 -0300
commit7878c1ace67a28e823c7d7ea5cb158d5d051ae3f (patch)
treec5b858b5afa6a2f2d971e6289bacdef5277c213d /lib
parent69dd5c46abc92faaf987fb8867540e26c99bb686 (diff)
downloadhydra-7878c1ace67a28e823c7d7ea5cb158d5d051ae3f.tar.gz
hydra-7878c1ace67a28e823c7d7ea5cb158d5d051ae3f.tar.bz2
Deploy: use per-node eyaml keys
Diffstat (limited to 'lib')
-rw-r--r--lib/hydra/deploy8
1 files changed, 4 insertions, 4 deletions
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
}