diff options
author | Andrew Lewis <nerf@judo.za.org> | 2017-06-11 19:48:57 +0200 |
---|---|---|
committer | Andrew Lewis <nerf@judo.za.org> | 2017-06-11 19:48:57 +0200 |
commit | 17a6ce2ae11994e60f88e934edf2f62ce799089c (patch) | |
tree | 9e4ab92d23b5d0936dcd178fed2408f1468917d2 /conf | |
parent | fdf0cf9941ced79fb57bc1f7cb334cca7204b37d (diff) | |
download | rspamd-17a6ce2ae11994e60f88e934edf2f62ce799089c.tar.gz rspamd-17a6ce2ae11994e60f88e934edf2f62ce799089c.zip |
[Conf] Do away with systemd specifics completely
Diffstat (limited to 'conf')
-rw-r--r-- | conf/rspamd.conf (renamed from conf/rspamd.sysvinit.conf) | 0 | ||||
-rw-r--r-- | conf/rspamd.systemd.conf | 53 |
2 files changed, 0 insertions, 53 deletions
diff --git a/conf/rspamd.sysvinit.conf b/conf/rspamd.conf index c8d308658..c8d308658 100644 --- a/conf/rspamd.sysvinit.conf +++ b/conf/rspamd.conf diff --git a/conf/rspamd.systemd.conf b/conf/rspamd.systemd.conf deleted file mode 100644 index dd9bbcb7c..000000000 --- a/conf/rspamd.systemd.conf +++ /dev/null @@ -1,53 +0,0 @@ -# Systemd enabled top level configuration file - -# Please don't modify this file as your changes might be overwritten with -# the next update. -# -# You can modify '$LOCAL_CONFDIR/rspamd.conf.local.override' to redefine -# parameters defined on the top level -# -# You can modify '$LOCAL_CONFDIR/rspamd.conf.local' to add -# parameters defined on the top level -# -# For specific modules or configuration you can also modify -# '$LOCAL_CONFDIR/local.d/file.conf' - to add your options or rewrite defaults -# '$LOCAL_CONFDIR/override.d/file.conf' - to override the defaults -# -# See https://rspamd.com/doc/tutorials/writing_rules.html for details - -.include "$CONFDIR/common.conf" - -options { - .include "$CONFDIR/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" -} - -logging { - type = "console"; - systemd = true; - .include "$CONFDIR/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 "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 "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 |