Browse Source

[Conf] Add rspamd_proxy to the default configuration set

tags/1.6.0
Vsevolod Stakhov 7 years ago
parent
commit
9a5bc94e55
3 changed files with 29 additions and 2 deletions
  1. 9
    2
      conf/rspamd.systemd.conf
  2. 7
    0
      conf/rspamd.sysvinit.conf
  3. 13
    0
      conf/worker-proxy.inc

+ 9
- 2
conf/rspamd.systemd.conf View File

@@ -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"
}

+ 7
- 0
conf/rspamd.sysvinit.conf View File

@@ -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 {

+ 13
- 0
conf/worker-proxy.inc View File

@@ -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

Loading…
Cancel
Save