summary refs log tree commit diff
path: root/nixos/modules/services/security/tor.nix
diff options
context:
space:
mode:
authorJonas Nick <jonasd.nick@gmail.com>2018-11-23 12:23:02 +0000
committerJonas Nick <jonasd.nick@gmail.com>2018-11-23 20:53:02 +0000
commit5640aa28141026cbaf3f5c8211fedd0ac83580d0 (patch)
tree4f215b4fbc2f7df568d0200f0538e391fdcaead5 /nixos/modules/services/security/tor.nix
parentc94ccfd81ed327e75f4a3184e1e52e8a7c2eb3be (diff)
downloadnixpkgs-5640aa28141026cbaf3f5c8211fedd0ac83580d0.tar
nixpkgs-5640aa28141026cbaf3f5c8211fedd0ac83580d0.tar.gz
nixpkgs-5640aa28141026cbaf3f5c8211fedd0ac83580d0.tar.bz2
nixpkgs-5640aa28141026cbaf3f5c8211fedd0ac83580d0.tar.lz
nixpkgs-5640aa28141026cbaf3f5c8211fedd0ac83580d0.tar.xz
nixpkgs-5640aa28141026cbaf3f5c8211fedd0ac83580d0.tar.zst
nixpkgs-5640aa28141026cbaf3f5c8211fedd0ac83580d0.zip
nixos/tor: add HiddenServiceVersion option
Diffstat (limited to 'nixos/modules/services/security/tor.nix')
-rw-r--r--nixos/modules/services/security/tor.nix7
1 files changed, 7 insertions, 0 deletions
diff --git a/nixos/modules/services/security/tor.nix b/nixos/modules/services/security/tor.nix
index aca2cf8cdea..61b751bb518 100644
--- a/nixos/modules/services/security/tor.nix
+++ b/nixos/modules/services/security/tor.nix
@@ -92,6 +92,7 @@ let
   # Hidden services
   + concatStrings (flip mapAttrsToList cfg.hiddenServices (n: v: ''
     HiddenServiceDir ${torDirectory}/onion/${v.name}
+    ${optionalString (v.version != null) "HiddenServiceVersion ${toString v.version}"}
     ${flip concatMapStrings v.map (p: ''
       HiddenServicePort ${toString p.port} ${p.destination}
     '')}
@@ -667,6 +668,12 @@ in
                  };
                }));
              };
+
+             version = mkOption {
+               default = null;
+               description = "Rendezvous service descriptor version to publish for the hidden service. Currently, versions 2 and 3 are supported. (Default: 2)";
+               type = types.nullOr (types.enum [ 2 3 ]);
+             };
           };
 
           config = {