Merge pull request #174446 from jsimonetti/routedns-init
routedns: init at 0.1.5
This commit is contained in:
commit
74ea995b11
@ -6353,6 +6353,13 @@
|
||||
github = "jsierles";
|
||||
githubId = 82;
|
||||
};
|
||||
jsimonetti = {
|
||||
email = "jeroen+nixpkgs@simonetti.nl";
|
||||
matrix = "@jeroen:simonetti.nl";
|
||||
name = "Jeroen Simonetti";
|
||||
github = "jsimonetti";
|
||||
githubId = 5478838;
|
||||
};
|
||||
jtcoolen = {
|
||||
email = "jtcoolen@pm.me";
|
||||
name = "Julien Coolen";
|
||||
|
@ -893,6 +893,7 @@
|
||||
./services/networking/redsocks.nix
|
||||
./services/networking/resilio.nix
|
||||
./services/networking/robustirc-bridge.nix
|
||||
./services/networking/routedns.nix
|
||||
./services/networking/rpcbind.nix
|
||||
./services/networking/rxe.nix
|
||||
./services/networking/sabnzbd.nix
|
||||
|
84
nixos/modules/services/networking/routedns.nix
Normal file
84
nixos/modules/services/networking/routedns.nix
Normal file
@ -0,0 +1,84 @@
|
||||
{ config
|
||||
, lib
|
||||
, pkgs
|
||||
, ...
|
||||
}:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.services.routedns;
|
||||
settingsFormat = pkgs.formats.toml { };
|
||||
in
|
||||
{
|
||||
options.services.routedns = {
|
||||
enable = mkEnableOption "RouteDNS - DNS stub resolver, proxy and router";
|
||||
|
||||
settings = mkOption {
|
||||
type = settingsFormat.type;
|
||||
example = literalExpression ''
|
||||
{
|
||||
resolvers.cloudflare-dot = {
|
||||
address = "1.1.1.1:853";
|
||||
protocol = "dot";
|
||||
};
|
||||
groups.cloudflare-cached = {
|
||||
type = "cache";
|
||||
resolvers = ["cloudflare-dot"];
|
||||
};
|
||||
listeners.local-udp = {
|
||||
address = "127.0.0.1:53";
|
||||
protocol = "udp";
|
||||
resolver = "cloudflare-cached";
|
||||
};
|
||||
listeners.local-tcp = {
|
||||
address = "127.0.0.1:53";
|
||||
protocol = "tcp";
|
||||
resolver = "cloudflare-cached";
|
||||
};
|
||||
}
|
||||
'';
|
||||
description = ''
|
||||
Configuration for RouteDNS, see <link xlink:href="https://github.com/folbricht/routedns/blob/master/doc/configuration.md"/>
|
||||
for more information.
|
||||
'';
|
||||
};
|
||||
|
||||
configFile = mkOption {
|
||||
default = settingsFormat.generate "routedns.toml" cfg.settings;
|
||||
defaultText = "A RouteDNS configuration file automatically generated by values from services.routedns.*";
|
||||
type = types.path;
|
||||
example = literalExpression ''"''${pkgs.routedns}/cmd/routedns/example-config/use-case-1.toml"'';
|
||||
description = "Path to RouteDNS TOML configuration file.";
|
||||
};
|
||||
|
||||
package = mkOption {
|
||||
default = pkgs.routedns;
|
||||
defaultText = literalExpression "pkgs.routedns";
|
||||
type = types.package;
|
||||
description = "RouteDNS package to use.";
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
systemd.services.routedns = {
|
||||
description = "RouteDNS - DNS stub resolver, proxy and router";
|
||||
after = [ "network.target" ]; # in case a bootstrap resolver is used, this might fail a few times until the respective server is actually reachable
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
wants = [ "network.target" ];
|
||||
startLimitIntervalSec = 30;
|
||||
startLimitBurst = 5;
|
||||
serviceConfig = {
|
||||
Restart = "on-failure";
|
||||
RestartSec = "5s";
|
||||
LimitNPROC = 512;
|
||||
LimitNOFILE = 1048576;
|
||||
DynamicUser = true;
|
||||
AmbientCapabilities = "CAP_NET_BIND_SERVICE";
|
||||
NoNewPrivileges = true;
|
||||
ExecStart = "${getBin cfg.package}/bin/routedns -l 4 ${cfg.configFile}";
|
||||
};
|
||||
};
|
||||
};
|
||||
meta.maintainers = with maintainers; [ jsimonetti ];
|
||||
}
|
29
pkgs/tools/networking/routedns/default.nix
Normal file
29
pkgs/tools/networking/routedns/default.nix
Normal file
@ -0,0 +1,29 @@
|
||||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "routedns";
|
||||
version = "0.1.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "folbricht";
|
||||
repo = "routedns";
|
||||
# https://github.com/folbricht/routedns/issues/237
|
||||
rev = "02f14a567fee2a289810979446f5260b8a31bf73";
|
||||
sha256 = "sha256-oImimNBz1qizUPD6qHi73fGKNCu5cii99GIUo21e+bs=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-T6adpxJgOPGy+UOOlGAAf1gjk1wJxwOc9enfv9X3LBE=";
|
||||
|
||||
subPackages = [ "./cmd/routedns" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/folbricht/routedns";
|
||||
description = "DNS stub resolver, proxy and router";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ jsimonetti ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
@ -29872,6 +29872,10 @@ with pkgs;
|
||||
|
||||
robustirc-bridge = callPackage ../servers/irc/robustirc-bridge { };
|
||||
|
||||
routedns = callPackage ../tools/networking/routedns {
|
||||
buildGoModule = buildGo118Module;
|
||||
};
|
||||
|
||||
skrooge = libsForQt5.callPackage ../applications/office/skrooge {};
|
||||
|
||||
smartgithg = callPackage ../applications/version-management/smartgithg {
|
||||
|
Loading…
Reference in New Issue
Block a user