Setup vm-matrix better

This commit is contained in:
Greg Hellings
2024-11-20 00:03:09 -06:00
parent 54f252bbb4
commit 279f0aba1d
3 changed files with 12 additions and 21 deletions
+6 -5
View File
@@ -22,16 +22,17 @@
10.42.100.6 isaiahbmc isaiahbmc.thehellings.lan 10.42.100.6 isaiahbmc isaiahbmc.thehellings.lan
# Tailscale hosts # Tailscale hosts
100.90.74.19 jude.home
100.88.91.27 dns.home
100.119.228.115 chronicles.home nas.home chronicles.shire-zebra.ts.net 100.119.228.115 chronicles.home nas.home chronicles.shire-zebra.ts.net
100.115.57.8 linode.home 100.88.91.27 dns.home
100.80.99.48 exodus.home
100.88.91.27 genesis.home jellyfin.home smart.home zwave.home nixcache.home gitcache.home 100.88.91.27 genesis.home jellyfin.home smart.home zwave.home nixcache.home gitcache.home
100.84.183.79 isaiah.home isaiah.shire-zebra.ts.net
100.78.226.76 gitlab.home gitlab.shire-zebra.ts.net gitlab.thehellings.lan registry.thehellings.lan git.thehellings.lan 100.78.226.76 gitlab.home gitlab.shire-zebra.ts.net gitlab.thehellings.lan registry.thehellings.lan git.thehellings.lan
100.68.203.1 hosea.home hosea.shire-zebra.ts.net 100.68.203.1 hosea.home hosea.shire-zebra.ts.net
100.84.183.79 isaiah.home isaiah.shire-zebra.ts.net
100.102.186.39 jeremiah.home jeremiah.shire-zebra.ts.net 100.102.186.39 jeremiah.home jeremiah.shire-zebra.ts.net
100.80.99.48 exodus.home 100.90.74.19 jude.home
100.115.57.8 linode.home
100.65.5.38 matrix.home matrix.shire-zebra.ts.net
# Dev hosts # Dev hosts
10.42.101.1 icdm.lan wiki.icdm.lan *.icdm.lan 10.42.101.1 icdm.lan wiki.icdm.lan *.icdm.lan
+1 -15
View File
@@ -14,10 +14,7 @@
virtualisation.libvirtd = { virtualisation.libvirtd = {
enable = true; enable = true;
allowedBridges = [ allowedBridges = [ "virbr0" ];
"virbr0"
"br0"
];
onBoot = "ignore"; # only restart VMs labeled 'autostart' onBoot = "ignore"; # only restart VMs labeled 'autostart'
qemu.ovmf.enable = true; qemu.ovmf.enable = true;
}; };
@@ -35,9 +32,6 @@
address = " 10.42.1.1"; address = " 10.42.1.1";
interface = "enp38s0"; interface = "enp38s0";
}; };
bridges = {
br0.interfaces = [ "enp39s0" ];
};
interfaces = { interfaces = {
enp38s0 = { enp38s0 = {
ipv4.addresses = [ ipv4.addresses = [
@@ -47,14 +41,6 @@
} }
]; ];
}; };
br0 = {
ipv4.addresses = [
{
address = "10.42.90.1";
prefixLength = 16;
}
];
};
}; };
nameservers = [ "10.42.1.5" ]; nameservers = [ "10.42.1.5" ];
firewall.checkReversePath = lib.mkForce false; firewall.checkReversePath = lib.mkForce false;
+5 -1
View File
@@ -8,7 +8,11 @@ in
greg = { greg = {
tailscale.enable = true; tailscale.enable = true;
}; };
networking.firewall.allowedTCPPorts = [ config.services.dendrite.httpPort ]; networking = {
hostName = "vm-matrix";
domain = "thehellings.lan";
firewall.allowedTCPPorts = [ config.services.dendrite.httpPort ];
};
# Environment secrets # Environment secrets
age = { age = {