summary refs log tree commit diff
path: root/nixos/modules
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2016-04-11 13:38:33 +0200
committeraszlig <aszlig@redmoonstudios.org>2016-04-11 13:38:33 +0200
commitb19fdc9ec914ac176a9332feb59a7ca83ae0e3f5 (patch)
tree8c0c257c4183c0fcc355ed8cbd00aa460be6bbbd /nixos/modules
parent05a7cd17fc540ab8851c6c20df7c41f180582b8c (diff)
downloadnixpkgs-b19fdc9ec914ac176a9332feb59a7ca83ae0e3f5.tar
nixpkgs-b19fdc9ec914ac176a9332feb59a7ca83ae0e3f5.tar.gz
nixpkgs-b19fdc9ec914ac176a9332feb59a7ca83ae0e3f5.tar.bz2
nixpkgs-b19fdc9ec914ac176a9332feb59a7ca83ae0e3f5.tar.lz
nixpkgs-b19fdc9ec914ac176a9332feb59a7ca83ae0e3f5.tar.xz
nixpkgs-b19fdc9ec914ac176a9332feb59a7ca83ae0e3f5.tar.zst
nixpkgs-b19fdc9ec914ac176a9332feb59a7ca83ae0e3f5.zip
nixos/taskserver: Set server.crl for automatic CA
Currently, we don't handle this yet, but let's set it so that we cover
all the options.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'nixos/modules')
-rw-r--r--nixos/modules/services/misc/taskserver/default.nix7
1 files changed, 4 insertions, 3 deletions
diff --git a/nixos/modules/services/misc/taskserver/default.nix b/nixos/modules/services/misc/taskserver/default.nix
index 7e6e3d3873d..c81cd20b263 100644
--- a/nixos/modules/services/misc/taskserver/default.nix
+++ b/nixos/modules/services/misc/taskserver/default.nix
@@ -80,18 +80,19 @@ let
 
     # server
     server = ${cfg.listenHost}:${toString cfg.listenPort}
-    ${mkConfLine "server.crl" cfg.pki.server.crl}
-
-    # certificates
     ${mkConfLine "trust" cfg.trust}
+
+    # PKI options
     ${if needToCreateCA then ''
       ca.cert = ${cfg.dataDir}/keys/ca.cert
       server.cert = ${cfg.dataDir}/keys/server.cert
       server.key = ${cfg.dataDir}/keys/server.key
+      server.crl = ${cfg.dataDir}/keys/server.crl
     '' else ''
       ca.cert = ${cfg.pki.ca.cert}
       server.cert = ${cfg.pki.server.cert}
       server.key = ${cfg.pki.server.key}
+      server.crl = ${cfg.pki.server.crl}
     ''}
   '';