Fix wireguard on Torus

This commit is contained in:
Tyler Starr 2023-10-07 02:00:29 -07:00
parent 08ac2fb6dc
commit 30b85b90c5
2 changed files with 40 additions and 36 deletions

View File

@ -28,8 +28,14 @@
# Set networking options # Set networking options
networking.hostName = "torus"; networking.hostName = "torus";
networking.networkmanager.enable = true; # Needed for wireguard-server
boot.kernel.sysctl = {
"net.ipv4.conf.all.forwarding" = true;
};
networking.firewall.enable = true;
networking.firewall.checkReversePath = "loose"; networking.firewall.checkReversePath = "loose";
networking.firewall.allowedTCPPorts = [ 80 443 ];
networking.firewall.allowedUDPPorts = [ 80 443 ];
# Set your time zone. # Set your time zone.
time.timeZone = "America/Los_Angeles"; time.timeZone = "America/Los_Angeles";
@ -78,8 +84,6 @@
defaults.email = "starrtyler88@gmail.com"; defaults.email = "starrtyler88@gmail.com";
}; };
networking.firewall.allowedTCPPorts = [ 80 443 ];
networking.firewall.allowedUDPPorts = [ 80 443 ];
security.pam.services.nginx.setEnvironment = false; security.pam.services.nginx.setEnvironment = false;
systemd.services.nginx.serviceConfig = { systemd.services.nginx.serviceConfig = {
@ -103,9 +107,6 @@
"media.tstarr.us" = (SSL // { "media.tstarr.us" = (SSL // {
locations."/".proxyPass = "http://localhost:8096/"; locations."/".proxyPass = "http://localhost:8096/";
}); });
"joplin.tstarr.us" = (SSL // {
locations."/".proxyPass = "http://localhost:22300/";
});
"wiki.tstarr.us" = (SSL // { "wiki.tstarr.us" = (SSL // {
locations."/".proxyPass = "http://localhost:4567/"; locations."/".proxyPass = "http://localhost:4567/";
extraConfig = '' extraConfig = ''

View File

@ -4,49 +4,52 @@ let cfg = config.modules.services.wireguard-server;
in { in {
options.modules.services.wireguard-server.enable = lib.mkEnableOption "wireguard-server"; options.modules.services.wireguard-server.enable = lib.mkEnableOption "wireguard-server";
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
# enable NAT # Enable NAT
networking.nat.enable = true; networking.nat = {
networking.nat.externalInterface = "enp4s0"; enable = true;
networking.nat.internalInterfaces = [ "wg0" ]; enableIPv6 = true;
networking.firewall = { externalInterface = "enp4s0";
allowedUDPPorts = [ 51820 ]; internalInterfaces = [ "wg0" ];
}; };
networking.wireguard.interfaces = { # Open ports in the firewall
networking.firewall = {
allowedTCPPorts = [ 53 ];
allowedUDPPorts = [ 53 51820 ];
};
networking.wg-quick.interfaces = {
# "wg0" is the network interface name. You can name the interface arbitrarily. # "wg0" is the network interface name. You can name the interface arbitrarily.
wg0 = { wg0 = {
# Determines the IP address and subnet of the server's end of the tunnel interface. # Determines the IP/IPv6 address and subnet of the client's end of the tunnel interface
ips = [ "10.100.0.1/24" ]; address = [ "192.168.2.1/24" ];
# The port that WireGuard listens to - recommended that this be changed from default
# The port that WireGuard listens to. Must be accessible by the client.
listenPort = 51820; listenPort = 51820;
# Path to the server's private key
privateKeyFile = "/engi/apps/wireguard/private";
# This allows the wireguard server to route your traffic to the internet and hence be like a VPN # This allows the wireguard server to route your traffic to the internet and hence be like a VPN
# For this to work you have to set the dnsserver IP of your router (or dnsserver of choice) in your clients postUp = ''
postSetup = '' ${pkgs.iptables}/bin/iptables -A FORWARD -i %i -j ACCEPT
${pkgs.iptables}/bin/iptables -t nat -A POSTROUTING -s 10.100.0.0/24 -o eth0 -j MASQUERADE ${pkgs.iptables}/bin/iptables -A FORWARD -o %i -j ACCEPT
${pkgs.iptables}/bin/iptables -t nat -A POSTROUTING -o enp4s0 -j MASQUERADE
''; '';
# This undoes the above command # Undo the above
postShutdown = '' preDown = ''
${pkgs.iptables}/bin/iptables -t nat -D POSTROUTING -s 10.100.0.0/24 -o eth0 -j MASQUERADE ${pkgs.iptables}/bin/iptables -D FORWARD -i %i -j ACCEPT
${pkgs.iptables}/bin/iptables -D FORWARD -o %i -j ACCEPT
${pkgs.iptables}/bin/iptables -t nat -D POSTROUTING -o enp4s0 -j MASQUERADE
''; '';
# Path to the private key file.
#
# Note: The private key can also be included inline via the privateKey option,
# but this makes the private key world-readable; thus, using privateKeyFile is
# recommended.
privateKeyFile = "/engi/apps/wireguard/torus-adjudicator";
peers = [ peers = [
# List of allowed peers. {
{ # Feel free to give a meaning full name # Adjudicator
# Public key of the peer (not a file path). publicKey = "r2/IeYCO1T+l248387wUBoNnc2DK9O8pHcIr/NQqezM=";
publicKey = "boy07PYDJT8TuG6Zkwg1KqhKeoakc7GH7UxAw9NuSjE"; allowedIPs = [ "192.168.2.2/32" ];
# List of IPs assigned to this peer within the tunnel subnet. Used to configure routing.
allowedIPs = [ "10.100.0.2/32" ];
} }
# More peers can be added here.
]; ];
}; };
}; };