summary refs log tree commit diff
diff options
context:
space:
mode:
authorJulien Moutinho <julm+nix@autogeree.net>2018-09-09 22:45:05 +0200
committerFranz Pletz <fpletz@fnordicwalking.de>2019-03-02 01:12:21 +0000
commit2a61c058c61b38ad358f7c05bf7a8aa53348c0a3 (patch)
tree4cd20a41e1de469c01766f8e995b8db5a6bca244
parente4808a6587b24a1f622d3e38a3820313f100a070 (diff)
downloadnixpkgs-2a61c058c61b38ad358f7c05bf7a8aa53348c0a3.tar
nixpkgs-2a61c058c61b38ad358f7c05bf7a8aa53348c0a3.tar.gz
nixpkgs-2a61c058c61b38ad358f7c05bf7a8aa53348c0a3.tar.bz2
nixpkgs-2a61c058c61b38ad358f7c05bf7a8aa53348c0a3.tar.lz
nixpkgs-2a61c058c61b38ad358f7c05bf7a8aa53348c0a3.tar.xz
nixpkgs-2a61c058c61b38ad358f7c05bf7a8aa53348c0a3.tar.zst
nixpkgs-2a61c058c61b38ad358f7c05bf7a8aa53348c0a3.zip
rmilter: fix inetSocket
IPv6 address has to be between [] and the port after.
-rw-r--r--nixos/modules/services/mail/rmilter.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/services/mail/rmilter.nix b/nixos/modules/services/mail/rmilter.nix
index 492c6458321..466365b6b30 100644
--- a/nixos/modules/services/mail/rmilter.nix
+++ b/nixos/modules/services/mail/rmilter.nix
@@ -8,7 +8,7 @@ let
   postfixCfg = config.services.postfix;
   cfg = config.services.rmilter;
 
-  inetSocket = addr: port: "inet:[${toString port}@${addr}]";
+  inetSocket = addr: port: "inet:${addr}:${toString port}";
   unixSocket = sock: "unix:${sock}";
 
   systemdSocket = if cfg.bindSocket.type == "unix" then cfg.bindSocket.path
@@ -97,7 +97,7 @@ in
 
       bindSocket.address = mkOption {
         type = types.str;
-        default = "::1";
+        default = "[::1]";
         example = "0.0.0.0";
         description = ''
           Inet address to listen on.