uku/flake
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(vesuvio): make dns resolution actually work

Browse source
This commit is contained in:
uku 2024-07-22 17:36:48 +02:00
parent ce455d0e4a
commit 6f48ba81b4
Signed by: uku
SSH key fingerprint: SHA256:4P0aN6M8ajKukNi6aPOaX0LacanGYtlfjmN+m/sHY/o
2 changed files with 34 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
configs/common.nix
View file

@ -68,7 +68,7 @@ in {
networking.networkmanager = {
enable = true;
dns = "systemd-resolved";
dns = lib.mkDefault "systemd-resolved";
};
nix = {
@ -138,10 +138,9 @@ in {
resolved = {
enable = lib.mkDefault true;
dnssec = "allow-downgrade";
extraConfig = lib.mkDefault ''
[Resolve]
dnsovertls = "true";
extraConfig = ''
DNS=1.1.1.1 1.0.0.1
DNSOverTLS=yes
'';
};

49
systems/vesuvio/default.nix
View file

@ -1,17 +1,26 @@
{config, ...}: {
{
pkgs,
config,
...
}: {
boot.tmp.cleanOnBoot = true;
zramSwap.enable = true;
services.openssh.ports = [4269];
environment.systemPackages = with pkgs; [dig traceroute];
services.frp = {
enable = true;
role = "server";
settings = {
bindPort = 7000;
auth = {
method = "token";
token = "{{ .Envs.FRP_TOKEN }}";
services = {
resolved.enable = false;
openssh.ports = [4269];
frp = {
enable = true;
role = "server";
settings = {
bindPort = 7000;
auth = {
method = "token";
token = "{{ .Envs.FRP_TOKEN }}";
};
};
};
};
@ -19,13 +28,17 @@
age.secrets.frpToken.file = ../../secrets/etna/frpToken.age;
systemd.services.frp.serviceConfig.EnvironmentFile = config.age.secrets.frpToken.path;
networking.firewall = {
allowedTCPPorts = [22]; # forgejo-ssh
allowedTCPPortRanges = [
{
from = 6000;
to = 7000;
}
];
networking = {
networkmanager.dns = "default";
firewall = {
allowedTCPPorts = [22]; # forgejo-ssh
allowedTCPPortRanges = [
{
from = 6000;
to = 7000;
}
];
};
};
}