summary refs log tree commit diff
path: root/nixos/tests
diff options
context:
space:
mode:
authorRobin Gloster <mail@glob.in>2018-11-28 17:33:26 +0100
committerRobin Gloster <mail@glob.in>2018-11-28 18:53:37 +0100
commit1262a5ca975b26fe113b5a03cddbc184cc7a4f58 (patch)
treee30d891c083b078e1f169421d4a5cf90b31b0b33 /nixos/tests
parent9ace7f640996bb3e95f8233a74ef980af3a35559 (diff)
downloadnixpkgs-1262a5ca975b26fe113b5a03cddbc184cc7a4f58.tar
nixpkgs-1262a5ca975b26fe113b5a03cddbc184cc7a4f58.tar.gz
nixpkgs-1262a5ca975b26fe113b5a03cddbc184cc7a4f58.tar.bz2
nixpkgs-1262a5ca975b26fe113b5a03cddbc184cc7a4f58.tar.lz
nixpkgs-1262a5ca975b26fe113b5a03cddbc184cc7a4f58.tar.xz
nixpkgs-1262a5ca975b26fe113b5a03cddbc184cc7a4f58.tar.zst
nixpkgs-1262a5ca975b26fe113b5a03cddbc184cc7a4f58.zip
roundcube: apply code review suggestions
Diffstat (limited to 'nixos/tests')
-rw-r--r--nixos/tests/all-tests.nix1
-rw-r--r--nixos/tests/roundcube.nix2
2 files changed, 2 insertions, 1 deletions
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 7bf261b58d6..feffdb97c18 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -178,6 +178,7 @@ in
   rabbitmq = handleTest ./rabbitmq.nix {};
   radicale = handleTest ./radicale.nix {};
   redmine = handleTest ./redmine.nix {};
+  roundcube = handleTest ./roundcube.nix {};
   rspamd = handleTest ./rspamd.nix {};
   rss2email = handleTest ./rss2email.nix {};
   rsyslogd = handleTest ./rsyslogd.nix {};
diff --git a/nixos/tests/roundcube.nix b/nixos/tests/roundcube.nix
index faa5f3fa0df..178134fd9b3 100644
--- a/nixos/tests/roundcube.nix
+++ b/nixos/tests/roundcube.nix
@@ -9,7 +9,6 @@ import ./make-test.nix ({ pkgs, ...} : {
       services.roundcube = {
         enable = true;
         hostName = "roundcube";
-        nginx.enable = true;
         database.password = "notproduction";
       };
       services.nginx.virtualHosts.roundcube = {
@@ -23,6 +22,7 @@ import ./make-test.nix ({ pkgs, ...} : {
     $roundcube->start;
     $roundcube->waitForUnit("postgresql.service");
     $roundcube->waitForUnit("phpfpm-roundcube.service");
+    $roundcube->waitForUnit("nginx.service");
     $roundcube->succeed("curl -sSfL http://roundcube/");
   '';
 })