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

rename deployment method to prep for separation

Browse source 
Signed-off-by: Kiara Grouwstra <kiara@procolix.eu>
This commit is contained in:
Kiara Grouwstra 2025-10-21 15:09:15 +02:00
parent 9ede4a41f8
commit c0e0aa1ee6
Signed by: kiara
SSH key fingerprint: SHA256:COspvLoLJ5WC5rFb9ZDe5urVCkK4LJZOsjfF4duRJFU
9 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
deployment/check/data-model-tf-proxmox/data-model.nix
View file

@ -46,7 +46,7 @@ in
deployment-name, deployment-name,
}: }:
{ {
tf-proxmox-host = { tf-proxmox-vm = {
nixos-configuration = mkNixosConfiguration environment required-resources; nixos-configuration = mkNixosConfiguration environment required-resources;
system = targetSystem; system = targetSystem;
ssh = { ssh = {

8
deployment/check/data-model-tf-proxmox/nixosTest.nix
View file

@ -38,14 +38,14 @@ let
ipv6Gateway = ""; ipv6Gateway = "";
ipv6Address = ""; ipv6Address = "";
}; };
}).default.tf-proxmox-host; }).default.tf-proxmox-vm;
in in
{ {
_class = "nixosTest"; _class = "nixosTest";
name = "deployment-model"; name = "deployment-model";
sourceFileset = lib.fileset.unions [ sourceFileset = lib.fileset.unions [
../../run/tf-proxmox/run.sh ../../run/tf-proxmox-vm/run.sh
../../run/tf-proxmox/await-ssh.sh ../../run/tf-proxmox-vm/await-ssh.sh
]; ];
nodes.pve = nodes.pve =
@ -114,7 +114,7 @@ in
pkgs.pve-manager pkgs.pve-manager
pkgs.openssl pkgs.openssl
pkgs.jq pkgs.jq
(pkgs.callPackage ../../run/tf-proxmox/tf.nix { }) (pkgs.callPackage ../../run/tf-proxmox-vm/tf.nix { })
]; ];
# needed only when building from deployer # needed only when building from deployer

12
deployment/data-model.nix
View file

@ -284,7 +284,7 @@ let
}; };
}); });
}; };
tf-proxmox-host = mkOption { tf-proxmox-vm = mkOption {
description = "A Terraform deployment by SSH to update a single existing NixOS host."; description = "A Terraform deployment by SSH to update a single existing NixOS host.";
type = submodule (tf-host: { type = submodule (tf-host: {
options = { options = {
@ -395,7 +395,7 @@ let
key-file key-file
sshOpts sshOpts
; ;
deployment-type = "tf-proxmox-host"; deployment-type = "tf-proxmox-vm";
nixos_conf = writeConfig { nixos_conf = writeConfig {
inherit inherit
system system
@ -464,10 +464,10 @@ let
}; };
tf-env = pkgs.callPackage ./run/tf-env.nix { tf-env = pkgs.callPackage ./run/tf-env.nix {
inherit httpBackend; inherit httpBackend;
tfPackage = pkgs.callPackage ./run/tf-proxmox/tf.nix { }; tfPackage = pkgs.callPackage ./run/tf-proxmox-vm/tf.nix { };
tfDirs = [ tfDirs = [
"deployment/run/tf-single-host" "deployment/run/tf-single-host"
"deployment/run/tf-proxmox" "deployment/run/tf-proxmox-vm"
]; ];
}; };
vm_name = "test14"; vm_name = "test14";
@ -478,7 +478,7 @@ let
pkgs.qemu pkgs.qemu
pkgs.nixos-generators pkgs.nixos-generators
pkgs.httpie pkgs.httpie
(pkgs.callPackage ./run/tf-proxmox/tf.nix { }) (pkgs.callPackage ./run/tf-proxmox-vm/tf.nix { })
]) ])
'' ''
set -e set -e
@ -499,7 +499,7 @@ let
env ${toString (lib.mapAttrsToList (k: v: "TF_VAR_${k}=\"${toBash v}\"") environment)} \ env ${toString (lib.mapAttrsToList (k: v: "TF_VAR_${k}=\"${toBash v}\"") environment)} \
${toString (lib.mapAttrsToList (k: v: "${k}=\"${toBash v}\"") httpBackend)} \ ${toString (lib.mapAttrsToList (k: v: "${k}=\"${toBash v}\"") httpBackend)} \
TF_VAR_image=/tmp/${name}.qcow2 \ TF_VAR_image=/tmp/${name}.qcow2 \
tf_env=${tf-env} bash ./deployment/run/tf-proxmox/run.sh tf_env=${tf-env} bash ./deployment/run/tf-proxmox-vm/run.sh
''; '';
# # don't really wanna deal with having to do versioned updates for now # # don't really wanna deal with having to do versioned updates for now
# qemu-img convert -f raw -O qcow2 -C "${machine.config.system.build.image}/${name}.raw" /tmp/${name}.qcow2 # qemu-img convert -f raw -O qcow2 -C "${machine.config.system.build.image}/${name}.raw" /tmp/${name}.qcow2

0
deployment/run/tf-proxmox/await-ssh.sh → deployment/run/tf-proxmox-vm/await-ssh.sh
View file

0
deployment/run/tf-proxmox/main.tf → deployment/run/tf-proxmox-vm/main.tf
View file

2
deployment/run/tf-proxmox/run.sh → deployment/run/tf-proxmox-vm/run.sh
View file

@ -5,7 +5,7 @@ declare tf_env
# # on upload explodes RAM use + logs file content, causing timeout # # on upload explodes RAM use + logs file content, causing timeout
# export TF_LOG=debug # export TF_LOG=debug
cd "${tf_env}/deployment/run/tf-proxmox" cd "${tf_env}/deployment/run/tf-proxmox-vm"
# parallelism=1: limit OOM risk # parallelism=1: limit OOM risk
TF_LOG=info tofu apply --auto-approve -input=false -parallelism=1 >&2 TF_LOG=info tofu apply --auto-approve -input=false -parallelism=1 >&2
TF_LOG=error tofu output -json TF_LOG=error tofu output -json

0
deployment/run/tf-proxmox/tf.nix → deployment/run/tf-proxmox-vm/tf.nix
View file

0
deployment/run/tf-proxmox/variables.tf → deployment/run/tf-proxmox-vm/variables.tf
View file

2
flake.nix
View file

@ -110,7 +110,7 @@
# ipv6Address = "2a00:51c0:13:1305::${vm-id}"; # ipv6Address = "2a00:51c0:13:1305::${vm-id}";
}; };
# opt not to pass `inputs`, as we could only pass serializable arguments through to its self-call # opt not to pass `inputs`, as we could only pass serializable arguments through to its self-call
})."tf-proxmox-deployment".tf-proxmox-host })."tf-proxmox-deployment".tf-proxmox-vm
} }
''; '';
in in