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 +11 -3
3 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 265d79aeef - Show all commits

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

@ -1,5 +1,6 @@
{ {
config, config,
lib,
... ...
}: }:
let let
@ -54,10 +55,12 @@ 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;
};
}; };
environment = {
TF_VARS = lib.strings.toJSON {
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;
}; };

1
panel/env.nix
View file

@ -13,4 +13,5 @@
pkgs.gnugrep # used in terraform-nixos pkgs.gnugrep # used in terraform-nixos
(import ../launch/tf.nix { inherit lib pkgs; }) (import ../launch/tf.nix { inherit lib pkgs; })
]; ];
TF_VARS = lib.strings.toJSON { };
} }

4
panel/src/panel/settings.py
View file

@ -14,6 +14,7 @@ import re
import sys import sys
import subprocess import subprocess
import os import os
import json
import importlib.util import importlib.util
import dj_database_url import dj_database_url
@ -257,3 +258,6 @@ bin_path=env['BIN_PATH']
# path of the root flake to trigger nixops from, see #94. # path of the root flake to trigger nixops from, see #94.
# to deploy this should be specified, for dev just use a relative path. # to deploy this should be specified, for dev just use a relative path.
repo_dir = env["REPO_DIR"] repo_dir = env["REPO_DIR"]
ENV_VARS = json.loads(env["TF_VARS"]) | {
}