marc/samfelag
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactored secrets (each host has their own)

Browse Source
This commit is contained in:
marc
2024-02-12 22:14:24 +01:00
parent 360adace1e
commit ea276bb6d1
4 changed files with 61 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.org
View File

@@ -2,7 +2,7 @@
** [[file:docs/install.org][Installing]] ** [[file:docs/install.org][Installing]]
** Rebuilding ** Rebuilding
#+BEGIN_SRC bash #+BEGIN_SRC bash
sudo nixos-rebuild switch --impure --flake '.#reykjavik' sudo nixos-rebuild switch --impure --flake ".#${HOST}"
#+END_SRC #+END_SRC
** Modules ** Modules
*** Desktop environment *** Desktop environment

30
hosts/reykjavik/secrets.nix Normal file
View File

@@ -0,0 +1,30 @@
{ ... }:
{
age.secrets = {
# Consul -------------------------------
"consul.d/gossip.json" = {
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;
owner = "consul";
group = "consul";
mode = "644";
};
"consul.d/agent-token-reykjavik.json" = {
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;
mode = "644";
};
};
}

30
hosts/thingvellir/secrets.nix Normal file
View File

@@ -0,0 +1,30 @@
{ ... }:
{
age.secrets = {
# Consul -------------------------------
"consul.d/gossip.json" = {
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;
owner = "consul";
group = "consul";
mode = "644";
};
"consul.d/agent-token-thingvellir.json" = {
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;
mode = "644";
};
};
}

45
modules/secrets.nix
View File

@@ -1,45 +0,0 @@
{ config, pkgs, lib, ... }:
let
consulCfg = config.samfelag.modules.server.consul;
nomadCfg = config.samfelag.modules.server.nomad;
in
{
config = {
age.secrets = {
} //
# Consul -------------------------------
lib.optionalAttrs consulCfg.enable {
"consul.d/gossip.json" = {
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;
owner = "consul";
group = "consul";
mode = "644";
};
"consul.d/agent-token-reykjavik.json" = {
file = ../secrets/consul.d/agent-token-reykjavik.json.age;
owner = "consul";
group = "consul";
mode = "644";
};
"consul.d/agent-token-thingvellir.json" = {
file = ../secrets/consul.d/agent-token-thingvellir.json.age;
owner = "consul";
group = "consul";
mode = "644";
};
} //
# Nomad -------------------------------
lib.optionalAttrs nomadCfg.enable {
"nomad.d/consul-token.json" = {
file = ../secrets/nomad.d/consul-token.json.age;
mode = "644";
};
};
};
}