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

Track machines' descriptions

Browse source
This commit is contained in:
Nicolas Jeannerod 2025-02-25 10:46:28 +01:00
parent f34f2e45ab
commit b42d654ab6
Signed by untrusted user: Niols
GPG key ID: 35DB9EC8886E1CB8
7 changed files with 26 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
infra/common/options.nix
View file

@ -41,6 +41,15 @@ in
''; '';
}; };
description = mkOption {
description = ''
A human-readable description of the machine's purpose. It should be
constituted of a first line giving a very short description, followed
by a blank line, then followed by more details if necessary.
'';
default = "";
};
########################################################################## ##########################################################################
## Virtualised hardware ## Virtualised hardware

3
infra/flake-part.nix
View file

@ -115,9 +115,12 @@ let
inherit ((makeResourceConfig { inherit vmName isTestVm; }).fediversityVm) inherit ((makeResourceConfig { inherit vmName isTestVm; }).fediversityVm)
proxmox proxmox
vmId vmId
description
sockets sockets
cores cores
memory memory
hostPublicKey hostPublicKey
unsafeHostPrivateKey unsafeHostPrivateKey
; ;

2
infra/machines/fedi200/default.nix
View file

@ -2,6 +2,8 @@
fediversityVm = { fediversityVm = {
vmId = 200; vmId = 200;
proxmox = "fediversity"; proxmox = "fediversity";
description = "Testing machine for Hans";
domain = "abundos.eu"; domain = "abundos.eu";
ipv4 = { ipv4 = {
address = "95.215.187.200"; address = "95.215.187.200";

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

@ -1,5 +1,9 @@
{ {
fediversityVm = { fediversityVm = {
vmId = 201;
proxmox = "fediversity";
description = "FediPanel";
domain = "abundos.eu"; domain = "abundos.eu";
ipv4 = { ipv4 = {
address = "95.215.187.201"; address = "95.215.187.201";

3
infra/machines/vm02116/default.nix
View file

@ -1,5 +1,8 @@
{ {
fediversityVm = { fediversityVm = {
proxmox = "procolix";
description = "Forgejo";
ipv4.address = "185.206.232.34"; ipv4.address = "185.206.232.34";
ipv6.address = "2a00:51c0:12:1201::20"; ipv6.address = "2a00:51c0:12:1201::20";
}; };

3
infra/machines/vm02187/default.nix
View file

@ -1,5 +1,8 @@
{ {
fediversityVm = { fediversityVm = {
proxmox = "procolix";
description = "Wiki";
ipv4.address = "185.206.232.187"; ipv4.address = "185.206.232.187";
ipv6.address = "2a00:51c0:12:1201::187"; ipv6.address = "2a00:51c0:12:1201::187";
}; };

2
infra/proxmox-provision.sh
View file

@ -181,6 +181,7 @@ grab_vm_options () {
proxmox=$(echo "$options" | jq -r .proxmox) proxmox=$(echo "$options" | jq -r .proxmox)
vm_id=$(echo "$options" | jq -r .vmId) vm_id=$(echo "$options" | jq -r .vmId)
description=$(echo "$options" | jq -r .description)
if [ "$proxmox" != fediversity ]; then if [ "$proxmox" != fediversity ]; then
die "I do not know how to provision things that are not Fediversity VMs, die "I do not know how to provision things that are not Fediversity VMs,
@ -286,6 +287,7 @@ create_vm () {
vmid=="$vm_id" \ vmid=="$vm_id" \
name=="$vm_name" \ name=="$vm_name" \
pool==Fediversity \ pool==Fediversity \
description=="$description" \
\ \
ide2=="local:iso/installer-$vm_name.iso,media=cdrom" \ ide2=="local:iso/installer-$vm_name.iso,media=cdrom" \
ostype==l26 \ ostype==l26 \