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 = {
|
||||
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
|
||||
'';
|
||||
};
|
||||
|
||||
|
|
|
@ -1,10 +1,18 @@
|
|||
{config, ...}: {
|
||||
{
|
||||
pkgs,
|
||||
config,
|
||||
...
|
||||
}: {
|
||||
boot.tmp.cleanOnBoot = true;
|
||||
zramSwap.enable = true;
|
||||
|
||||
services.openssh.ports = [4269];
|
||||
environment.systemPackages = with pkgs; [dig traceroute];
|
||||
|
||||
services.frp = {
|
||||
services = {
|
||||
resolved.enable = false;
|
||||
openssh.ports = [4269];
|
||||
|
||||
frp = {
|
||||
enable = true;
|
||||
role = "server";
|
||||
settings = {
|
||||
|
@ -15,11 +23,15 @@
|
|||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
age.secrets.frpToken.file = ../../secrets/etna/frpToken.age;
|
||||
systemd.services.frp.serviceConfig.EnvironmentFile = config.age.secrets.frpToken.path;
|
||||
|
||||
networking.firewall = {
|
||||
networking = {
|
||||
networkmanager.dns = "default";
|
||||
|
||||
firewall = {
|
||||
allowedTCPPorts = [22]; # forgejo-ssh
|
||||
allowedTCPPortRanges = [
|
||||
{
|
||||
|
@ -28,4 +40,5 @@
|
|||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue