1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
|
--- a/conf/rspamd.sysvinit.conf
+++ b/conf/rspamd.sysvinit.conf
@@ -32,25 +32,4 @@
.include(try=true; priority=10) "$LOCAL_CONFDIR/override.d/logging.inc"
}
-worker {
- bind_socket = "*: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 {
- bind_socket = "localhost:11334";
- .include "$CONFDIR/worker-controller.inc"
- .include(try=true; priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/worker-controller.inc"
- .include(try=true; priority=10) "$LOCAL_CONFDIR/override.d/worker-controller.inc"
-}
-
-# 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"
-#}
+.include(glob=true) "$CONFDIR/worker-*.conf"
--- /dev/null
+++ b/conf/worker-controller.conf
@@ -0,0 +1,6 @@
+worker {
+ bind_socket = "localhost:11334";
+ .include "$CONFDIR/worker-controller.inc"
+ .include(try=true; priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/worker-controller.inc"
+ .include(try=true; priority=10) "$LOCAL_CONFDIR/override.d/worker-controller.inc"
+}
--- /dev/null
+++ b/conf/worker-fuzzy.conf
@@ -0,0 +1,6 @@
+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"
+}
--- /dev/null
+++ b/conf/worker-normal.conf
@@ -0,0 +1,6 @@
+worker {
+ bind_socket = "*: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"
+}
|
