[Conf] Add rspamd_proxy to the default configuration set

diff --git a/conf/rspamd.systemd.conf b/conf/rspamd.systemd.conf
index 92e56180eb6bbaddd7f44604a3af60b6c82155c3..dd9bbcb7c645c0e4ff152246904072db5f84882e 100644 (file)
--- a/conf/rspamd.systemd.conf
+++ b/conf/rspamd.systemd.conf
@@ -31,16 +31,23 @@ logging {
     .include(try=true; priority=10) "$LOCAL_CONFDIR/override.d/logging.inc"
 }
 
-worker {
+worker "normal" {
     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 {
+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"
     .include(try=true; priority=10) "$LOCAL_CONFDIR/override.d/worker-controller.inc"
 }
+
+worker "rspamd_proxy" {
+    bind_socket = "*: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"
+}
\ No newline at end of file

diff --git a/conf/rspamd.sysvinit.conf b/conf/rspamd.sysvinit.conf
index 41fb0fbed836a48b1fa23969cc5a23bc2f2b7b0d..c8d3086581c14d8898c099393b4cf048fe57d22b 100644 (file)
--- a/conf/rspamd.sysvinit.conf
+++ b/conf/rspamd.sysvinit.conf
@@ -46,6 +46,13 @@ worker {
     .include(try=true; priority=10) "$LOCAL_CONFDIR/override.d/worker-controller.inc"
 }
 
+worker "rspamd_proxy" {
+    bind_socket = "*: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"
+}
+
 # Local fuzzy storage is disabled by default
 
 #worker {

diff --git a/conf/worker-proxy.inc b/conf/worker-proxy.inc
new file mode 100644 (file)
index 0000000..1047fd8
--- /dev/null
+++ b/conf/worker-proxy.inc
@@ -0,0 +1,13 @@
+# Included from top-level .conf file
+
+type = "proxy";
+
+milter = yes; # Enable milter mode
+timeout = 120s; # Needed for Milter usually
+
+upstream "local" {
+  default = yes;
+  hosts = "localhost";
+}
+
+count = 1; # Do not spawn too many processes of this type