fixing ip routing for tailscale outside
This commit is contained in:
1 parent
060d427d04
commit
cbba7075a7
4 files changed
+254
-113
No files matched your search
@@ -79,12 +79,10 @@ in
|
||||
skyg.nixos.common.containers.runtime = "docker";
|
||||
skyg.nixos.common.containers.openMetricsPort = true;
|
||||
|
||||
# One shared macvlan network, created once at boot.
|
||||
skyg.nixos.common.containers.networks.lab = {
|
||||
driver = "macvlan";
|
||||
driverOpts.parent = "eno1";
|
||||
subnet = "10.0.0.0/16";
|
||||
gateway = "10.0.0.1";
|
||||
# One shared ipvlan network, created once at boot.
|
||||
skyg.nixos.common.containers.networks.ipvlanLab = {
|
||||
enable = true;
|
||||
parent = "eno1";
|
||||
ipRange = "10.0.101.16/28";
|
||||
};
|
||||
skyg.server.admin.enable = true;
|
||||
@@ -113,7 +111,7 @@ in
|
||||
enable = false;
|
||||
autoUpdate.enable = true;
|
||||
|
||||
networks.lan = config.skyg.nixos.common.containers.networks.lab.compose;
|
||||
networks.lan = config.skyg.nixos.common.containers.networks.ipvlanLab.compose;
|
||||
|
||||
services.audiobookshelf = {
|
||||
image = audiobookshelf.image;
|
||||
@@ -284,7 +282,7 @@ in
|
||||
|
||||
networks = {
|
||||
internal = { driver = "bridge"; };
|
||||
lan = config.skyg.nixos.common.containers.networks.lab.compose;
|
||||
lan = config.skyg.nixos.common.containers.networks.ipvlanLab.compose;
|
||||
};
|
||||
|
||||
volumes = {
|
||||
|
||||
+6
-19
@@ -1,22 +1,5 @@
|
||||
{ pkgs, config, ... }:
|
||||
let
|
||||
macvlanNetwork = {
|
||||
lan = {
|
||||
driver = "macvlan";
|
||||
driver_opts = {
|
||||
parent = "enp2s0";
|
||||
};
|
||||
ipam = {
|
||||
config = [
|
||||
{
|
||||
subnet = "10.0.0.0/16";
|
||||
gateway = "10.0.0.1";
|
||||
ip_range = "10.0.101.240/28";
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
staticIp = ip: {
|
||||
lan = {
|
||||
ipv4_address = ip;
|
||||
@@ -31,6 +14,11 @@ in
|
||||
openFirewall = true;
|
||||
addressesSecretName = "dns-addresses.conf";
|
||||
};
|
||||
skyg.nixos.common.containers.networks.ipvlanLab = {
|
||||
enable = true;
|
||||
parent = "enp2s0";
|
||||
ipRange = "10.0.101.240/28";
|
||||
};
|
||||
skyg.nixos.common.containers.openMetricsPort = true;
|
||||
skyg.server.exporters.enable = true;
|
||||
skyg.networkDrives = {
|
||||
@@ -82,10 +70,9 @@ in
|
||||
PORT = "80";
|
||||
};
|
||||
networks = staticIp "10.0.101.2";
|
||||
# -> drawdb.app.internal (skyg.dns.domain), pushed by `skyg openwrt`
|
||||
dns.names = [ "drawdb" ];
|
||||
};
|
||||
networks = macvlanNetwork;
|
||||
networks.lan = config.skyg.nixos.common.containers.networks.ipvlanLab.compose;
|
||||
};
|
||||
|
||||
# Portainer Service
|
||||
|
||||
Reference in new issue
Block a user