···

       
335
       
335
       
 
       
      };

     

       
336
       
336
       
 
       


     

       
337
       
337
       
 
       
      secrets = lib.mkOption {

     

       
338
       
338
       
-
       
        type = lib.types.path;

     

       
338
       
338
       
+
       
        type = with types; listOf path;

     

       
339
       
339
       
 
       
        description = lib.mdDoc ''

     

       
340
       
340
       
-
       
          A file containing the various secrets. Should be in the format

     

       
340
       
340
       
+
       
          A list of files containing the various secrets. Should be in the format

     

       
341
       
341
       
 
       
          expected by systemd's `EnvironmentFile` directory. Secrets can be

     

       
342
       
342
       
 
       
          referenced in the format `{env:VAR}`.

     

       
343
       
343
       
 
       
        '';

     

       
344
       
344
       
+
       
        default = [ ];

     

       
344
       
345
       
 
       
      };

     

       
345
       
346
       
 
       


     

       
346
       
347
       
 
       
    };

     
···

       
379
       
380
       
 
       
            User = cfg.user;

     

       
380
       
381
       
 
       
            Group = cfg.group;

     

       
381
       
382
       
 
       
            StateDirectory = [ "maddy" ];

     

       
382
       
382
       
-
       
            EnvironmentFile = lib.mkIf (cfg.secrets != null) "${cfg.secrets}";

     

       
383
       
383
       
+
       
            EnvironmentFile = cfg.secrets;

     

       
383
       
384
       
 
       
          };

     

       
384
       
385
       
 
       
          restartTriggers = [ config.environment.etc."maddy/maddy.conf".source ];

     

       
385
       
386
       
 
       
          wantedBy = [ "multi-user.target" ];

     

···

       
2
       
2
       
 
       


     

       
3
       
3
       
 
       
buildGoModule rec {

     

       
4
       
4
       
 
       
  pname = "maddy";

     

       
5
       
5
       
-
       
  version = "0.6.3";

     

       
5
       
5
       
+
       
  version = "0.7.0";

     

       
6
       
6
       
 
       


     

       
7
       
7
       
 
       
  src = fetchFromGitHub {

     

       
8
       
8
       
 
       
    owner = "foxcpp";

     

       
9
       
9
       
 
       
    repo = "maddy";

     

       
10
       
10
       
 
       
    rev = "v${version}";

     

       
11
       
11
       
-
       
    sha256 = "sha256-vf+jkXerdwvQhtyiOObBRxh8sYMEcgXC5vNzm5wquBs=";

     

       
11
       
11
       
+
       
    sha256 = "sha256-EMw07yTFP0aBSuGDWivB8amuxWLFHhYV6J9faTEW5z4=";

     

       
12
       
12
       
 
       
  };

     

       
13
       
13
       
 
       


     

       
14
       
14
       
-
       
  vendorSha256 = "sha256-10cLNl9jWYX8XIKQkCxJ+/ymZC1YJRHUJWZQhq7zeV4=";

     

       
14
       
14
       
+
       
  vendorSha256 = "sha256-LyfkETZPkhJKN8CEivNp7Se4IBpzyAtmCM1xil4n2po=";

     

       
15
       
15
       
 
       


     

       
16
       
16
       
 
       
  tags = [ "libpam" ];

     

       
17
       
17