about summary refs log tree commit diff
path: root/nixos/modules/services/security
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2013-10-30 18:30:23 +0100
committerEelco Dolstra <eelco.dolstra@logicblox.com>2013-10-30 18:47:44 +0100
commit244cf195c88acff952ff0304c8e48a109f4b6754 (patch)
treedfeda2b6b0218e4eaa10efa06292e360bf4d2125 /nixos/modules/services/security
parentc7171b2c8fc5671cdc989c88aa8f959dac836a98 (diff)
downloadnixlib-244cf195c88acff952ff0304c8e48a109f4b6754.tar
nixlib-244cf195c88acff952ff0304c8e48a109f4b6754.tar.gz
nixlib-244cf195c88acff952ff0304c8e48a109f4b6754.tar.bz2
nixlib-244cf195c88acff952ff0304c8e48a109f4b6754.tar.lz
nixlib-244cf195c88acff952ff0304c8e48a109f4b6754.tar.xz
nixlib-244cf195c88acff952ff0304c8e48a109f4b6754.tar.zst
nixlib-244cf195c88acff952ff0304c8e48a109f4b6754.zip
Use the "assertions" option instead of mkAssert
Diffstat (limited to 'nixos/modules/services/security')
-rw-r--r--nixos/modules/services/security/tor.nix18
1 files changed, 10 insertions, 8 deletions
diff --git a/nixos/modules/services/security/tor.nix b/nixos/modules/services/security/tor.nix
index 2dafb4595c63..e70eb8511a63 100644
--- a/nixos/modules/services/security/tor.nix
+++ b/nixos/modules/services/security/tor.nix
@@ -53,9 +53,9 @@ in
           '';
         };
 
-	socksListenAddressFaster = mkOption {
+        socksListenAddressFaster = mkOption {
           default = "127.0.0.1:9063";
-	  description = ''
+          description = ''
             Same as socksListenAddress but uses weaker circuit isolation to provide
             performance suitable for a web browser.
           '';
@@ -227,10 +227,12 @@ in
 
   ###### implementation
 
-  config = mkIf (cfg.client.enable || cfg.relay.enable) (
-  mkAssert (cfg.relay.enable -> !(cfg.relay.isBridge && cfg.relay.isExit)) "
-    Can't be both an exit and a bridge relay at the same time
-  " {
+  config = mkIf (cfg.client.enable || cfg.relay.enable) {
+
+    assertions = singleton
+      { assertion = cfg.relay.enable -> !(cfg.relay.isBridge && cfg.relay.isExit);
+        message = "Can't be both an exit and a bridge relay at the same time";
+      };
 
     users.extraUsers = singleton
       { name = torUser;
@@ -270,7 +272,7 @@ in
       ''
       + optionalString cfg.client.enable  ''
         SOCKSPort ${cfg.client.socksListenAddress} IsolateDestAddr
-	SOCKSPort ${cfg.client.socksListenAddressFaster}
+        SOCKSPort ${cfg.client.socksListenAddressFaster}
         ${opt "SocksPolicy" cfg.client.socksPolicy}
       ''
       + optionalString cfg.relay.enable ''
@@ -316,6 +318,6 @@ in
         # Extra config goes here
       '';
 
-  });
+  };
 
 }