From fee2017fd43f4dc43e3086c6ccbc960b6983939c Mon Sep 17 00:00:00 2001 From: Kaare Hoff Skovgaard Date: Mon, 14 Jul 2025 23:41:25 +0200 Subject: [PATCH] Fix some minor issues Former-commit-id: f8a0434e2b37b13493beea4db523eb4ce9ca9d25 --- nix/packages/bw-opentofu/secrets-map.nix | 2 +- .../aarch64-linux/security.kaareskovgaard.net/default.nix | 3 --- .../aarch64-linux/security.kaareskovgaard.net/openbao.nix | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/nix/packages/bw-opentofu/secrets-map.nix b/nix/packages/bw-opentofu/secrets-map.nix index 32c3973..8109b39 100644 --- a/nix/packages/bw-opentofu/secrets-map.nix +++ b/nix/packages/bw-opentofu/secrets-map.nix @@ -25,7 +25,7 @@ "AUTHENTIK_TOKEN" = "Admin API Token"; "TF_VAR_authentik_username" = "login.username"; }; - "vault-test.kaareskovgaard.net" = { + "vault.kaareskovgaard.net" = { "VAULT_TOKEN" = "Initial root token"; }; } diff --git a/nix/systems/aarch64-linux/security.kaareskovgaard.net/default.nix b/nix/systems/aarch64-linux/security.kaareskovgaard.net/default.nix index d133d2a..db4fe80 100644 --- a/nix/systems/aarch64-linux/security.kaareskovgaard.net/default.nix +++ b/nix/systems/aarch64-linux/security.kaareskovgaard.net/default.nix @@ -14,9 +14,6 @@ enable = true; server_type = "cax11"; }; - virtualisation.vmVariant.virtualisation.host.pkgs = import inputs.nixpkgs { - system = "aarch64-darwin"; - }; # Cannot use vault for secrets source, as this is the server containing vault. khscodes.infrastructure.provisioning.pre.secretsSource = "bitwarden"; khscodes.infrastructure.provisioning.post.secretsSource = "bitwarden"; diff --git a/nix/systems/aarch64-linux/security.kaareskovgaard.net/openbao.nix b/nix/systems/aarch64-linux/security.kaareskovgaard.net/openbao.nix index 99bd7b3..4e5f123 100644 --- a/nix/systems/aarch64-linux/security.kaareskovgaard.net/openbao.nix +++ b/nix/systems/aarch64-linux/security.kaareskovgaard.net/openbao.nix @@ -1,6 +1,6 @@ { pkgs, config, ... }: let - domain = "vault-test.kaareskovgaard.net"; + domain = config.infrastructure.openbao.domain; in { config = {