diff options
| author | Naïm Favier <n@monade.li> | 2022-01-21 14:42:39 +0100 |
|---|---|---|
| committer | Naïm Favier <n@monade.li> | 2022-02-24 20:51:40 +0000 |
| commit | 4ed684481b550a802a9c4af97cdc60354d03a615 (patch) | |
| tree | d04bb8e46ee83384560929fddcd39a910d0ac9f6 /default.nix | |
| parent | f4c14572fcd384d2cb3c63be1cd26fbe143803f8 (diff) | |
Update nixos-unstable and drop 21.11
Diffstat (limited to 'default.nix')
| -rw-r--r-- | default.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/default.nix b/default.nix index f142422..c438099 100644 --- a/default.nix +++ b/default.nix @@ -668,7 +668,7 @@ in type = types.str; # read the default from nixos' redis module default = let - cf = config.services.redis.bind; + cf = config.services.redis.servers.rspamd.bind; cfdefault = if cf == null then "127.0.0.1" else cf; ips = lib.strings.splitString " " cfdefault; ip = lib.lists.head (ips ++ [ "127.0.0.1" ]); @@ -677,7 +677,7 @@ in if (ip == "0.0.0.0" || ip == "::") then "127.0.0.1" else if isIpv6 ip then "[${ip}]" else ip; - defaultText = lib.literalDocBook "computed from <option>config.services.redis.bind</option>"; + defaultText = lib.literalDocBook "computed from <option>config.services.redis.servers.rspamd.bind</option>"; description = '' Address that rspamd should use to contact redis. ''; @@ -685,8 +685,8 @@ in port = mkOption { type = types.port; - default = config.services.redis.port; - defaultText = lib.literalExpression "config.services.redis.port"; + default = config.services.redis.servers.rspamd.port; + defaultText = lib.literalExpression "config.services.redis.servers.rspamd.port"; description = '' Port that rspamd should use to contact redis. ''; @@ -694,8 +694,8 @@ in password = mkOption { type = types.nullOr types.str; - default = config.services.redis.requirePass; - defaultText = lib.literalExpression "config.services.redis.requirePass"; + default = config.services.redis.servers.rspamd.requirePass; + defaultText = lib.literalExpression "config.services.redis.servers.rspamd.requirePass"; description = '' Password that rspamd should use to contact redis, or null if not required. ''; |