diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2018-12-26 13:37:05 +0000 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2018-12-26 15:00:02 +0000 |
| commit | 36e960ed741e3b908469e194c8cff1d3dc666220 (patch) | |
| tree | 4c8c85f8de227fce52abb5198a68b72930559891 /conf | |
| parent | 263ae1f2809372170751719c5288fffae6993375 (diff) | |
| download | rspamd-36e960ed741e3b908469e194c8cff1d3dc666220.tar.gz rspamd-36e960ed741e3b908469e194c8cff1d3dc666220.zip | |
[Rework] Slashing: Distinguish lualibdir, pluginsdir and sharedir
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/common.conf | 3 | ||||
| -rw-r--r-- | conf/modules.d/elastic.conf | 4 | ||||
| -rw-r--r-- | conf/options.inc | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/conf/common.conf b/conf/common.conf index 549af73a0..6a537b3e5 100644 --- a/conf/common.conf +++ b/conf/common.conf @@ -34,5 +34,6 @@ lua = "$RULESDIR/rspamd.lua" .include(try=true,priority=10) "$LOCAL_CONFDIR/rspamd.conf.override" modules { - path = "$PLUGINSDIR/lua/" + path = "${PLUGINSDIR}"; + path = "${SHAREDIR}/lua"; # Legacy path } diff --git a/conf/modules.d/elastic.conf b/conf/modules.d/elastic.conf index 1753a54b9..665604278 100644 --- a/conf/modules.d/elastic.conf +++ b/conf/modules.d/elastic.conf @@ -6,9 +6,9 @@ elastic { # Timeout to wait for response (5 seconds if unset) timeout = 5; # Elasticsearch template file (json format) - #template_file = "${PLUGINSDIR}/elastic/rspamd_template.json"; + #template_file = "${SHAREDIR}/elastic/rspamd_template.json"; # Kibana prebuild visualizations and dashboard template (json format) - #kibana_file = "${PLUGINSDIR}/elastic/kibana.json"; + #kibana_file = "${SHAREDIR}/elastic/kibana.json"; # Elasticsearch index name pattern index_pattern = "rspamd-%Y.%m.%d"; # Dump debug information diff --git a/conf/options.inc b/conf/options.inc index f8abaa875..51fd7b2dc 100644 --- a/conf/options.inc +++ b/conf/options.inc @@ -17,7 +17,7 @@ dns { retransmits = 5; } tempdir = "/tmp"; -url_tld = "${PLUGINSDIR}/effective_tld_names.dat"; +url_tld = "${SHAREDIR}/effective_tld_names.dat"; classify_headers = [ "User-Agent", "X-Mailer", |