diff options
| author | Mikhail Gusarov <dottedmag@debian.org> | 2015-03-06 23:09:04 +0000 |
|---|---|---|
| committer | Andrew Lewis <nerf@judo.za.org> | 2015-03-17 18:55:45 +0200 |
| commit | cd1028e0bddf5f172dc8990c485d8b5fd3eda0b5 (patch) | |
| tree | 0722d99cd652688404f8f3519474e7f3c5bea8ff /conf/rspamd.conf | |
| parent | c74e0eb6e70a2832403f3f4e5f4c4a7b6cbb762e (diff) | |
| download | rspamd-cd1028e0bddf5f172dc8990c485d8b5fd3eda0b5.tar.gz rspamd-cd1028e0bddf5f172dc8990c485d8b5fd3eda0b5.zip | |
Reorganize configuration files for systemd
Common systemd/non-systemd options were moved to .inc
files. rspamd.conf is systemd-enabled one,
rspamd.sysvinit.conf is sysvinit-compatible one.
Diffstat (limited to 'conf/rspamd.conf')
| -rw-r--r-- | conf/rspamd.conf | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/conf/rspamd.conf b/conf/rspamd.conf index 3330f01d9..06dbe8599 100644 --- a/conf/rspamd.conf +++ b/conf/rspamd.conf @@ -1,20 +1,20 @@ -# A common rspamd configuration file +.include "$CONFDIR/common.conf" -lua = "$CONFDIR/lua/rspamd.lua" - -.include "$CONFDIR/options.conf" -.include "$CONFDIR/logging.conf" -.include "$CONFDIR/metrics.conf" -.include "$CONFDIR/workers.conf" -.include "$CONFDIR/composites.conf" - -.include "$CONFDIR/statistic.conf" +options { + .include "$CONFDIR/options.inc" +} -.include "$CONFDIR/modules.conf" +logging { + type = "console"; + .include "$CONFDIR/logging.inc" +} -# User local settings -.try_include "$CONFDIR/rspamd.conf.local" +worker { + bind_socket = "systemd:0"; + .include "$CONFDIR/worker-normal.inc" +} -modules { - path = "$PLUGINSDIR/lua/" +worker { + bind_socket = "systemd:1"; + .include "$CONFDIR/worker-controller.inc" } |