Merge pull request #68 from griff/fix-email-tests

email: Support webmail without TLS and fix test
nixcloud · Apr 8, 2020 · 3a0767f · 3a0767f
2 parents 5a1ed62 + 88eaa6f
commit 3a0767f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/modules/services/email/nixcloud-email.nix b/modules/services/email/nixcloud-email.nix
@@ -37,7 +37,9 @@ let
     proxyOptions = {
       domain = "${extraFQDN}";
       port = port;
-      TLS = "${primaryFQDN}";
+      TLS = lib.mkIf cfg.enableTLS "${primaryFQDN}";
+      http.mode = if cfg.enableTLS then "redirect_to_https" else "on";
+      https.mode = if cfg.enableTLS then "on" else "off";
     };
   };
   # unique set of primary FQDN and additional domains in nixcloud.email, prefixed with `mail.` depending on `autoMailDomain`
@@ -297,8 +299,6 @@ in {
 
   config = lib.mkIf cfg.enable (lib.mkMerge [
     (lib.mkIf cfg.enableTLS {
-      nixcloud.reverse-proxy.enable = true;
-
       systemd.services.postfix.after = [ "nixcloud.TLS-certificates.target" ];
       systemd.services.postfix.wants = [ "nixcloud.TLS-certificates.target" ];
 
@@ -492,6 +492,8 @@ in {
         ];
       };
 
+      nixcloud.reverse-proxy.enable = cfg.enableTLS || cfg.webmail.enable;
+
       services.mailUsers.users = cfg.users;
 
       nixcloud.tests.wanted = [ ./test ];

diff --git a/modules/services/email/test/default.nix b/modules/services/email/test/default.nix
@@ -183,9 +183,7 @@ in {
     '');
   };
 
-  testScript = let
-    rcSearchFor = "<title>Roundcube</title>";
-  in ''
+  testScript = ''
     startAll;
     $dns->waitForUnit('bind.service');
     $mail1->waitForUnit('multi-user.target');
@@ -197,7 +195,7 @@ in {
     $mail2->waitForOpenPort(80);
     $mail1->waitForOpenPort(8993);
     $mail2->waitForOpenPort(8993);
-    $mail1->succeed('curl -L https://mail.example.org/ | grep -qF "${rcSearchFor}"');
+    $mail1->succeed('curl -L http://mail.example.org/ | grep -qF "<title>Roundcube"');
     # Check spam learning
     $mail2->waitUntilSucceeds("journalctl -u dovecot2 | grep learn-spam.sh >&2");
     $mail2->succeed('journalctl -u rspamd | grep "csession; rspamd_controller_learn_fin_task: </run/rspamd/worker-controller.sock> learned message as spam" >&2');