about summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorJörg Thalheim <joerg@thalheim.io>2017-03-12 15:56:31 +0100
committerJörg Thalheim <joerg@thalheim.io>2017-03-12 16:01:07 +0100
commit41625dcab64efe29c3b15876f27ec520927367bf (patch)
tree30b0540c6e2a2447ea0c50e1da6d6fb11b6f01d5 /nixos
parentf488b1811bf0ee1430ce728d661830e55abef88c (diff)
downloadnixlib-41625dcab64efe29c3b15876f27ec520927367bf.tar
nixlib-41625dcab64efe29c3b15876f27ec520927367bf.tar.gz
nixlib-41625dcab64efe29c3b15876f27ec520927367bf.tar.bz2
nixlib-41625dcab64efe29c3b15876f27ec520927367bf.tar.lz
nixlib-41625dcab64efe29c3b15876f27ec520927367bf.tar.xz
nixlib-41625dcab64efe29c3b15876f27ec520927367bf.tar.zst
nixlib-41625dcab64efe29c3b15876f27ec520927367bf.zip
pump.io: fix tests
fixes #23568
Diffstat (limited to 'nixos')
-rw-r--r--nixos/tests/pump.io.nix19
1 files changed, 7 insertions, 12 deletions
diff --git a/nixos/tests/pump.io.nix b/nixos/tests/pump.io.nix
index 18da52b5134b..0991ed3fce1f 100644
--- a/nixos/tests/pump.io.nix
+++ b/nixos/tests/pump.io.nix
@@ -51,16 +51,6 @@ import ./make-test.nix ({ pkgs, ...} : let
     Vd5WD2HJhLb9u0UxVp9vfWIUDgydopV5ZmWCQ5YvNepb1w==
     -----END CERTIFICATE-----
   '';
-
-  makePump = { opts ? { } }:
-    {
-      enable = true;
-      sslCert = pkgs.writeText "snakeoil.cert" snakeOilCert;
-      sslKey = pkgs.writeText "snakeoil.pem" snakeOilKey;
-      secret = "test";
-      site = "test";
-    } // opts;
-
 in {
   name = "pumpio";
   meta = with pkgs.stdenv.lib.maintainers; {
@@ -72,9 +62,14 @@ in {
       { config, pkgs, ... }:
         {
           services = {
-           pumpio = makePump { opts = {
+           pumpio = {
              port = 443;
-           }; };
+             enable = true;
+             sslCert = pkgs.writeText "snakeoil.cert" snakeOilCert;
+             sslKey = pkgs.writeText "snakeoil.pem" snakeOilKey;
+             secretFile = pkgs.writeText "secretFile" "test123";
+             site = "test";
+           };
            mongodb.enable = true;
            mongodb.extraConfig = ''
              storage.journal.enabled: false