From 21306532c1a6e49abe255cc6c809e6bfecf03c09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Tue, 15 Jan 2019 16:48:25 +0100 Subject: [PATCH] update ansible key generator It's probably easier to use without it having an ansible folder prefix, if people want to put it into a different dir then they should change their workdir. Apart from that, this fixes a bug where I defined yggdrasil_signing_public_key twice, but never the private key. --- contrib/ansible/genkeys.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/contrib/ansible/genkeys.go b/contrib/ansible/genkeys.go index 15785754..22418a0c 100644 --- a/contrib/ansible/genkeys.go +++ b/contrib/ansible/genkeys.go @@ -54,11 +54,11 @@ func main() { signatureKeys = bubbleUpTo(signatureKeys, 0) } - os.MkdirAll("ansible/host_vars", 0755) + os.MkdirAll("host_vars", 0755) for i := 1; i <= *numHosts; i++ { - os.MkdirAll(fmt.Sprintf("ansible/host_vars/%x", i), 0755) - file, err := os.Create(fmt.Sprintf("ansible/host_vars/%x/vars", i)) + os.MkdirAll(fmt.Sprintf("host_vars/%x", i), 0755) + file, err := os.Create(fmt.Sprintf("host_vars/%x/vars", i)) if err != nil { return } @@ -66,10 +66,10 @@ func main() { file.WriteString(fmt.Sprintf("yggdrasil_encryption_public_key: %v\n", hex.EncodeToString(encryptionKeys[i].pub))) file.WriteString("yggdrasil_encryption_private_key: \"{{ vault_yggdrasil_encryption_private_key }}\"\n") file.WriteString(fmt.Sprintf("yggdrasil_signing_public_key: %v\n", hex.EncodeToString(signatureKeys[i].pub))) - file.WriteString("yggdrasil_signing_public_key: \"{{ vault_yggdrasil_signing_private_key }}\"\n") + file.WriteString("yggdrasil_signing_private_key: \"{{ vault_yggdrasil_signing_private_key }}\"\n") file.WriteString(fmt.Sprintf("ansible_host: %v\n", encryptionKeys[i].ip)) - file, err = os.Create(fmt.Sprintf("ansible/host_vars/%x/vault", i)) + file, err = os.Create(fmt.Sprintf("host_vars/%x/vault", i)) if err != nil { return }