From 14a83df1ccefd3ef81ae0a10810df40b0287383e Mon Sep 17 00:00:00 2001 From: Philipp Matti Date: Wed, 8 Feb 2023 10:46:57 +0100 Subject: [PATCH 1/2] add redis-sentinel to mta-sts-daemon.yml.5.adoc --- man/mta-sts-daemon.yml.5.adoc | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/man/mta-sts-daemon.yml.5.adoc b/man/mta-sts-daemon.yml.5.adoc index 852485c..be9a4d6 100644 --- a/man/mta-sts-daemon.yml.5.adoc +++ b/man/mta-sts-daemon.yml.5.adoc @@ -32,7 +32,7 @@ The file is in YAML syntax with the following elements: *cache*:: -* *type*: (_str_: _internal_|_sqlite_|_redis_) cache backend type. Default: internal +* *type*: (_str_: _internal_|_sqlite_|_redis_|_redis_sentinel_) cache backend type. Default: internal * *options*: ** Options for _internal_ type: *** *cache_size*: (_int_) number of cache entries to store in memory. Default: 10000 @@ -42,6 +42,10 @@ The file is in YAML syntax with the following elements: *** *timeout*: (_float_) timeout in seconds for acquiring connection from pool or DB lock. Default: 5 ** Options for _redis_ type: *** All parameters are passed to `aioredis.from_url` [0]. Check there for a parameter reference. + ** Options for _redis_sentinel_ type: + *** *sentinel_master_name*: (_str_) name of the sentinel master + *** *sentinels*: (_list_)(_tuple_) list of sentinels in form of ip/fqdn and port + *** All other parameters are passed to `aioredis.sentinel.Sentinel` [1]. Check there for a parameter reference. *proactive_policy_fetching*:: @@ -66,7 +70,7 @@ The timeout is used for the DNS and HTTP requests. MTA-STS "testing" mode can be interpreted as "strict" mode. This may be useful (though noncompliant) in the beginning of MTA-STS deployment, when many -domains operate under "testing" mode. +domains operate under "testing" mode. == Example @@ -99,3 +103,5 @@ domains operate under "testing" mode. 0.:: https://aioredis.readthedocs.io/en/latest/api/high-level/#aioredis.client.Redis.from_url +1.:: + https://aioredis.readthedocs.io/en/v1.3.0/sentinel.html#aioredis.sentinel.RedisSentinel From 0348ce99a4ba5acf0b81957a9bf5bd2653be9c9d Mon Sep 17 00:00:00 2001 From: Philipp Matti Date: Mon, 13 Feb 2023 11:27:06 +0100 Subject: [PATCH 2/2] update links in mta-sts-daemon adoc --- man/mta-sts-daemon.yml.5.adoc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/man/mta-sts-daemon.yml.5.adoc b/man/mta-sts-daemon.yml.5.adoc index be9a4d6..3fc4ad1 100644 --- a/man/mta-sts-daemon.yml.5.adoc +++ b/man/mta-sts-daemon.yml.5.adoc @@ -45,7 +45,7 @@ The file is in YAML syntax with the following elements: ** Options for _redis_sentinel_ type: *** *sentinel_master_name*: (_str_) name of the sentinel master *** *sentinels*: (_list_)(_tuple_) list of sentinels in form of ip/fqdn and port - *** All other parameters are passed to `aioredis.sentinel.Sentinel` [1]. Check there for a parameter reference. + *** All other parameters are passed to `aioredis.sentinel.Sentinel` [1]. For additional details check [2]. *proactive_policy_fetching*:: @@ -104,4 +104,6 @@ domains operate under "testing" mode. 0.:: https://aioredis.readthedocs.io/en/latest/api/high-level/#aioredis.client.Redis.from_url 1.:: - https://aioredis.readthedocs.io/en/v1.3.0/sentinel.html#aioredis.sentinel.RedisSentinel + https://aioredis.readthedocs.io/en/latest/getting-started/#redis-sentinel-client +2.:: + https://redis.readthedocs.io/en/stable/connections.html#sentinel-client