From ae58914cc24da8a5906bf484da579b69c69c2eb9 Mon Sep 17 00:00:00 2001 From: marc Date: Mon, 12 Feb 2024 22:19:40 +0100 Subject: [PATCH] Fixed secrets config --- hosts/reykjavik/secrets.nix | 8 ++++---- hosts/thingvellir/default.nix | 1 + hosts/thingvellir/secrets.nix | 8 ++++---- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/hosts/reykjavik/secrets.nix b/hosts/reykjavik/secrets.nix index ada828e..c81f98a 100644 --- a/hosts/reykjavik/secrets.nix +++ b/hosts/reykjavik/secrets.nix @@ -4,26 +4,26 @@ age.secrets = { # Consul ------------------------------- "consul.d/gossip.json" = { - file = ../secrets/consul.d/gossip.json.age; + file = ../../secrets/consul.d/gossip.json.age; owner = "consul"; group = "consul"; mode = "644"; }; "consul.d/consul-agent-ca.pem" = { - file = ../secrets/consul.d/consul-agent-ca.pem.age; + file = ../../secrets/consul.d/consul-agent-ca.pem.age; owner = "consul"; group = "consul"; mode = "644"; }; "consul.d/agent-token-reykjavik.json" = { - file = ../secrets/consul.d/agent-token-reykjavik.json.age; + file = ../../secrets/consul.d/agent-token-reykjavik.json.age; owner = "consul"; group = "consul"; mode = "644"; }; # Nomad ------------------------------- "nomad.d/consul-token.json" = { - file = ../secrets/nomad.d/consul-token.json.age; + file = ../../secrets/nomad.d/consul-token.json.age; mode = "644"; }; }; diff --git a/hosts/thingvellir/default.nix b/hosts/thingvellir/default.nix index 226594d..df6ce59 100644 --- a/hosts/thingvellir/default.nix +++ b/hosts/thingvellir/default.nix @@ -4,6 +4,7 @@ with lib; { imports = [ ./hardware.nix + ./secrets.nix ]; # - Basic -------------------------------------- diff --git a/hosts/thingvellir/secrets.nix b/hosts/thingvellir/secrets.nix index de41143..b9b3520 100644 --- a/hosts/thingvellir/secrets.nix +++ b/hosts/thingvellir/secrets.nix @@ -4,26 +4,26 @@ age.secrets = { # Consul ------------------------------- "consul.d/gossip.json" = { - file = ../secrets/consul.d/gossip.json.age; + file = ../../secrets/consul.d/gossip.json.age; owner = "consul"; group = "consul"; mode = "644"; }; "consul.d/consul-agent-ca.pem" = { - file = ../secrets/consul.d/consul-agent-ca.pem.age; + file = ../../secrets/consul.d/consul-agent-ca.pem.age; owner = "consul"; group = "consul"; mode = "644"; }; "consul.d/agent-token-thingvellir.json" = { - file = ../secrets/consul.d/agent-token-thingvellir.json.age; + file = ../../secrets/consul.d/agent-token-thingvellir.json.age; owner = "consul"; group = "consul"; mode = "644"; }; # Nomad ------------------------------- "nomad.d/consul-token.json" = { - file = ../secrets/nomad.d/consul-token.json.age; + file = ../../secrets/nomad.d/consul-token.json.age; mode = "644"; }; };