From 4bae308c794d805c5990636ab59f9656e36ec093 Mon Sep 17 00:00:00 2001 From: Nick Date: Wed, 10 Dec 2025 18:44:03 -0600 Subject: [PATCH] test: project vault fucked --- modules/config/instances/config/opencloud.nix | 49 +++++++------------ .../guests/opencloud/config/default.nix | 3 +- .../opencloud/opencloudCeres/default.nix | 1 + .../opencloud/opencloudEris/default.nix | 1 + 4 files changed, 21 insertions(+), 33 deletions(-) diff --git a/modules/config/instances/config/opencloud.nix b/modules/config/instances/config/opencloud.nix index fb13f75..568e0d3 100755 --- a/modules/config/instances/config/opencloud.nix +++ b/modules/config/instances/config/opencloud.nix @@ -59,40 +59,25 @@ in }; }; }; - interface1 = - let - domain = "${short}.${domain0}"; - secrets = "${secretPath}/${name}"; - ssl = "${sslPath}/${name}.${domain0}"; - in - { - domain = domain; - subdomain = short; - microvm = { - id = "vm-${short}"; - mac = "02:00:00:00:56:06"; - idUser = "vmuser-${short}"; - macUser = "02:00:00:00:00:06"; - ip = "192.168.50.116"; - gate = "192.168.50.1"; - ssh = 2206; + interface1 = { + subdomain = short; + microvm = { + id = "vm-${short}"; + mac = "02:00:00:00:56:06"; + idUser = "vmuser-${short}"; + macUser = "02:00:00:00:00:06"; + ip = "192.168.50.116"; + gate = "192.168.50.1"; + ssh = 2206; + }; + paths = { + varPaths = { + path0 = "${varPath}/${name}"; }; - ssl = { - path = ssl; - cert = "${ssl}/fullchain.pem"; - key = "${ssl}/key.pem"; - }; - paths = { - varPaths = { - path0 = "${varPath}/${name}"; - }; - mntPaths = { - path0 = "${mntPath}/${name}"; - }; - secretPaths = { - path0 = secrets; - }; + mntPaths = { + path0 = "${mntPath}/${name}"; }; }; + }; }; } diff --git a/modules/nixos/homelab/guests/opencloud/config/default.nix b/modules/nixos/homelab/guests/opencloud/config/default.nix index 221f87d..c401168 100755 --- a/modules/nixos/homelab/guests/opencloud/config/default.nix +++ b/modules/nixos/homelab/guests/opencloud/config/default.nix @@ -18,6 +18,7 @@ in ssh, mnt, host, + inter, }: { microvm.vms = { @@ -91,7 +92,7 @@ in network = { enable = true; networks."20-lan" = { - matchConfig.Name = "enp0s6"; + matchConfig.Name = inter; addresses = [ { Address = "${ip}/24"; } ]; diff --git a/modules/nixos/homelab/guests/opencloud/opencloudCeres/default.nix b/modules/nixos/homelab/guests/opencloud/opencloudCeres/default.nix index cdf850d..44d4d59 100755 --- a/modules/nixos/homelab/guests/opencloud/opencloudCeres/default.nix +++ b/modules/nixos/homelab/guests/opencloud/opencloudCeres/default.nix @@ -19,6 +19,7 @@ let userMac = interface0Cfg.microvm.macUser; ssh = interface0Cfg.microvm.ssh; mnt = mntPath; + inter = "enp0s5"; host = "${interface0Cfg.subdomain}.${flake.inputs.linkpage.secrets.domains.projectsite}"; }; in diff --git a/modules/nixos/homelab/guests/opencloud/opencloudEris/default.nix b/modules/nixos/homelab/guests/opencloud/opencloudEris/default.nix index f142197..af8ce10 100755 --- a/modules/nixos/homelab/guests/opencloud/opencloudEris/default.nix +++ b/modules/nixos/homelab/guests/opencloud/opencloudEris/default.nix @@ -19,6 +19,7 @@ let userMac = interface0Cfg.microvm.macUser; ssh = interface0Cfg.microvm.ssh; mnt = guestPath user0; + inter = "enp0s6"; host = interface0Cfg.domain; }; in