gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/tor: use cfg.package instead of pkgs.tor, add obfs4Package option (#461333)

Browse Source
This commit is contained in:
Felix Bargfeldt
2025-11-13 22:02:47 +00:00
committed by GitHub
parent 45d659416a 1910e55108
commit a04db7eea2
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
nixos/modules/services/security/tor.nix
View File

@@ -456,6 +456,8 @@ in
package = lib.mkPackageOption pkgs "tor" { }; package = lib.mkPackageOption pkgs "tor" { };
obfs4Package = lib.mkPackageOption pkgs "obfs4" { };
enableGeoIP = enableGeoIP =
lib.mkEnableOption '' lib.mkEnableOption ''
use of GeoIP databases. use of GeoIP databases.
@@ -1253,7 +1255,7 @@ in
BridgeRelay = true; BridgeRelay = true;
ExtORPort.port = lib.mkDefault "auto"; ExtORPort.port = lib.mkDefault "auto";
ServerTransportPlugin.transports = lib.mkDefault [ "obfs4" ]; ServerTransportPlugin.transports = lib.mkDefault [ "obfs4" ];
ServerTransportPlugin.exec = lib.mkDefault "${lib.getExe pkgs.obfs4} managed"; ServerTransportPlugin.exec = lib.mkDefault "${lib.getExe cfg.obfs4Package} managed";
} }
// lib.optionalAttrs (cfg.relay.role == "private-bridge") { // lib.optionalAttrs (cfg.relay.role == "private-bridge") {
ExtraInfoStatistics = false; ExtraInfoStatistics = false;
@@ -1326,7 +1328,7 @@ in
systemd.services.tor = { systemd.services.tor = {
description = "Tor Daemon"; description = "Tor Daemon";
documentation = [ "man:tor(8)" ]; documentation = [ "man:tor(8)" ];
path = [ pkgs.tor ]; path = [ cfg.package ];
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
after = [ "network.target" ]; after = [ "network.target" ];