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:08 +02:00
parent ac7a059d05
commit ef4876239d
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
infra/operator/main.tf
View file

@ -23,7 +23,7 @@ locals {
hostname = inst hostname = inst
cfg = { cfg = {
# enable if any user applications are enabled # enable if any user applications are enabled
enable = anytrue([for _, app in local.application_configs: app.cfg.enable]) enable = anytrue([for _, app in local.application_configs: try(app.cfg.enable, false)])
} }
} }
} }
@ -70,5 +70,5 @@ module "nixos" {
]; ];
} }
EOF EOF
}) if inst.cfg.enable} }) if try(inst.cfg.enable, false)}
} }

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

@ -115,7 +115,7 @@ class DeploymentStatus(ConfigurationForm):
} | { } | {
# pass in form info to our deployment # pass in form info to our deployment
# FIXME: ensure sensitive info is protected # 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) logger.info("env: %s", env)
cwd = f"{settings.repo_dir}/infra/operator" cwd = f"{settings.repo_dir}/infra/operator"