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

drop nixops-specific fediversityVm properties set only in static machines directories

Browse source
This commit is contained in:
Kiara Grouwstra 2025-05-11 13:30:43 +02:00
parent 84e5b67d25
commit 3834d92762
Signed by: kiara
SSH key fingerprint: SHA256:COspvLoLJ5WC5rFb9ZDe5urVCkK4LJZOsjfF4duRJFU
1 changed files with 0 additions and 86 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

86
infra/common/options.nix
View file

@ -2,81 +2,11 @@
let let
inherit (lib) mkOption; inherit (lib) mkOption;
inherit (lib.types) types;
in in
{ {
options.fediversityVm = { options.fediversityVm = {
##########################################################################
## Meta
name = mkOption {
description = ''
The name of the machine. Most of the time, this will look like `vm02XXX`
or `fediYYY`.
'';
};
proxmox = mkOption {
type = types.nullOr (
types.enum [
"procolix"
"fediversity"
]
);
description = ''
The Proxmox instance. This is used for provisioning only and should be
set to `null` if the machine is not a VM.
'';
};
vmId = mkOption {
# REVIEW: There is `types.ints.between` but maybe not `types.ints.above`?
type = types.nullOr (types.addCheck types.int (x: x >= 100));
description = ''
The id of the machine in the corresponding Proxmox. This is used for
provisioning only and should be set to `null` if the machine is not a
VM.
'';
};
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
sockets = mkOption {
type = types.int;
description = "The number of sockets of the VM.";
default = 1;
};
cores = mkOption {
type = types.int;
description = "The number of cores of the VM.";
default = 1;
};
memory = mkOption {
type = types.int;
description = "The amount of memory of the VM in MiB.";
default = 2048;
};
diskSize = mkOption {
type = types.int;
description = "The amount of disk of the VM in GiB.";
default = 32;
};
########################################################################## ##########################################################################
## Networking ## Networking
@ -137,21 +67,5 @@ in
default = "2a00:51c0:12:1201::1"; # FIXME: compute default from `address` and `prefixLength`. default = "2a00:51c0:12:1201::1"; # FIXME: compute default from `address` and `prefixLength`.
}; };
}; };
hostPublicKey = mkOption {
description = ''
The ed25519 host public key of the machine. It is used to filter Age
secrets and only keep the relevant ones, and to feed to NixOps4.
'';
};
unsafeHostPrivateKey = mkOption {
default = null;
description = ''
The ed25519 host private key of the machine. It is used when
provisioning to have a predictable public key. Warning: only ever use
this for testing machines, as it is a security hole for so many reasons.
'';
};
}; };
} }