diff --git a/.sops.yaml b/.sops.yaml index a9e2120..9aaaeab 100644 --- a/.sops.yaml +++ b/.sops.yaml @@ -5,7 +5,7 @@ keys: - &julienmalka age109qksyjgdnf7elnk98dh4vtxt0epju7xjemlqng0j0x75st5zg9qm9h3hy creation_rules: - - path_regex: targets/nixos-wiki2\.thalheim\.io/secrets\.yaml$ + - path_regex: targets/nixos-wiki\.nixos\.org/secrets/* key_groups: - age: - *joerg diff --git a/targets/nixos-wiki.nixos.org/configuration.nix b/targets/nixos-wiki.nixos.org/configuration.nix index 94aff7e..aa70fd3 100644 --- a/targets/nixos-wiki.nixos.org/configuration.nix +++ b/targets/nixos-wiki.nixos.org/configuration.nix @@ -25,6 +25,6 @@ in noReplyAddress = "nixos-wiki-no-reply@thalheim.io"; }; - sops.defaultSopsFile = ./secrets.yaml; + sops.defaultSopsFile = ./secrets/secrets.yaml; boot.loader.grub.devices = lib.mkForce [ "/dev/sda" ]; } diff --git a/targets/nixos-wiki.nixos.org/secrets.yaml b/targets/nixos-wiki.nixos.org/secrets/secrets.yaml similarity index 100% rename from targets/nixos-wiki.nixos.org/secrets.yaml rename to targets/nixos-wiki.nixos.org/secrets/secrets.yaml diff --git a/targets/nixos-wiki.nixos.org/terraform.tf b/targets/nixos-wiki.nixos.org/terraform.tf index 5c68225..6c02ea0 100644 --- a/targets/nixos-wiki.nixos.org/terraform.tf +++ b/targets/nixos-wiki.nixos.org/terraform.tf @@ -14,7 +14,7 @@ module "wiki" { domain = "nixos-wiki2.thalheim.io" nixos_flake_attr = "nixos-wiki-nixos-org" nixos_vars_file = "${path.module}/nixos-vars.json" - sops_file = abspath("${path.module}/secrets.yaml") + sops_file = abspath("${path.module}/secrets/secrets.yaml") tags = { Terraform = "true" Target = "wiki.nixos.org"