diff --git a/modules/config/instances/config/vaultwarden.nix b/modules/config/instances/config/vaultwarden.nix index 8b5ec28..4f36360 100755 --- a/modules/config/instances/config/vaultwarden.nix +++ b/modules/config/instances/config/vaultwarden.nix @@ -61,35 +61,25 @@ in }; }; }; - interface1 = - let - domain = "vault.${domain0}"; - secrets = "${secretPath}/${name}"; - in - { - domain = domain; - subdomain = "vault"; - email = "noreply@${domain0}"; - microvm = { - id = "vm-${name}"; - mac = "02:00:00:00:51:01"; - idUser = "vmuser-vault"; - macUser = "02:00:00:00:00:01"; - ip = "192.168.50.111"; - gate = "192.168.50.1"; - ssh = 2201; + interface1 = { + subdomain = "vault"; + microvm = { + id = "vm-${name}"; + mac = "02:00:00:00:51:01"; + idUser = "vmuser-vault"; + macUser = "02:00:00:00:00:01"; + ip = "192.168.50.111"; + gate = "192.168.50.1"; + ssh = 2201; + }; + paths = { + varPaths = { + path0 = "${varPath}/${name}"; }; - paths = { - varPaths = { - path0 = "${varPath}/${name}"; - }; - mntPaths = { - path0 = "${mntPath}/${name}"; - }; - secretPaths = { - path0 = secrets; - }; + mntPaths = { + path0 = "${mntPath}/${name}"; }; }; + }; }; } diff --git a/modules/nixos/homelab/guests/vaultwarden/config/default.nix b/modules/nixos/homelab/guests/vaultwarden/config/default.nix index 072fa7e..2a08669 100755 --- a/modules/nixos/homelab/guests/vaultwarden/config/default.nix +++ b/modules/nixos/homelab/guests/vaultwarden/config/default.nix @@ -18,6 +18,7 @@ in ssh, host, mnt, + inter, }: { microvm.vms = { @@ -87,7 +88,7 @@ in network = { enable = true; networks."20-lan" = { - matchConfig.Name = "enp0s5"; + matchConfig.Name = inter; addresses = [ { Address = "${ip}/24"; } ]; diff --git a/modules/nixos/homelab/guests/vaultwarden/vaultwardenCeres/default.nix b/modules/nixos/homelab/guests/vaultwarden/vaultwardenCeres/default.nix index dbfd9ba..3fba7a2 100755 --- a/modules/nixos/homelab/guests/vaultwarden/vaultwardenCeres/default.nix +++ b/modules/nixos/homelab/guests/vaultwarden/vaultwardenCeres/default.nix @@ -19,6 +19,7 @@ let userMac = interface0Cfg.microvm.macUser; ssh = interface0Cfg.microvm.ssh; mnt = mntPath; + inter = "enp0s6"; host = "${interface0Cfg.subdomain}.${flake.inputs.linkpage.secrets.domains.projectsite}"; }; in diff --git a/modules/nixos/homelab/guests/vaultwarden/vaultwardenEris/default.nix b/modules/nixos/homelab/guests/vaultwarden/vaultwardenEris/default.nix index 3a87c0d..ffbeb66 100755 --- a/modules/nixos/homelab/guests/vaultwarden/vaultwardenEris/default.nix +++ b/modules/nixos/homelab/guests/vaultwarden/vaultwardenEris/default.nix @@ -19,6 +19,7 @@ let userMac = interface0Cfg.microvm.macUser; ssh = interface0Cfg.microvm.ssh; mnt = guestPath user0; + inter = "enp0s5"; host = interface0Cfg.domain; };