[Conf] Major stock config updates

- Workers are now specified in a new format worker "type" { ... }
- Enable fuzzy worker to simplify local fuzzy storages configuration
- Bind all workers to localhost by default to avoid security flaws

1 files changed, 11 insertions, 10 deletions

diff --git a/conf/rspamd.conf b/conf/rspamd.conf
index c8d308658..8282eefeb 100644
--- a/conf/rspamd.conf
+++ b/conf/rspamd.conf
@@ -32,14 +32,14 @@ logging {
     .include(try=true; priority=10) "$LOCAL_CONFDIR/override.d/logging.inc"
 }
 
-worker {
-    bind_socket = "*:11333";
+worker "normal" {
+    bind_socket = "localhost:11333";
     .include "$CONFDIR/worker-normal.inc"
     .include(try=true; priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/worker-normal.inc"
     .include(try=true; priority=10) "$LOCAL_CONFDIR/override.d/worker-normal.inc"
 }
 
-worker {
+worker "controller" {
     bind_socket = "localhost:11334";
     .include "$CONFDIR/worker-controller.inc"
     .include(try=true; priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/worker-controller.inc"
@@ -47,7 +47,7 @@ worker {
 }
 
 worker "rspamd_proxy" {
-    bind_socket = "*:11332";
+    bind_socket = "localhost:11332";
     .include "$CONFDIR/worker-proxy.inc"
     .include(try=true; priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/worker-proxy.inc"
     .include(try=true; priority=10) "$LOCAL_CONFDIR/override.d/worker-proxy.inc"
@@ -55,9 +55,10 @@ worker "rspamd_proxy" {
 
 # Local fuzzy storage is disabled by default
 
-#worker {
-#    bind_socket = "*:11335";
-#    .include "$CONFDIR/worker-fuzzy.inc"
-#    .include(try=true; priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/worker-fuzzy.inc"
-#    .include(try=true; priority=10) "$LOCAL_CONFDIR/override.d/worker-fuzzy.inc"
-#}
+worker "fuzzy" {
+    bind_socket = "localhost:11335";
+    count = -1;
+    .include "$CONFDIR/worker-fuzzy.inc"
+    .include(try=true; priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/worker-fuzzy.inc"
+    .include(try=true; priority=10) "$LOCAL_CONFDIR/override.d/worker-fuzzy.inc"
+}