From 5640aa28141026cbaf3f5c8211fedd0ac83580d0 Mon Sep 17 00:00:00 2001
From: Jonas Nick <jonasd.nick@gmail.com>
Date: Fri, 23 Nov 2018 12:23:02 +0000
Subject: nixos/tor: add HiddenServiceVersion option

---
 nixos/modules/services/security/tor.nix | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'nixos/modules/services/security')

diff --git a/nixos/modules/services/security/tor.nix b/nixos/modules/services/security/tor.nix
index aca2cf8cdeaa..61b751bb518b 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 = {
-- 
cgit 1.4.1