pyrox.dev / nixpkgs
lol
fork atom

nixos/parsedmarc: Fix smtp.to and default elasticsearch url

Previously evaluaton would fail if `smtp.to` was not set, since the
default case was not handled.

With the current versions of the python elasticsearch libraries, any
configuration containing the modules default would fail since it's not a
valid URL.

The issue adressed in #279068 is also adressed, thuse closes #279068.

e1mo 896919de e8229957

options
unified split
Changed files
+2 -2
nixos
modules
services
monitoring
parsedmarc.nix
+2 -2
nixos/modules/services/monitoring/parsedmarc.nix 
···

       
301

       
 

       
              description = ''


     

       
302

       
 

       
                The addresses to send outgoing mail to.


     

       
303

       
 

       
              '';


     

       
304

       
-

       
              apply = x: if x == [] then null else lib.concatStringsSep "," x;


     

       
305

       
 

       
            };


     

       
306

       
 

       
          };


     

       
307

       
 

       



     
···

       
446

       
 

       
    services.parsedmarc.settings = lib.mkMerge [


     

       
447

       
 

       
      (lib.mkIf cfg.provision.elasticsearch {


     

       
448

       
 

       
        elasticsearch = {


     

       
449

       
-

       
          hosts = [ "localhost:9200" ];


     

       
450

       
 

       
          ssl = false;


     

       
451

       
 

       
        };


     

       
452

       
 

       
      })


     
···

       
301

       
 

       
              description = ''


     

       
302

       
 

       
                The addresses to send outgoing mail to.


     

       
303

       
 

       
              '';


     

       
304

       
+

       
              apply = x: if x == [] || x == null then null else lib.concatStringsSep "," x;


     

       
305

       
 

       
            };


     

       
306

       
 

       
          };


     

       
307

       
 

       



     
···

       
446

       
 

       
    services.parsedmarc.settings = lib.mkMerge [


     

       
447

       
 

       
      (lib.mkIf cfg.provision.elasticsearch {


     

       
448

       
 

       
        elasticsearch = {


     

       
449

       
+

       
          hosts = [ "http://localhost:9200" ];


     

       
450

       
 

       
          ssl = false;


     

       
451

       
 

       
        };


     

       
452

       
 

       
      })