about summary refs log tree commit diff
path: root/nixpkgs
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2021-04-04 11:56:31 +0000
committerAlyssa Ross <hi@alyssa.is>2021-04-04 12:07:34 +0000
commit7c52302f4707ddf83f8367ddcf6c9a8a3fd98b95 (patch)
treeb2172230e6c852fad4445dbbca59f94dc6cb349f /nixpkgs
parent519ae05f63bd85cccbbcc333b375cd33edfd3d5d (diff)
downloadnixlib-7c52302f4707ddf83f8367ddcf6c9a8a3fd98b95.tar
nixlib-7c52302f4707ddf83f8367ddcf6c9a8a3fd98b95.tar.gz
nixlib-7c52302f4707ddf83f8367ddcf6c9a8a3fd98b95.tar.bz2
nixlib-7c52302f4707ddf83f8367ddcf6c9a8a3fd98b95.tar.lz
nixlib-7c52302f4707ddf83f8367ddcf6c9a8a3fd98b95.tar.xz
nixlib-7c52302f4707ddf83f8367ddcf6c9a8a3fd98b95.tar.zst
nixlib-7c52302f4707ddf83f8367ddcf6c9a8a3fd98b95.zip
nixos/postfix: add services.postfix.canonical opt
This mirrors the services.postfix.transport and
services.postfix.virtual options we already have.
Diffstat (limited to 'nixpkgs')
-rw-r--r--nixpkgs/nixos/modules/services/mail/postfix.nix14
1 files changed, 14 insertions, 0 deletions
diff --git a/nixpkgs/nixos/modules/services/mail/postfix.nix b/nixpkgs/nixos/modules/services/mail/postfix.nix
index 63c0961b7568..8e5bed5fcb87 100644
--- a/nixpkgs/nixos/modules/services/mail/postfix.nix
+++ b/nixpkgs/nixos/modules/services/mail/postfix.nix
@@ -11,6 +11,7 @@ let
 
   haveAliases = cfg.postmasterAlias != "" || cfg.rootAlias != ""
                       || cfg.extraAliases != "";
+  haveCanonical = cfg.canonical != "";
   haveTransport = cfg.transport != "";
   haveVirtual = cfg.virtual != "";
   haveLocalRecipients = cfg.localRecipients != null;
@@ -244,6 +245,7 @@ let
   ;
 
   aliasesFile = pkgs.writeText "postfix-aliases" aliases;
+  canonicalFile = pkgs.writeText "postfix-canonical" cfg.canonical;
   virtualFile = pkgs.writeText "postfix-virtual" cfg.virtual;
   localRecipientMapFile = pkgs.writeText "postfix-local-recipient-map" (concatMapStrings (x: x + " ACCEPT\n") cfg.localRecipients);
   checkClientAccessFile = pkgs.writeText "postfix-check-client-access" cfg.dnsBlacklistOverrides;
@@ -529,6 +531,15 @@ in
         ";
       };
 
+      canonical = mkOption {
+        type = types.lines;
+        default = "";
+        description = ''
+          Entries for the <citerefentry><refentrytitle>canonical</refentrytitle>
+          <manvolnum>5</manvolnum></citerefentry> table.
+        '';
+      };
+
       virtual = mkOption {
         type = types.lines;
         default = "";
@@ -941,6 +952,9 @@ in
     (mkIf haveAliases {
       services.postfix.aliasFiles.aliases = aliasesFile;
     })
+    (mkIf haveCanonical {
+      services.postfix.mapFiles.canonical = canonicalFile;
+    })
     (mkIf haveTransport {
       services.postfix.mapFiles.transport = transportFile;
     })