nixos: implement socket-activation for dnscrypt-proxy

The socket definition is derived from upstream with the
exception that it does not depend on network.target, as
this creates a cycle between basic.target and sockets.target.

The apparmor profile has been updated to account for additional
runtime dependencies introduced by enabling systemd support.

Changed files
+22 -5
nixos
modules
services
networking
+22 -5
nixos/modules/services/networking/dnscrypt-proxy.nix
···
cfg = config.services.dnscrypt-proxy;
uid = config.ids.uids.dnscrypt-proxy;
daemonArgs =
-
[ "--daemonize"
-
"--user=dnscrypt-proxy"
"--local-address=${cfg.localAddress}:${toString cfg.port}"
(optionalString cfg.tcpOnly "--tcp-only")
"--resolvers-list=${dnscrypt-proxy}/share/dnscrypt-proxy/dnscrypt-resolvers.csv"
···
${dnscrypt-proxy}/share/dnscrypt-proxy/** r,
${pkgs.gcc.cc}/lib/libssp.so.* mr,
${pkgs.libsodium}/lib/libsodium.so.* mr,
}
'')
];
···
### Service definition
systemd.services.dnscrypt-proxy = {
description = "dnscrypt-proxy daemon";
after = [ "network.target" ] ++ optional apparmorEnabled "apparmor.service";
-
requires = mkIf apparmorEnabled [ "apparmor.service" ];
-
wantedBy = [ "multi-user.target" ];
serviceConfig = {
-
Type = "forking";
ExecStart = "${dnscrypt-proxy}/bin/dnscrypt-proxy ${toString daemonArgs}";
};
};
···
cfg = config.services.dnscrypt-proxy;
uid = config.ids.uids.dnscrypt-proxy;
daemonArgs =
+
[ "--user=dnscrypt-proxy"
"--local-address=${cfg.localAddress}:${toString cfg.port}"
(optionalString cfg.tcpOnly "--tcp-only")
"--resolvers-list=${dnscrypt-proxy}/share/dnscrypt-proxy/dnscrypt-resolvers.csv"
···
${dnscrypt-proxy}/share/dnscrypt-proxy/** r,
${pkgs.gcc.cc}/lib/libssp.so.* mr,
${pkgs.libsodium}/lib/libsodium.so.* mr,
+
${pkgs.systemd}/lib/libsystemd.so.* mr,
+
${pkgs.xz}/lib/liblzma.so.* mr,
+
${pkgs.libgcrypt}/lib/libgcrypt.so.* mr,
+
${pkgs.libgpgerror}/lib/libgpg-error.so.* mr,
}
'')
];
···
### Service definition
+
## derived from upstream dnscrypt-proxy.socket
+
systemd.sockets.dnscrypt-proxy = {
+
description = "dnscrypt-proxy listening socket";
+
+
socketConfig = {
+
ListenStream = "${cfg.localAddress}:${toString cfg.port}";
+
ListenDatagram = "${cfg.localAddress}:${toString cfg.port}";
+
};
+
+
wantedBy = [ "sockets.target" ];
+
};
+
+
# derived from upstream dnscrypt-proxy.service
systemd.services.dnscrypt-proxy = {
description = "dnscrypt-proxy daemon";
after = [ "network.target" ] ++ optional apparmorEnabled "apparmor.service";
+
requires = [ "dnscrypt-proxy.socket "] ++ optional apparmorEnabled "apparmor.service";
serviceConfig = {
+
Type = "simple";
+
## note: NonBlocking is required for socket activation to work
+
NonBlocking = "true";
ExecStart = "${dnscrypt-proxy}/bin/dnscrypt-proxy ${toString daemonArgs}";
};
};