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

terraform-nixos #1

Closed
kiara wants to merge 57 commits from terraform-nixos into tf
pull from: terraform-nixos
merge into: kiara:tf
Conversation 1 Commits 57 Files changed 34 +4 -2
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 8f785d7582 - Show all commits

4
infra/machines/fedi201/fedipanel.nix
View file

@ -1,6 +1,5 @@
{ {
config, config,
pkgs,
... ...
}: }:
let let
@ -55,6 +54,9 @@ in
CSRF_TRUSTED_ORIGINS = [ "https://${cfg.domain}" ]; CSRF_TRUSTED_ORIGINS = [ "https://${cfg.domain}" ];
COMPRESS_OFFLINE = true; COMPRESS_OFFLINE = true;
LIBSASS_OUTPUT_STYLE = "compressed"; LIBSASS_OUTPUT_STYLE = "compressed";
ENV_VARS = {
ssh_private_key_file = config.age.secrets.panel-ssh-key.path;
};
}; };
secrets = { secrets = {
SECRET_KEY = config.age.secrets.panel-secret-key.path; SECRET_KEY = config.age.secrets.panel-secret-key.path;

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

@ -146,7 +146,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 deployment_params.items() f"TF_VAR_{k}": v if isinstance(v, str) else json.dumps(v) for k, v in (settings.ENV_VARS | deployment_params).items()
} }
cwd = f"{settings.repo_dir}/launch" cwd = f"{settings.repo_dir}/launch"
cmd = [ cmd = [