From 9335b44bd804f0137d14448683fa7e43552b4529 Mon Sep 17 00:00:00 2001 From: Dmitriy Alekseev <1865999+dragoangel@users.noreply.github.com> Date: Fri, 25 Oct 2024 19:29:51 +0200 Subject: [PATCH 1/5] Update rspamd_proxy.md --- doc/workers/rspamd_proxy.md | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/workers/rspamd_proxy.md b/doc/workers/rspamd_proxy.md index 4950e4906..b05dd0e5b 100644 --- a/doc/workers/rspamd_proxy.md +++ b/doc/workers/rspamd_proxy.md @@ -93,6 +93,7 @@ upstream "scan" { hosts = "round-robin:host1:11333:10,host2:11333:10,host3:11333:5,host4:11333:5"; key = "..."; # Public key for encryption, generated by rspamadm keypair (optional) compression = yes; # Use zstd compression (optional) + settings_id = "custom"; # Use custom user settings module configuration (optional) } ~~~ From 8099b8a93157ccd4fe4417b796d12988bb15d066 Mon Sep 17 00:00:00 2001 From: Dmitriy Alekseev <1865999+dragoangel@users.noreply.github.com> Date: Fri, 25 Oct 2024 19:48:22 +0200 Subject: [PATCH 2/5] Update rspamd_proxy.md --- doc/workers/rspamd_proxy.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/doc/workers/rspamd_proxy.md b/doc/workers/rspamd_proxy.md index b05dd0e5b..7ba4baf1c 100644 --- a/doc/workers/rspamd_proxy.md +++ b/doc/workers/rspamd_proxy.md @@ -93,7 +93,7 @@ upstream "scan" { hosts = "round-robin:host1:11333:10,host2:11333:10,host3:11333:5,host4:11333:5"; key = "..."; # Public key for encryption, generated by rspamadm keypair (optional) compression = yes; # Use zstd compression (optional) - settings_id = "custom"; # Use custom user settings module configuration (optional) + settings_id = "name"; # Use custom user settings module configuration (optional) } ~~~ @@ -128,6 +128,9 @@ mirror "test" { compression = yes; # Use zstd compression } ~~~ +### User settings + +Proxy worker can utilize `settings_id` configured in upsteam. Upsteam need to have [user settings]({{ site.baseurl }}/doc/configuration/settings.html) module configured with name used in proxy-worker. ### Compare scripts From a406f496a063fff0b002220ca48038ddf13e1fe6 Mon Sep 17 00:00:00 2001 From: Dmitriy Alekseev <1865999+dragoangel@users.noreply.github.com> Date: Fri, 25 Oct 2024 19:48:47 +0200 Subject: [PATCH 3/5] Update rspamd_proxy.md --- doc/workers/rspamd_proxy.md | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/workers/rspamd_proxy.md b/doc/workers/rspamd_proxy.md index 7ba4baf1c..8a547b776 100644 --- a/doc/workers/rspamd_proxy.md +++ b/doc/workers/rspamd_proxy.md @@ -128,6 +128,7 @@ mirror "test" { compression = yes; # Use zstd compression } ~~~ + ### User settings Proxy worker can utilize `settings_id` configured in upsteam. Upsteam need to have [user settings]({{ site.baseurl }}/doc/configuration/settings.html) module configured with name used in proxy-worker. From 2faad60d900d1df996cb917611c154079cece1a3 Mon Sep 17 00:00:00 2001 From: Dmitriy Alekseev <1865999+dragoangel@users.noreply.github.com> Date: Sat, 26 Oct 2024 11:50:48 +0200 Subject: [PATCH 4/5] Update doc/workers/rspamd_proxy.md Co-authored-by: Alexander Moisseev --- doc/workers/rspamd_proxy.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/workers/rspamd_proxy.md b/doc/workers/rspamd_proxy.md index 8a547b776..687e0203a 100644 --- a/doc/workers/rspamd_proxy.md +++ b/doc/workers/rspamd_proxy.md @@ -93,7 +93,7 @@ upstream "scan" { hosts = "round-robin:host1:11333:10,host2:11333:10,host3:11333:5,host4:11333:5"; key = "..."; # Public key for encryption, generated by rspamadm keypair (optional) compression = yes; # Use zstd compression (optional) - settings_id = "name"; # Use custom user settings module configuration (optional) + settings_id = "name"; # Apply a custom setting from the user settings module (optional) } ~~~ From c5704843678e6d81c090e0c052f96023c469a0ff Mon Sep 17 00:00:00 2001 From: Dmitriy Alekseev <1865999+dragoangel@users.noreply.github.com> Date: Sat, 26 Oct 2024 11:50:52 +0200 Subject: [PATCH 5/5] Update doc/workers/rspamd_proxy.md Co-authored-by: Alexander Moisseev --- doc/workers/rspamd_proxy.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/workers/rspamd_proxy.md b/doc/workers/rspamd_proxy.md index 687e0203a..1e7e58a1a 100644 --- a/doc/workers/rspamd_proxy.md +++ b/doc/workers/rspamd_proxy.md @@ -131,7 +131,7 @@ mirror "test" { ### User settings -Proxy worker can utilize `settings_id` configured in upsteam. Upsteam need to have [user settings]({{ site.baseurl }}/doc/configuration/settings.html) module configured with name used in proxy-worker. +The proxy worker can apply a specific setting using the `settings_id` configured in an upstream through the [user settings module]({{ site.baseurl }}/doc/configuration/settings.html). Ensure that the user settings module includes a setting with the same name as defined in `settings_id`. ### Compare scripts