diff --git a/launch/main.tf b/launch/main.tf index 2e4aabcc..3fd5a5b5 100644 --- a/launch/main.tf +++ b/launch/main.tf @@ -1,3 +1,7 @@ +variable "nixos-anywhere" { + type = string +} + variable "domain" { type = string default = "fediversity.net" @@ -54,6 +58,7 @@ variable "initialUser" { # hostname = "test01" # config = "garage" # initialUser = var.initialUser +# nixos-anywhere = var.nixos-anywhere # } module "mastodon" { @@ -63,6 +68,7 @@ module "mastodon" { hostname = "test02" config = "mastodon" initialUser = var.initialUser + nixos-anywhere = var.nixos-anywhere } module "pixelfed" { @@ -72,6 +78,7 @@ module "pixelfed" { hostname = "test04" config = "pixelfed" initialUser = var.initialUser + nixos-anywhere = var.nixos-anywhere } module "peertube" { @@ -81,4 +88,5 @@ module "peertube" { hostname = "test03" config = "peertube" initialUser = var.initialUser + nixos-anywhere = var.nixos-anywhere } diff --git a/launch/vm/main.tf b/launch/vm/main.tf index c616d0e0..76c18af5 100644 --- a/launch/vm/main.tf +++ b/launch/vm/main.tf @@ -1,3 +1,7 @@ +variable "nixos-anywhere" { + type = string +} + variable "domain" { type = string } @@ -21,7 +25,7 @@ variable "initialUser" { module "deploy" { # source = "github.com/nix-community/nixos-anywhere//terraform/all-in-one" - source = "github.com/KiaraGrouwstra/nixos-anywhere?ref=special-args-nested-flake-fixed//terraform/all-in-one" + source = "${var.nixos-anywhere}//terraform/all-in-one" nixos_system_attr = ".#nixosConfigurations.${var.config}.config.system.build.toplevel" nixos_partitioner_attr = ".#nixosConfigurations.${var.config}.config.system.build.diskoScriptNoDeps" # when instance id changes, it will trigger a reinstall