diff --git a/.gitignore b/.gitignore index 5978127..9c47f86 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /.envrc.private +.terraform.lock.hcl diff --git a/flake.nix b/flake.nix index 472cb57..f5acc91 100644 --- a/flake.nix +++ b/flake.nix @@ -28,6 +28,9 @@ (pkgs.terraform.withPlugins (p: [ p.netlify p.hcloud + p.null + p.external + p.local ])) ]; }; diff --git a/terraform/targets/nixos-wiki.thalheim.io/terraform.tf b/terraform/targets/nixos-wiki.thalheim.io/terraform.tf index 62532b5..c572770 100644 --- a/terraform/targets/nixos-wiki.thalheim.io/terraform.tf +++ b/terraform/targets/nixos-wiki.thalheim.io/terraform.tf @@ -10,7 +10,7 @@ terraform { } module "wiki" { - source = "${path.module}/../../modules/nixos-wiki.thalheim.io" + source = "../../modules/wiki" admin_ssh_keys = { mic92 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKbBp2dH2X3dcU1zh+xW3ZsdYROKpJd3n13ssOP092qE joerg@turingmachine" } diff --git a/terraform/targets/staging.nixos-wiki.thalheim.io/terraform.tf b/terraform/targets/staging.nixos-wiki.thalheim.io/terraform.tf index 8a15c73..930a249 100644 --- a/terraform/targets/staging.nixos-wiki.thalheim.io/terraform.tf +++ b/terraform/targets/staging.nixos-wiki.thalheim.io/terraform.tf @@ -10,7 +10,7 @@ terraform { } module "wiki" { - source = "${path.module}/../../modules/staging.nixos-wiki.thalheim.io" + source = "../../modules/wiki" admin_ssh_keys = { mic92 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKbBp2dH2X3dcU1zh+xW3ZsdYROKpJd3n13ssOP092qE joerg@turingmachine" }