kiara/Fediversity
1
0
Fork 0
forked from Fediversity/Fediversity
Code Pull requests Activity

account for 285

Browse source
This commit is contained in:
Kiara Grouwstra 2025-05-09 15:16:31 +02:00
parent 8135d3e1b8
commit a34ebc8a34
Signed by: kiara
SSH key fingerprint: SHA256:COspvLoLJ5WC5rFb9ZDe5urVCkK4LJZOsjfF4duRJFU
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
launch/main.tf
View file

@ -16,7 +16,7 @@ locals {
garage = var.garage
} : name => merge(inst, {
# enable if any user applications are enabled
enable = anytrue([for _, app in local.application_configs: app.enable])
enable = anytrue([for _, app in local.application_configs: try(app.enable, false)])
}) }
}
@ -33,7 +33,7 @@ resource "terraform_data" "nixos" {
for_each = {for name, inst in merge(
local.peripherals,
local.application_configs,
) : name => inst if inst.enable}
) : name => inst if try(inst.enable, false)}
# trigger rebuild/deploy if (FIXME?) any potentially used config/code changed,
# preventing these (20+s, build being bottleneck) when nothing changed.

2
panel/src/panel/views.py
View file

@ -113,7 +113,7 @@ class DeploymentStatus(ConfigurationForm):
} | {
# pass in form info to our deployment
# FIXME: ensure sensitive info is protected
f"TF_VAR_{k}": v if isinstance(v, str) else json.dumps(v) for k, v in config.json().items()
f"TF_VAR_{k}": v if isinstance(v, str) else json.dumps(v) for k, v in json.loads(config.model_dump_json()).items()
}
logger.info("env: %s", env)
cwd = f"{settings.repo_dir}/launch"