summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2016-06-23 14:29:20 -0300
committerSilvio Rhatto <rhatto@riseup.net>2016-06-23 14:29:20 -0300
commit3baee42b732ad815a0bb2c7de886a2b0200b91f3 (patch)
treec3d1558ef343e3ad9504ca10cdc4984eafed42aa
parent51be58f04ab6ea052e2b078313ea1e1ebba9fc48 (diff)
downloadhydra-3baee42b732ad815a0bb2c7de886a2b0200b91f3.tar.gz
hydra-3baee42b732ad815a0bb2c7de886a2b0200b91f3.tar.bz2
Compile: hiera does indeed accept dots in keys
-rwxr-xr-xshare/hydra/compile5
1 files changed, 1 insertions, 4 deletions
diff --git a/share/hydra/compile b/share/hydra/compile
index b120d0d..f5f79ad 100755
--- a/share/hydra/compile
+++ b/share/hydra/compile
@@ -36,13 +36,10 @@ echo "#" >> $CONFIG
# Process stuff for each node
for node in $NODES; do
- # Hiera doesn't accept keys with dots
- node_key="`echo $node | sed -e 's/\./_/g'`"
-
# SSH public keys
if [ -e "$HYDRA_FOLDER/keyring/keys/nodes/$node/ssh/id_rsa.pub.asc" ]; then
echo "Adding SSH public key for $node..."
- key="compiled::ssh::key::$node_key"
+ key="compiled::ssh::key::$node"
value="$(keyringer $HYDRA decrypt nodes/$node/ssh/id_rsa.pub 2> /dev/null | cut -d ' ' -f 2)"
echo "$key: '$value'" >> $CONFIG
fi