fix(vesuvio): make dns resolution actually work
This commit is contained in:
parent
ce455d0e4a
commit
6f48ba81b4
2 changed files with 34 additions and 22 deletions
|
@ -68,7 +68,7 @@ in {
|
||||||
|
|
||||||
networking.networkmanager = {
|
networking.networkmanager = {
|
||||||
enable = true;
|
enable = true;
|
||||||
dns = "systemd-resolved";
|
dns = lib.mkDefault "systemd-resolved";
|
||||||
};
|
};
|
||||||
|
|
||||||
nix = {
|
nix = {
|
||||||
|
@ -138,10 +138,9 @@ in {
|
||||||
resolved = {
|
resolved = {
|
||||||
enable = lib.mkDefault true;
|
enable = lib.mkDefault true;
|
||||||
dnssec = "allow-downgrade";
|
dnssec = "allow-downgrade";
|
||||||
extraConfig = lib.mkDefault ''
|
dnsovertls = "true";
|
||||||
[Resolve]
|
extraConfig = ''
|
||||||
DNS=1.1.1.1 1.0.0.1
|
DNS=1.1.1.1 1.0.0.1
|
||||||
DNSOverTLS=yes
|
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -1,17 +1,26 @@
|
||||||
{config, ...}: {
|
{
|
||||||
|
pkgs,
|
||||||
|
config,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
boot.tmp.cleanOnBoot = true;
|
boot.tmp.cleanOnBoot = true;
|
||||||
zramSwap.enable = true;
|
zramSwap.enable = true;
|
||||||
|
|
||||||
services.openssh.ports = [4269];
|
environment.systemPackages = with pkgs; [dig traceroute];
|
||||||
|
|
||||||
services.frp = {
|
services = {
|
||||||
enable = true;
|
resolved.enable = false;
|
||||||
role = "server";
|
openssh.ports = [4269];
|
||||||
settings = {
|
|
||||||
bindPort = 7000;
|
frp = {
|
||||||
auth = {
|
enable = true;
|
||||||
method = "token";
|
role = "server";
|
||||||
token = "{{ .Envs.FRP_TOKEN }}";
|
settings = {
|
||||||
|
bindPort = 7000;
|
||||||
|
auth = {
|
||||||
|
method = "token";
|
||||||
|
token = "{{ .Envs.FRP_TOKEN }}";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -19,13 +28,17 @@
|
||||||
age.secrets.frpToken.file = ../../secrets/etna/frpToken.age;
|
age.secrets.frpToken.file = ../../secrets/etna/frpToken.age;
|
||||||
systemd.services.frp.serviceConfig.EnvironmentFile = config.age.secrets.frpToken.path;
|
systemd.services.frp.serviceConfig.EnvironmentFile = config.age.secrets.frpToken.path;
|
||||||
|
|
||||||
networking.firewall = {
|
networking = {
|
||||||
allowedTCPPorts = [22]; # forgejo-ssh
|
networkmanager.dns = "default";
|
||||||
allowedTCPPortRanges = [
|
|
||||||
{
|
firewall = {
|
||||||
from = 6000;
|
allowedTCPPorts = [22]; # forgejo-ssh
|
||||||
to = 7000;
|
allowedTCPPortRanges = [
|
||||||
}
|
{
|
||||||
];
|
from = 6000;
|
||||||
|
to = 7000;
|
||||||
|
}
|
||||||
|
];
|
||||||
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue