Merge pull request #84073 from pnelson/nextdns-1.4.36

nextdns: init at 1.7.0
This commit is contained in:
Peter Hoeg 2020-08-08 14:29:12 +08:00 committed by GitHub
commit 4767015ec8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 71 additions and 0 deletions

View File

@ -676,6 +676,7 @@
./services/networking/nat.nix
./services/networking/ndppd.nix
./services/networking/networkmanager.nix
./services/networking/nextdns.nix
./services/networking/nftables.nix
./services/networking/ngircd.nix
./services/networking/nghttpx/default.nix

View File

@ -0,0 +1,44 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.services.nextdns;
in {
options = {
services.nextdns = {
enable = mkOption {
type = types.bool;
default = false;
description = "Whether to enable the NextDNS DNS/53 to DoH Proxy service.";
};
arguments = mkOption {
type = types.listOf types.str;
default = [];
example = [ "-config" "10.0.3.0/24=abcdef" ];
description = "Additional arguments to be passed to nextdns run.";
};
};
};
# https://github.com/nextdns/nextdns/blob/628ea509eaaccd27adb66337db03e5b56f6f38a8/host/service/systemd/service.go
config = mkIf cfg.enable {
systemd.services.nextdns = {
description = "NextDNS DNS/53 to DoH Proxy";
environment = {
SERVICE_RUN_MODE = "1";
};
serviceConfig = {
StartLimitInterval = 5;
StartLimitBurst = 10;
ExecStart = "${pkgs.nextdns}/bin/nextdns run ${escapeShellArgs config.services.nextdns.arguments}";
RestartSec = 120;
LimitMEMLOCK = "infinity";
};
after = [ "network.target" ];
before = [ "nss-lookup.target" ];
wants = [ "nss-lookup.target" ];
wantedBy = [ "multi-user.target" ];
};
};
}

View File

@ -0,0 +1,24 @@
{ buildGoModule, fetchFromGitHub, lib }:
buildGoModule rec {
pname = "nextdns";
version = "1.7.0";
src = fetchFromGitHub {
owner = "nextdns";
repo = "nextdns";
rev = "v${version}";
sha256 = "15xw8d6b9rv0lalzfllixm8n89clz9j8ag1gk4r16k7yv5l6xrpd";
};
vendorSha256 = "09whpzsn16znyrknfm5zlhla253r69j6d751czza4c83m4r36swj";
buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
meta = with lib; {
description = "NextDNS DNS/53 to DoH Proxy";
homepage = "https://nextdns.io";
license = licenses.mit;
maintainers = with maintainers; [ pnelson ];
};
}

View File

@ -2170,6 +2170,8 @@ in
mq-cli = callPackage ../tools/system/mq-cli { };
nextdns = callPackage ../applications/networking/nextdns { };
nfdump = callPackage ../tools/networking/nfdump { };
nfstrace = callPackage ../tools/networking/nfstrace { };