diff options
author | Silvan Mosberger <contact@infinisil.com> | 2020-08-30 23:02:37 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-08-30 23:02:37 +0200 |
commit | 6716867eb3e763818000eab04f378b86cadc2894 (patch) | |
tree | b1e7da1f119a78efc2a07cc1e4a451529473323c /nixos | |
parent | cf2314ff9a73bfa5c4df814418185ee7fb274067 (diff) | |
parent | 168a9c8d3810a274e7c56c5eb3704766a5ced47e (diff) | |
download | nixpkgs-6716867eb3e763818000eab04f378b86cadc2894.tar nixpkgs-6716867eb3e763818000eab04f378b86cadc2894.tar.gz nixpkgs-6716867eb3e763818000eab04f378b86cadc2894.tar.bz2 nixpkgs-6716867eb3e763818000eab04f378b86cadc2894.tar.lz nixpkgs-6716867eb3e763818000eab04f378b86cadc2894.tar.xz nixpkgs-6716867eb3e763818000eab04f378b86cadc2894.tar.zst nixpkgs-6716867eb3e763818000eab04f378b86cadc2894.zip |
Merge pull request #96686 from nixy/add/tor-package-option
tor: Add option to tor service for package
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/modules/services/security/tor.nix | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/nixos/modules/services/security/tor.nix b/nixos/modules/services/security/tor.nix index b33e905c67d..b4bc2f694e4 100644 --- a/nixos/modules/services/security/tor.nix +++ b/nixos/modules/services/security/tor.nix @@ -34,8 +34,8 @@ let User tor DataDirectory ${torDirectory} ${optionalString cfg.enableGeoIP '' - GeoIPFile ${pkgs.tor.geoip}/share/tor/geoip - GeoIPv6File ${pkgs.tor.geoip}/share/tor/geoip6 + GeoIPFile ${cfg.package.geoip}/share/tor/geoip + GeoIPv6File ${cfg.package.geoip}/share/tor/geoip6 ''} ${optint "ControlPort" cfg.controlPort} @@ -123,6 +123,16 @@ in ''; }; + package = mkOption { + type = types.package; + default = pkgs.tor; + defaultText = "pkgs.tor"; + example = literalExample "pkgs.tor"; + description = '' + Tor package to use + ''; + }; + enableGeoIP = mkOption { type = types.bool; default = true; @@ -749,8 +759,8 @@ in serviceConfig = { Type = "simple"; # Translated from the upstream contrib/dist/tor.service.in - ExecStartPre = "${pkgs.tor}/bin/tor -f ${torRcFile} --verify-config"; - ExecStart = "${pkgs.tor}/bin/tor -f ${torRcFile}"; + ExecStartPre = "${cfg.package}/bin/tor -f ${torRcFile} --verify-config"; + ExecStart = "${cfg.package}/bin/tor -f ${torRcFile}"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; KillSignal = "SIGINT"; TimeoutSec = 30; @@ -773,7 +783,7 @@ in }; }; - environment.systemPackages = [ pkgs.tor ]; + environment.systemPackages = [ cfg.package ]; services.privoxy = mkIf (cfg.client.enable && cfg.client.privoxy.enable) { enable = true; |