commit 15dab820a680659c3cb48809ecf4f47c1dfdb38a · pyrox.dev/nixpkgs

+34 -31

nixos/modules/services/mail/mailpit.nix

···

       6
       6
        
       }:

     

       7
       7
        
       

     

       8
       8
        
       let

     

       9
       9
       -
         cfg = config.services.mailpit;

     

       9
       9
       +
         inherit (config.services.mailpit) instances;

     

       10
       10
        
         inherit (lib)

     

       11
       11
        
           cli

     

       12
       12
        
           concatStringsSep

     

       13
       13
        
           const

     

       14
       14
        
           filterAttrs

     

       15
       15
        
           getExe

     

       16
       16
       -
           mkEnableOption

     

       16
       16
       +
           mapAttrs'

     

       17
       17
        
           mkIf

     

       18
       18
        
           mkOption

     

       19
       19
       +
           nameValuePair

     

       19
       20
        
           types

     

       20
       21
        
           ;

     

       21
       22
        
       

     

       22
       23
        
         isNonNull = v: v != null;

     

       23
       23
       -
         cliFlags = concatStringsSep " " (

     

       24
       24
       -
           cli.toGNUCommandLine { } (filterAttrs (const isNonNull) cfg.settings)

     

       25
       25
       -
         );

     

       24
       24
       +
         genCliFlags =

     

       25
       25
       +
           settings: concatStringsSep " " (cli.toGNUCommandLine { } (filterAttrs (const isNonNull) settings));

     

       26
       26
        
       in

     

       27
       27
        
       {

     

       28
       28
       -
         options.services.mailpit = {

     

       29
       29
       -
           enable = mkEnableOption "mailpit";

     

       30
       30
       -
       

     

       31
       31
       -
           settings = mkOption {

     

       32
       32
       -
             default = { };

     

       33
       33
       -
             type = types.submodule {

     

       28
       28
       +
         options.services.mailpit.instances = mkOption {

     

       29
       29
       +
           default = { };

     

       30
       30
       +
           type = types.attrsOf (

     

       31
       31
       +
             types.submodule {

     

       34
       32
        
               freeformType = types.attrsOf (

     

       35
       33
        
                 types.oneOf [

     

       36
       34
        
                   types.str

     
···

       75
       73
        
                   '';

     

       76
       74
        
                 };

     

       77
       75
        
               };

     

       78
       78
       -
             };

     

       79
       79
       -
             description = ''

     

       80
       80
       -
               Attribute-set of all flags passed to mailpit. See

     

       81
       81
       -
               [upstream docs](https://mailpit.axllent.org/docs/configuration/runtime-options/)

     

       82
       82
       -
               for all available options.

     

       83
       83
       -
             '';

     

       84
       84
       -
           };

     

       76
       76
       +
             }

     

       77
       77
       +
           );

     

       78
       78
       +
           description = ''

     

       79
       79
       +
             Configure mailpit instances. The attribute-set values are

     

       80
       80
       +
             CLI flags passed to the `mailpit` CLI.

     

       81
       81
       +
       

     

       82
       82
       +
             See [upstream docs](https://mailpit.axllent.org/docs/configuration/runtime-options/)

     

       83
       83
       +
             for all available options.

     

       84
       84
       +
           '';

     

       85
       85
        
         };

     

       86
       86
        
       

     

       87
       87
       -
         config = mkIf cfg.enable {

     

       88
       88
       -
           systemd.services.mailpit = {

     

       89
       89
       -
             wantedBy = [ "multi-user.target" ];

     

       90
       90
       -
             after = [ "network-online.target" ];

     

       91
       91
       -
             wants = [ "network-online.target" ];

     

       92
       92
       -
             serviceConfig = {

     

       93
       93
       -
               DynamicUser = true;

     

       94
       94
       -
               StateDirectory = "mailpit";

     

       95
       95
       -
               WorkingDirectory = "%S/mailpit";

     

       96
       96
       -
               ExecStart = "${getExe pkgs.mailpit} ${cliFlags}";

     

       97
       97
       -
               Restart = "on-failure";

     

       98
       98
       -
             };

     

       99
       99
       -
           };

     

       87
       87
       +
         config = mkIf (instances != { }) {

     

       88
       88
       +
           systemd.services = mapAttrs' (

     

       89
       89
       +
             name: cfg:

     

       90
       90
       +
             nameValuePair "mailpit-${name}" {

     

       91
       91
       +
               wantedBy = [ "multi-user.target" ];

     

       92
       92
       +
               after = [ "network-online.target" ];

     

       93
       93
       +
               wants = [ "network-online.target" ];

     

       94
       94
       +
               serviceConfig = {

     

       95
       95
       +
                 DynamicUser = true;

     

       96
       96
       +
                 StateDirectory = "mailpit";

     

       97
       97
       +
                 WorkingDirectory = "%S/mailpit";

     

       98
       98
       +
                 ExecStart = "${getExe pkgs.mailpit} ${genCliFlags cfg}";

     

       99
       99
       +
                 Restart = "on-failure";

     

       100
       100
       +
               };

     

       101
       101
       +
             }

     

       102
       102
       +
           ) instances;

     

       100
       103
        
         };

     

       101
       104
        
       

     

       102
       105
        
         meta.maintainers = lib.teams.flyingcircus.members;

+2 -2

nixos/tests/mailpit.nix

···

       7
       7
        
           nodes.machine =

     

       8
       8
        
             { pkgs, ... }:

     

       9
       9
        
             {

     

       10
       10
       -
               services.mailpit.enable = true;

     

       10
       10
       +
               services.mailpit.instances.default = { };

     

       11
       11
        
       

     

       12
       12
        
               environment.systemPackages = with pkgs; [ swaks ];

     

       13
       13
        
             };

     
···

       17
       17
        
       

     

       18
       18
        
             from json import loads

     

       19
       19
        
       

     

       20
       20
       -
             machine.wait_for_unit("mailpit.service")

     

       20
       20
       +
             machine.wait_for_unit("mailpit-default.service")

     

       21
       21
        
             machine.wait_for_open_port(1025)

     

       22
       22
        
             machine.wait_for_open_port(8025)

     

       23
       23
        
             machine.succeed(