Unverified Commit 7f52135a authored by Martin Weinelt's avatar Martin Weinelt
Browse files

nixos/postfix: fold main and master config into settings attribute

parent 791dcff3

nixos/doc/manual/release-notes/rl-2511.section.md

+2 −2
Original line number Diff line number Diff line
@@ -118,8 +118,8 @@ 


- The Postfix module has been updated and likely requires configuration changes:

  - The `services.postfix.sslCert` and `sslKey` options were removed and you now need to configure

    - [services.postfix.config.smtpd_tls_chain_files](#opt-services.postfix.config.smtpd_tls_chain_files) for server certificates,

    - [services.postfix.config.smtp_tls_chain_files](#opt-services.postfix.config) for client certificates.

    - [services.postfix.settings.main.smtpd_tls_chain_files](#opt-services.postfix.settings.main.smtpd_tls_chain_files) for server certificates,

    - [services.postfix.settings.main.smtp_tls_chain_files](#opt-services.postfix.settings.main) for client certificates.



- `vmalert` now supports multiple instances with the option `services.vmalert.instances."".enable`

nixos/modules/services/mail/mailman.md

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ For a basic configuration with Postfix as the MTA, the following settings are su 
{

  services.postfix = {

    enable = true;

    config = {

    settings.main = {

      transport_maps = [ "hash:/var/lib/mailman/data/postfix_lmtp" ];

      local_recipient_maps = [ "hash:/var/lib/mailman/data/postfix_lmtp" ];

      relay_domains = [ "hash:/var/lib/mailman/data/postfix_domains" ];

nixos/modules/services/mail/mailman.nix

+1 −1
Original line number Diff line number Diff line
@@ -554,7 +554,7 @@ in 
    ];



    services.postfix = lib.mkIf cfg.enablePostfix {

      config = {

      settings.main = {

        owner_request_special = "no"; # Mailman handles -owner addresses on its own

        recipient_delimiter = "+"; # bake recipient addresses in mail envelopes via VERP

      };

nixos/modules/services/mail/mlmmj.nix

+2 −2
Original line number Diff line number Diff line
@@ -120,11 +120,11 @@ in 


    services.postfix = {

      enable = true;

      config = {

      settings.main = {

        recipient_delimiter = "+";

        propagate_unmatched_extensions = "virtual";

      };

      masterConfig.mlmmj = {

      settings.master.mlmmj = {

        type = "unix";

        private = true;

        privileged = true;

nixos/modules/services/mail/pfix-srsd.nix

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ in 


  config = lib.mkMerge [

    (lib.mkIf (cfg.enable && cfg.configurePostfix && config.services.postfix.enable) {

      services.postfix.config = {

      services.postfix.settings.main = {

        sender_canonical_maps = [ "tcp:127.0.0.1:10001" ];

        sender_canonical_classes = [ "envelope_sender" ];

        recipient_canonical_maps = [ "tcp:127.0.0.1:10002" ];