mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-07-19 00:20:32 +03:00

After final improvements to the official formatter implementation,
this commit now performs the first treewide reformat of Nix files using it.
This is part of the implementation of RFC 166.
Only "inactive" files are reformatted, meaning only files that
aren't being touched by any PR with activity in the past 2 months.
This is to avoid conflicts for PRs that might soon be merged.
Later we can do a full treewide reformat to get the rest,
which should not cause as many conflicts.
A CI check has already been running for some time to ensure that new and
already-formatted files are formatted, so the files being reformatted here
should also stay formatted.
This commit was automatically created and can be verified using
nix-build https://github.com/infinisil/treewide-nixpkgs-reformat-script/archive/a08b3a4d199c6124ac5b36a889d9099b4383463f.tar.gz \
--argstr baseRev 0128fbb0a5
result/bin/apply-formatting $NIXPKGS_PATH
158 lines
3.6 KiB
Nix
158 lines
3.6 KiB
Nix
{
|
|
config,
|
|
lib,
|
|
pkgs,
|
|
...
|
|
}:
|
|
|
|
let
|
|
inherit (lib)
|
|
concatStringsSep
|
|
mkEnableOption
|
|
mkIf
|
|
mkOption
|
|
types
|
|
;
|
|
|
|
cfg = config.services.https-dns-proxy;
|
|
|
|
providers = {
|
|
cloudflare = {
|
|
ips = [
|
|
"1.1.1.1"
|
|
"1.0.0.1"
|
|
];
|
|
url = "https://cloudflare-dns.com/dns-query";
|
|
};
|
|
google = {
|
|
ips = [
|
|
"8.8.8.8"
|
|
"8.8.4.4"
|
|
];
|
|
url = "https://dns.google/dns-query";
|
|
};
|
|
quad9 = {
|
|
ips = [
|
|
"9.9.9.9"
|
|
"149.112.112.112"
|
|
];
|
|
url = "https://dns.quad9.net/dns-query";
|
|
};
|
|
opendns = {
|
|
ips = [
|
|
"208.67.222.222"
|
|
"208.67.220.220"
|
|
];
|
|
url = "https://doh.opendns.com/dns-query";
|
|
};
|
|
custom = {
|
|
inherit (cfg.provider) ips url;
|
|
};
|
|
};
|
|
|
|
defaultProvider = "quad9";
|
|
|
|
providerCfg = concatStringsSep " " [
|
|
"-b"
|
|
(concatStringsSep "," providers."${cfg.provider.kind}".ips)
|
|
"-r"
|
|
providers."${cfg.provider.kind}".url
|
|
];
|
|
|
|
in
|
|
{
|
|
meta.maintainers = with lib.maintainers; [ peterhoeg ];
|
|
|
|
###### interface
|
|
|
|
options.services.https-dns-proxy = {
|
|
enable = mkEnableOption "https-dns-proxy daemon";
|
|
|
|
address = mkOption {
|
|
description = "The address on which to listen";
|
|
type = types.str;
|
|
default = "127.0.0.1";
|
|
};
|
|
|
|
port = mkOption {
|
|
description = "The port on which to listen";
|
|
type = types.port;
|
|
default = 5053;
|
|
};
|
|
|
|
provider = {
|
|
kind = mkOption {
|
|
description = ''
|
|
The upstream provider to use or custom in case you do not trust any of
|
|
the predefined providers or just want to use your own.
|
|
|
|
The default is ${defaultProvider} and there are privacy and security
|
|
trade-offs when using any upstream provider. Please consider that
|
|
before using any of them.
|
|
|
|
Supported providers: ${concatStringsSep ", " (builtins.attrNames providers)}
|
|
|
|
If you pick the custom provider, you will need to provide the
|
|
bootstrap IP addresses as well as the resolver https URL.
|
|
'';
|
|
type = types.enum (builtins.attrNames providers);
|
|
default = defaultProvider;
|
|
};
|
|
|
|
ips = mkOption {
|
|
description = "The custom provider IPs";
|
|
type = types.listOf types.str;
|
|
};
|
|
|
|
url = mkOption {
|
|
description = "The custom provider URL";
|
|
type = types.str;
|
|
};
|
|
};
|
|
|
|
preferIPv4 = mkOption {
|
|
description = ''
|
|
https_dns_proxy will by default use IPv6 and fail if it is not available.
|
|
To play it safe, we choose IPv4.
|
|
'';
|
|
type = types.bool;
|
|
default = true;
|
|
};
|
|
|
|
extraArgs = mkOption {
|
|
description = "Additional arguments to pass to the process.";
|
|
type = types.listOf types.str;
|
|
default = [ "-v" ];
|
|
};
|
|
};
|
|
|
|
###### implementation
|
|
|
|
config = lib.mkIf cfg.enable {
|
|
systemd.services.https-dns-proxy = {
|
|
description = "DNS to DNS over HTTPS (DoH) proxy";
|
|
requires = [ "network.target" ];
|
|
after = [ "network.target" ];
|
|
wants = [ "nss-lookup.target" ];
|
|
before = [ "nss-lookup.target" ];
|
|
wantedBy = [ "multi-user.target" ];
|
|
serviceConfig = rec {
|
|
Type = "exec";
|
|
DynamicUser = true;
|
|
ProtectHome = "tmpfs";
|
|
ExecStart = lib.concatStringsSep " " (
|
|
[
|
|
(lib.getExe pkgs.https-dns-proxy)
|
|
"-a ${toString cfg.address}"
|
|
"-p ${toString cfg.port}"
|
|
"-l -"
|
|
providerCfg
|
|
]
|
|
++ lib.optional cfg.preferIPv4 "-4"
|
|
++ cfg.extraArgs
|
|
);
|
|
Restart = "on-failure";
|
|
};
|
|
};
|
|
};
|
|
}
|