[Feature] Rework includes and configuration system

1 files changed, 22 insertions, 20 deletions

diff --git a/conf/statistic.conf b/conf/statistic.conf
index bd7f19698..12abd89b0 100644
--- a/conf/statistic.conf
+++ b/conf/statistic.conf
@@ -5,24 +5,26 @@
 # http://rspamd.com/rspamd_statistics/bayes.ham.sqlite
 
 classifier {
-	type = "bayes";
-	tokenizer {
-		name = "osb";
-	}
-	cache {
-		path = "${DBDIR}/learn_cache.sqlite";
-	}
-	min_tokens = 11;
-	backend = "sqlite3";
-	languages_enabled = true;
-	statfile {
-		symbol = "BAYES_HAM";
-		path = "${DBDIR}/bayes.ham.sqlite";
-		spam = false;
-	}
-	statfile {
-		symbol = "BAYES_SPAM";
-		path = "${DBDIR}/bayes.spam.sqlite";
-		spam = true;
-	}
+    type = "bayes";
+    tokenizer {
+        name = "osb";
+    }
+    cache {
+        path = "${DBDIR}/learn_cache.sqlite";
+    }
+    min_tokens = 11;
+    backend = "sqlite3";
+    languages_enabled = true;
+    statfile {
+        symbol = "BAYES_HAM";
+        path = "${DBDIR}/bayes.ham.sqlite";
+        spam = false;
+    }
+    statfile {
+        symbol = "BAYES_SPAM";
+        path = "${DBDIR}/bayes.spam.sqlite";
+        spam = true;
+    }
+    .include(try=true; priority=1) "$CONFDIR/local.d/statistic.conf"
+    .include(try=true; priority=10) "$CONFDIR/override.d/statistic.conf"
 }