diff options
| author | uwap <me@uwap.name> | 2016-06-09 18:06:07 +0200 |
|---|---|---|
| committer | uwap <me@uwap.name> | 2016-06-09 18:06:07 +0200 |
| commit | cc658b695a2d6a49f9c94f0ac9d124de1f62b644 (patch) | |
| tree | 738380d2ccfb6f73fd265acfedf57f202df34648 /nixos | |
| parent | d1e4ee146d68a21c263d094acb416b050af32939 (diff) | |
| download | nixlib-cc658b695a2d6a49f9c94f0ac9d124de1f62b644.tar nixlib-cc658b695a2d6a49f9c94f0ac9d124de1f62b644.tar.gz nixlib-cc658b695a2d6a49f9c94f0ac9d124de1f62b644.tar.bz2 nixlib-cc658b695a2d6a49f9c94f0ac9d124de1f62b644.tar.lz nixlib-cc658b695a2d6a49f9c94f0ac9d124de1f62b644.tar.xz nixlib-cc658b695a2d6a49f9c94f0ac9d124de1f62b644.tar.zst nixlib-cc658b695a2d6a49f9c94f0ac9d124de1f62b644.zip | |
Make submission options more flexible
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/mail/postfix.nix | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix index e354ae668197..616018fc3079 100644 --- a/nixos/modules/services/mail/postfix.nix +++ b/nixos/modules/services/mail/postfix.nix @@ -129,10 +129,7 @@ let smtp inet n - n - - smtpd '' + optionalString cfg.enableSubmission '' submission inet n - n - - smtpd - -o smtpd_tls_security_level=encrypt - -o smtpd_sasl_auth_enable=yes - -o smtpd_client_restrictions=permit_sasl_authenticated,reject - ${cfg.extraSubmissionOptions} + ${concatStringsSep "\n " (mapAttrsToList (x: y: "-o " + x + "=" + y) cfg.submissionOptions)} '' + '' pickup unix n - n 60 1 pickup @@ -208,14 +205,17 @@ in enableSubmission = mkOption { type = types.bool; default = false; - description = "Whether to enable smtp submission in master.cf."; + description = "Whether to enable smtp submission"; }; - extraSubmissionOptions = mkOption { - type = types.str; - default = ""; - description = "Extra options for the submission config in master.cf."; - example = "-o milter_macro_daemon_name=ORIGINATING"; + submissionOptions = mkOption { + type = types.attrs; + default = { "smtpd_tls_security_level" = "encrypt"; + "smtpd_sasl_auth_enable" = "yes"; + "smtpd_client_restrictions" = "permit_sasl_authenticated,reject"; + }; + description = "Options for the submission config in master.cf"; + example = { "milter_macro_daemon_name" = "ORIGINATING"; }; }; setSendmail = mkOption { |