diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2016-07-26 19:01:30 +0100 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2016-07-26 19:02:19 +0100 |
| commit | 6c28bbc16ba4b122f5ed16f748883818e32a410b (patch) | |
| tree | 4d6b36c35f1c51a2f394aab448855082b2bea730 /conf/rspamd.systemd.conf | |
| parent | f28ccc4b9f10c82ed37de97a2b8bef6b997f3f65 (diff) | |
| download | rspamd-6c28bbc16ba4b122f5ed16f748883818e32a410b.tar.gz rspamd-6c28bbc16ba4b122f5ed16f748883818e32a410b.zip | |
[Fix] Really fix local.d includes
Diffstat (limited to 'conf/rspamd.systemd.conf')
| -rw-r--r-- | conf/rspamd.systemd.conf | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/conf/rspamd.systemd.conf b/conf/rspamd.systemd.conf index 6ab25f6a4..8fed5108b 100644 --- a/conf/rspamd.systemd.conf +++ b/conf/rspamd.systemd.conf @@ -19,7 +19,7 @@ options { .include "$CONFDIR/options.inc" - .include(try=true; priority=1) "$LOCAL_CONFDIR/local.d/options.inc" + .include(try=true; priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/options.inc" .include(try=true; priority=10) "$LOCAL_CONFDIR/override.d/options.inc" } @@ -27,20 +27,20 @@ logging { type = "console"; systemd = true; .include "$CONFDIR/logging.inc" - .include(try=true; priority=1) "$LOCAL_CONFDIR/local.d/logging.inc" + .include(try=true; priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/logging.inc" .include(try=true; priority=10) "$LOCAL_CONFDIR/override.d/logging.inc" } worker { bind_socket = "systemd:0"; .include "$CONFDIR/worker-normal.inc" - .include(try=true; priority=1) "$LOCAL_CONFDIR/local.d/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 = "systemd:1"; .include "$CONFDIR/worker-controller.inc" - .include(try=true; priority=1) "$LOCAL_CONFDIR/local.d/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" } |