aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVsevolod Stakhov <vsevolod@highsecure.ru>2014-02-01 07:07:18 -0800
committerVsevolod Stakhov <vsevolod@highsecure.ru>2014-02-01 07:07:18 -0800
commitecc513e64ef9bd992162b7ce375799427a570c29 (patch)
treed424cf15a59d6bd5da49047da10f5a4443d0bbb8
parent30879cec311b7b0b0a60da7b7c5554d7c9f146bb (diff)
parenta0fd753345b527bf29f0dc4e584df04eb7de69ba (diff)
downloadrspamd-ecc513e64ef9bd992162b7ce375799427a570c29.tar.gz
rspamd-ecc513e64ef9bd992162b7ce375799427a570c29.zip
Merge pull request #36 from andrejzverev/master
Allow override system predefined settings without touching .conf files from distribution.
-rw-r--r--conf/rspamd.conf3
1 files changed, 3 insertions, 0 deletions
diff --git a/conf/rspamd.conf b/conf/rspamd.conf
index 0ee49e553..6345fb6f8 100644
--- a/conf/rspamd.conf
+++ b/conf/rspamd.conf
@@ -12,6 +12,9 @@ lua = "$CONFDIR/lua/rspamd.lua"
.include "$CONFDIR/modules.conf"
+# User local settings
+.try_include "$CONFDIR/rspamd.conf.local
+
modules {
path = "$PLUGINSDIR/lua/"
}