torjus/nixos-servers
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 1 Releases Wiki Activity

fixup! vault: implement bootstrap integration
Some checks failed
Run nix flake check / flake-check (push) Failing after 15m38s
Details

Browse Source
This commit is contained in:
Torjus Håkestad
2026-02-02 23:39:25 +01:00
parent 389a838327
commit a3553999b7
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
hosts/template2/bootstrap.nix
View File

@@ -109,8 +109,8 @@ in
RemainAfterExit = true; RemainAfterExit = true;
ExecStart = "${bootstrap-script}/bin/nixos-bootstrap"; ExecStart = "${bootstrap-script}/bin/nixos-bootstrap";
# Read environment variables from /etc/environment (set by cloud-init) # Read environment variables from /run/cloud-init-env (set by cloud-init)
EnvironmentFile = "-/etc/environment"; EnvironmentFile = "-/run/cloud-init-env";
# Logging to journald # Logging to journald
StandardOutput = "journal+console"; StandardOutput = "journal+console";

4
terraform/cloud-init.tf
View File

@@ -17,7 +17,7 @@ resource "proxmox_cloud_init_disk" "ci" {
- ${each.value.ssh_public_key} - ${each.value.ssh_public_key}
${each.value.flake_branch != null || each.value.vault_wrapped_token != null ? <<-FILES ${each.value.flake_branch != null || each.value.vault_wrapped_token != null ? <<-FILES
write_files: write_files:
- path: /etc/environment - path: /run/cloud-init-env
content: | content: |
%{~ if each.value.flake_branch != null ~} %{~ if each.value.flake_branch != null ~}
NIXOS_FLAKE_BRANCH=${each.value.flake_branch} NIXOS_FLAKE_BRANCH=${each.value.flake_branch}
@@ -27,7 +27,7 @@ resource "proxmox_cloud_init_disk" "ci" {
VAULT_WRAPPED_TOKEN=${each.value.vault_wrapped_token} VAULT_WRAPPED_TOKEN=${each.value.vault_wrapped_token}
VAULT_SKIP_VERIFY=1 VAULT_SKIP_VERIFY=1
%{~ endif ~} %{~ endif ~}
append: true permissions: '0600'
FILES FILES
: ""} : ""}
EOT EOT