3 Commits

Author SHA1 Message Date
43ec75741d Fix memos failing to open SQLite database on ZFS
Some checks failed
Check Flake / check-flake (push) Failing after 18s
ProtectSystem=strict with ReadWritePaths fails silently on ZFS submounts
(/var/lib is a separate dataset), leaving the data dir read-only. Downgrade
to ProtectSystem=full which leaves /var writable while still protecting
/usr and /boot.
2026-03-01 17:54:11 -08:00
000bbd7f4d Update interface names because usePredictableInterfaceNames is now off 2026-03-01 17:52:42 -08:00
e4f0d065f9 Fix tinyproxy starting before VPN bridge is configured
tinyproxy binds to the bridge IP but had no ordering dependency on
systemd-networkd, so it could start before the bridge existed.
2026-03-01 17:52:35 -08:00
4 changed files with 27 additions and 17 deletions

View File

@@ -230,7 +230,14 @@ in
Port = cfg.proxyPort;
};
};
systemd.services.tinyproxy.before = [ "container@pia-vpn.service" ];
systemd.services.tinyproxy = {
before = [ "container@pia-vpn.service" ];
after = [ "systemd-networkd.service" ];
requires = [ "systemd-networkd.service" ];
serviceConfig.ExecStartPre = [
"+${pkgs.systemd}/lib/systemd/systemd-networkd-wait-online --interface=${cfg.bridgeName}:no-carrier --timeout=60"
];
};
# WireGuard interface creation (host-side oneshot)
# Creates the interface in the host namespace so encrypted UDP stays in host netns.

View File

@@ -42,5 +42,6 @@
}
];
networking.usePredictableInterfaceNames = true;
networking.interfaces.eth0.useDHCP = true;
}

View File

@@ -341,6 +341,8 @@
enable = true;
settings.MEMOS_PORT = "57643";
};
# ReadWritePaths doesn't work with ProtectSystem=strict on ZFS submounts (/var/lib is a separate dataset)
systemd.services.memos.serviceConfig.ProtectSystem = lib.mkForce "full";
services.outline = {
enable = true;

View File

@@ -1,4 +1,4 @@
{ lib, pkgs, modulesPath, ... }:
{ modulesPath, ... }:
{
imports =
@@ -67,17 +67,17 @@
dhcpcd.enable = false;
};
# eth0 — native VLAN 5 (main), default route, internet
# useDHCP generates the base 40-eth0 networkd unit and drives initrd DHCP for LUKS unlock.
networking.interfaces."eth0".useDHCP = true;
systemd.network.networks."40-eth0" = {
dhcpV4Config.RouteMetric = 100; # prefer eth0 over VLAN interfaces for default route
linkConfig.RequiredForOnline = "routable"; # wait-online succeeds once eth0 has a route
# eno1 — native VLAN 5 (main), default route, internet
# useDHCP generates the base 40-eno1 networkd unit and drives initrd DHCP for LUKS unlock.
networking.interfaces."eno1".useDHCP = true;
systemd.network.networks."40-eno1" = {
dhcpV4Config.RouteMetric = 100; # prefer eno1 over VLAN interfaces for default route
linkConfig.RequiredForOnline = "routable"; # wait-online succeeds once eno1 has a route
};
# eth1 — trunk port (no IP on the raw interface)
systemd.network.networks."10-eth1" = {
matchConfig.Name = "eth1";
# eno2 — trunk port (no IP on the raw interface)
systemd.network.networks."40-eno2" = {
matchConfig.Name = "eno2";
networkConfig = {
VLAN = [ "vlan-iot" "vlan-mgmt" ];
LinkLocalAddressing = "no";
@@ -86,9 +86,9 @@
};
# VLAN 2 — IoT (cameras, smart home)
systemd.network.netdevs."20-vlan-iot".netdevConfig = { Name = "vlan-iot"; Kind = "vlan"; };
systemd.network.netdevs."20-vlan-iot".vlanConfig.Id = 2;
systemd.network.networks."20-vlan-iot" = {
systemd.network.netdevs."50-vlan-iot".netdevConfig = { Name = "vlan-iot"; Kind = "vlan"; };
systemd.network.netdevs."50-vlan-iot".vlanConfig.Id = 2;
systemd.network.networks."50-vlan-iot" = {
matchConfig.Name = "vlan-iot";
networkConfig.DHCP = "yes";
dhcpV4Config = {
@@ -99,9 +99,9 @@
};
# VLAN 4 — Management
systemd.network.netdevs."20-vlan-mgmt".netdevConfig = { Name = "vlan-mgmt"; Kind = "vlan"; };
systemd.network.netdevs."20-vlan-mgmt".vlanConfig.Id = 4;
systemd.network.networks."20-vlan-mgmt" = {
systemd.network.netdevs."50-vlan-mgmt".netdevConfig = { Name = "vlan-mgmt"; Kind = "vlan"; };
systemd.network.netdevs."50-vlan-mgmt".vlanConfig.Id = 4;
systemd.network.networks."50-vlan-mgmt" = {
matchConfig.Name = "vlan-mgmt";
networkConfig.DHCP = "yes";
dhcpV4Config = {