Install the proper rspamd modules on top of Alpine

2017-11-10 14:48:13 +01:00
parent ac0c339aa8
commit 3675fdb915
12 changed files with 24 additions and 22 deletions
--- a/services/rspamd/conf/local.d/antivirus.conf
+++ b/services/rspamd/conf/local.d/antivirus.conf
--- a/services/rspamd/conf/local.d/dkim_signing.conf
+++ b/services/rspamd/conf/local.d/dkim_signing.conf
--- a/services/rspamd/conf/local.d/logging.inc
+++ b/services/rspamd/conf/local.d/logging.inc
--- a/services/rspamd/conf/local.d/milter_headers.conf
+++ b/services/rspamd/conf/local.d/milter_headers.conf
--- a/services/rspamd/conf/local.d/redis.conf
+++ b/services/rspamd/conf/local.d/redis.conf
--- a/services/rspamd/conf/worker-controller.conf
+++ b/services/rspamd/conf/worker-controller.conf
@@ -1,11 +0,0 @@
-worker {
-    bind_socket = "*:11334";
-    type = "controller";
-    count = 1;
-    password = "mailu";
-    secure_ip = "127.0.0.1";
-    secure_ip = "::1";
-    static_dir = "${WWWDIR}";
-    .include(try=true; priority=1) "$LOCAL_CONFDIR/local.d/worker-controller.inc"
-    .include(try=true; priority=10) "$LOCAL_CONFDIR/override.d/worker-controller.inc"
-}
--- a/services/rspamd/conf/worker-controller.inc
+++ b/services/rspamd/conf/worker-controller.inc
@@ -0,0 +1,3 @@
+bind_socket = "*:11334";
+password = "mailu";
+secure_ip = "{{ FRONT_ADDRESS }}";
--- a/services/rspamd/conf/local.d/worker-normal.inc
+++ b/services/rspamd/conf/local.d/worker-normal.inc
--- a/services/rspamd/conf/worker-proxy.conf
+++ b/services/rspamd/conf/worker-proxy.conf
@@ -1,5 +0,0 @@
-worker "rspamd_proxy" {
-    bind_socket = "*:11332";
-    .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"
-}
--- a/services/rspamd/conf/local.d/worker-proxy.inc
+++ b/services/rspamd/conf/local.d/worker-proxy.inc
@@ -1,7 +1,4 @@
 bind_socket = "*:11332";
-type = "proxy";
-milter = yes;
-timeout = 120s;
 upstream "local" {
  default = yes;
  self_scan = yes;