fixup! vault: implement bootstrap integration
Some checks failed
Run nix flake check / flake-check (push) Failing after 15m38s
Some checks failed
Run nix flake check / flake-check (push) Failing after 15m38s
This commit is contained in:
@@ -109,8 +109,8 @@ in
|
||||
RemainAfterExit = true;
|
||||
ExecStart = "${bootstrap-script}/bin/nixos-bootstrap";
|
||||
|
||||
# Read environment variables from /etc/environment (set by cloud-init)
|
||||
EnvironmentFile = "-/etc/environment";
|
||||
# Read environment variables from /run/cloud-init-env (set by cloud-init)
|
||||
EnvironmentFile = "-/run/cloud-init-env";
|
||||
|
||||
# Logging to journald
|
||||
StandardOutput = "journal+console";
|
||||
|
||||
@@ -17,7 +17,7 @@ resource "proxmox_cloud_init_disk" "ci" {
|
||||
- ${each.value.ssh_public_key}
|
||||
${each.value.flake_branch != null || each.value.vault_wrapped_token != null ? <<-FILES
|
||||
write_files:
|
||||
- path: /etc/environment
|
||||
- path: /run/cloud-init-env
|
||||
content: |
|
||||
%{~ if each.value.flake_branch != null ~}
|
||||
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_SKIP_VERIFY=1
|
||||
%{~ endif ~}
|
||||
append: true
|
||||
permissions: '0600'
|
||||
FILES
|
||||
: ""}
|
||||
EOT
|
||||
|
||||
Reference in New Issue
Block a user