switch to tailscale

This commit is contained in:
Nathan McCarty 2022-10-03 02:58:28 -04:00
parent 655f2447fe
commit 65af889b19
Signed by: thatonelutenist
GPG Key ID: D70DA3DD4D1E9F96
4 changed files with 3 additions and 12 deletions

View File

@ -189,7 +189,7 @@ with lib;
"tounge" = { "tounge" = {
forwardAgent = true; forwardAgent = true;
user = "nathan"; user = "nathan";
hostname = "172.23.98.121"; hostname = "100.75.37.98";
}; };
"shadowchild" = { "shadowchild" = {
forwardAgent = true; forwardAgent = true;

View File

@ -85,7 +85,6 @@
firewall = { firewall = {
allowedTCPPorts = [ 25565 ]; allowedTCPPorts = [ 25565 ];
allowedUDPPorts = [ 25565 ]; allowedUDPPorts = [ 25565 ];
trustedInterfaces = [ "zt5u4uutwm" ];
}; };
}; };

View File

@ -82,8 +82,8 @@
ports = [ ports = [
"10.0.0.10:53:53/tcp" "10.0.0.10:53:53/tcp"
"10.0.0.10:53:53/udp" "10.0.0.10:53:53/udp"
"172.23.98.121:53:53/tcp" "100.75.37.98:53:53/tcp"
"172.23.98.121:53:53/udp" "100.75.37.98:53:53/udp"
"3080:80" "3080:80"
"30443:443" "30443:443"
]; ];
@ -95,7 +95,6 @@
"--cap-add=NET_ADMIN" "--cap-add=NET_ADMIN"
"--dns=1.1.1.1" "--dns=1.1.1.1"
]; ];
workdir = "/var/lib/pihole/";
}; };
# Nginx virtual hosts # Nginx virtual hosts

View File

@ -51,12 +51,5 @@ with lib;
checkReversePath = "loose"; checkReversePath = "loose";
trustedInterfaces = [ "tailscale0" ]; trustedInterfaces = [ "tailscale0" ];
}; };
# Also enable zerotierone for now
# TODO: Get completely migrated away from this
services.zerotierone = {
enable = true;
joinNetworks = [ "c7c8172af15d643d" ];
};
}; };
} }