feat: clean up colmena a little, fix nginx default vhost

This commit is contained in:
Kat Inskip 2025-10-19 13:57:39 -07:00
parent cb7eb46ee7
commit 2189d0592f
Signed by: kat
GPG key ID: 465E64DECEA8CF0F
4 changed files with 32 additions and 21 deletions

View file

@ -1,11 +1,10 @@
{
name,
config,
lib,
inputs,
...
}: let
inherit (lib.modules) mkIf mkOptionDefault mkDefault;
inherit (lib.modules) mkOptionDefault mkDefault;
in {
options = let
inherit (lib.types) nullOr;
@ -23,22 +22,5 @@ in {
"all"
];
};
deploy = let
nixos = config.built;
in {
sshUser = mkOptionDefault "deploy";
user = mkOptionDefault "root";
sshOpts = mkIf (config.type == "NixOS") (
mkOptionDefault ["-p" "${builtins.toString (builtins.head nixos.config.services.openssh.ports)}"]
);
autoRollback = mkOptionDefault true;
magicRollback = mkOptionDefault true;
fastConnection = mkOptionDefault false;
hostname = mkOptionDefault "${name}.devices.inskip.me";
profiles.system = {
user = "root";
path = inputs.deploy-rs.lib.${config.system}.activate.nixos inputs.self.nixosConfigurations.${name};
};
};
};
}