commit 3ba2095a42af1caa2b9a22cd2d3a0b24f72ccda8 · pyrox.dev/nixpkgs

+8 -5

nixos/modules/services/mail/dovecot.nix

···

       9
       9
        
         baseDir = "/run/dovecot2";

     

       10
       10
        
         stateDir = "/var/lib/dovecot";

     

       11
       11
        
       

     

       12
       12
       +
         canCreateMailUserGroup = cfg.mailUser != null && cfg.mailGroup != null;

     

       13
       13
       +
       

     

       12
       14
        
         dovecotConf = concatStrings [

     

       13
       15
        
           ''

     

       14
       16
        
             base_dir = ${baseDir}

     
···

       314
       316
        
                  description = "Dovecot user";

     

       315
       317
        
                  group = cfg.group;

     

       316
       318
        
                }

     

       317
       317
       -
             ++ optional cfg.createMailUser

     

       318
       318
       -
                { name = cfg.mailUser;

     

       319
       319
       -
                  description = "Virtual Mail User";

     

       319
       319
       +
             ++ optional (cfg.createMailUser && cfg.mailUser != null)

     

       320
       320
       +
                ({ name = cfg.mailUser;

     

       321
       321
       +
                   description = "Virtual Mail User";

     

       322
       322
       +
                } // optionalAttrs (cfg.mailGroup != null) {

     

       320
       323
        
                  group = cfg.mailGroup;

     

       321
       321
       -
                };

     

       324
       324
       +
                });

     

       322
       325
        
       

     

       323
       326
        
           users.extraGroups = optional (cfg.group == "dovecot2")

     

       324
       327
        
             { name = "dovecot2";

     

       325
       328
        
               gid = config.ids.gids.dovecot2;

     

       326
       329
        
             }

     

       327
       327
       -
           ++ optional cfg.createMailUser

     

       330
       330
       +
           ++ optional (cfg.createMailUser && cfg.mailGroup != null)

     

       328
       331
        
             { name = cfg.mailGroup;

     

       329
       332
        
             };

     

       330
       333

nixos/release.nix

···

       236
       236
        
         tests.containers-macvlans = callTest tests/containers-macvlans.nix {};

     

       237
       237
        
         tests.docker = hydraJob (import tests/docker.nix { system = "x86_64-linux"; });

     

       238
       238
        
         tests.docker-edge = hydraJob (import tests/docker-edge.nix { system = "x86_64-linux"; });

     

       239
       239
       +
         tests.dovecot = callTest tests/dovecot.nix {};

     

       239
       240
        
         tests.dnscrypt-proxy = callTest tests/dnscrypt-proxy.nix { system = "x86_64-linux"; };

     

       240
       241
        
         tests.ecryptfs = callTest tests/ecryptfs.nix {};

     

       241
       242
        
         tests.etcd = hydraJob (import tests/etcd.nix { system = "x86_64-linux"; });

+64

nixos/tests/dovecot.nix

···

       1
       1
       +
       import ./make-test.nix {

     

       2
       2
       +
         name = "dovecot";

     

       3
       3
       +
       

     

       4
       4
       +
         machine = { pkgs, ... }: {

     

       5
       5
       +
           imports = [ common/user-account.nix ];

     

       6
       6
       +
           services.postfix.enable = true;

     

       7
       7
       +
           services.dovecot2.enable = true;

     

       8
       8
       +
           services.dovecot2.protocols = [ "imap" "pop3" ];

     

       9
       9
       +
           environment.systemPackages = let

     

       10
       10
       +
             sendTestMail = pkgs.writeScriptBin "send-testmail" ''

     

       11
       11
       +
               #!${pkgs.stdenv.shell}

     

       12
       12
       +
               exec sendmail -vt <<MAIL

     

       13
       13
       +
               From: root@localhost

     

       14
       14
       +
               To: alice@localhost

     

       15
       15
       +
               Subject: Very important!

     

       16
       16
       +
       

     

       17
       17
       +
               Hello world!

     

       18
       18
       +
               MAIL

     

       19
       19
       +
             '';

     

       20
       20
       +
       

     

       21
       21
       +
             testImap = pkgs.writeScriptBin "test-imap" ''

     

       22
       22
       +
               #!${pkgs.python3.interpreter}

     

       23
       23
       +
               import imaplib

     

       24
       24
       +
       

     

       25
       25
       +
               with imaplib.IMAP4('localhost') as imap:

     

       26
       26
       +
                 imap.login('alice', 'foobar')

     

       27
       27
       +
                 imap.select()

     

       28
       28
       +
                 status, refs = imap.search(None, 'ALL')

     

       29
       29
       +
                 assert status == 'OK'

     

       30
       30
       +
                 assert len(refs) == 1

     

       31
       31
       +
                 status, msg = imap.fetch(refs[0], 'BODY[TEXT]')

     

       32
       32
       +
                 assert status == 'OK'

     

       33
       33
       +
                 assert msg[0][1].strip() == b'Hello world!'

     

       34
       34
       +
             '';

     

       35
       35
       +
       

     

       36
       36
       +
             testPop = pkgs.writeScriptBin "test-pop" ''

     

       37
       37
       +
               #!${pkgs.python3.interpreter}

     

       38
       38
       +
               import poplib

     

       39
       39
       +
       

     

       40
       40
       +
               pop = poplib.POP3('localhost')

     

       41
       41
       +
               try:

     

       42
       42
       +
                 pop.user('alice')

     

       43
       43
       +
                 pop.pass_('foobar')

     

       44
       44
       +
                 assert len(pop.list()[1]) == 1

     

       45
       45
       +
                 status, fullmail, size = pop.retr(1)

     

       46
       46
       +
                 assert status.startswith(b'+OK ')

     

       47
       47
       +
                 body = b"".join(fullmail[fullmail.index(b""):]).strip()

     

       48
       48
       +
                 assert body == b'Hello world!'

     

       49
       49
       +
               finally:

     

       50
       50
       +
                 pop.quit()

     

       51
       51
       +
             '';

     

       52
       52
       +
       

     

       53
       53
       +
           in [ sendTestMail testImap testPop ];

     

       54
       54
       +
         };

     

       55
       55
       +
       

     

       56
       56
       +
         testScript = ''

     

       57
       57
       +
           $machine->waitForUnit('postfix.service');

     

       58
       58
       +
           $machine->waitForUnit('dovecot2.service');

     

       59
       59
       +
           $machine->succeed('send-testmail');

     

       60
       60
       +
           $machine->waitUntilFails('[ "$(postqueue -p)" != "Mail queue is empty" ]');

     

       61
       61
       +
           $machine->succeed('test-imap');

     

       62
       62
       +
           $machine->succeed('test-pop');

     

       63
       63
       +
         '';

     

       64
       64
       +
       }