From 92fb8a94760f222002535f70180699c7284b468d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 10 May 2023 21:39:43 +0200 Subject: [PATCH] fix terraform module --- .gitignore | 1 + flake.nix | 3 +++ terraform/targets/nixos-wiki.thalheim.io/terraform.tf | 2 +- terraform/targets/staging.nixos-wiki.thalheim.io/terraform.tf | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) 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" }