From: Silvio Rhatto <rhatto@riseup.net>
Date: Thu, 23 Jun 2016 19:31:58 +0000 (-0300)
Subject: Compile: config
X-Git-Tag: 0.2.4~129
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=fcaae5e00d76407e806a14e9b19ec148ea6d506c;p=hydra.git

Compile: config
---

diff --git a/share/hydra/compile b/share/hydra/compile
index f5f79ad..eb76f7d 100755
--- a/share/hydra/compile
+++ b/share/hydra/compile
@@ -20,11 +20,11 @@
 source $APP_BASE/lib/hydra/functions || exit 1
 hydra_config_load
 
-# Global configuration
+# Config
 CONFIG="$HYDRA_FOLDER/puppet/config/compiled.yaml"
-
-# Nodes
 NODES="`hydra $HYDRA nodes`"
+FACTS="$HYDRA_FOLDER/puppet/config/facts"
+KEYS="$HYDRA_FOLDER/keyring/keys/nodes"
 
 echo "Starting a fresh compiled config..."
 mkdir -p "`dirname $CONFIG`"
@@ -37,7 +37,7 @@ echo "#"                                                            >> $CONFIG
 # Process stuff for each node
 for node in $NODES; do
   # SSH public keys
-  if [ -e "$HYDRA_FOLDER/keyring/keys/nodes/$node/ssh/id_rsa.pub.asc" ]; then
+  if [ -e "$KEYS/$node/ssh/id_rsa.pub.asc" ]; then
     echo "Adding SSH public key for $node..."
     key="compiled::ssh::key::$node"
     value="$(keyringer $HYDRA decrypt nodes/$node/ssh/id_rsa.pub 2> /dev/null | cut -d ' ' -f 2)"