Deploy: copy hiera-eyaml keys

diff --git a/TODO.md b/TODO.md
index ae1762d314f7cb32c092c9c75d0de399d11d81f1..672a77ec78ef6b4dd907928203d762268f14556b 100644 (file)
--- a/TODO.md
+++ b/TODO.md
@@ -11,7 +11,7 @@ Hydra
 - init: version control in the superproject?
 - deploy:
   - lockfile.
-  - keys, certs and secrets.
+  - keys and certs.
   - fix /etc/puppet permissions.
   - check hostname and required node configuration.
   - log applied version and date (in the node and also in the repo?).

diff --git a/lib/hydra/deploy b/lib/hydra/deploy
index 26c28d0408463b6a457999c300f08f668d85b339..4c6d967cc3e7cfe79aed647d40956079f5e0b1c9 100644 (file)
--- a/lib/hydra/deploy
+++ b/lib/hydra/deploy
@@ -110,6 +110,25 @@ function hydra_deploy_mkdirs {
   $DEPLOY_COMMAND chmod -R 640   /etc/puppet
 }
 
+# Copy keys
+function hydra_deploy_copy_keys {
+  local location="$1"
+
+  if [ -z "$location" ]; then
+    location="remote"
+  fi
+
+  $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
+  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
+  fi
+}
+
 # Copy config secrets
 function hydra_deploy_copy_secrets {
   local location="$1"

diff --git a/share/hydra/deploy b/share/hydra/deploy
index 1321a06a17b9c6a6b85d34a9e28f00728d6f9a11..1307802b3fbbf65d3463dfdd7c75de887ada2741 100755 (executable)
--- a/share/hydra/deploy
+++ b/share/hydra/deploy
@@ -65,6 +65,9 @@ for node in $NODES; do
     echo "Syncing configuration..."
     $DEPLOY_RSYNC "$RSYNC_PATH" $DEPLOY_OPTS
 
+    # Copy keys
+    hydra_deploy_copy_keys folder
+
     # Copy config configuration
     hydra_deploy_copy_secrets folder
 
@@ -110,6 +113,9 @@ EOF
     echo "Syncing configuration..."
     $DEPLOY_RSYNC "$RSYNC_PATH" $DEPLOY_OPTS
 
+    # Copy keys
+    hydra_deploy_copy_keys remote
+
     # Copy configuration
     hydra_deploy_copy_secrets remote