testing/rspamd: upgrade to 1.2.0

4 files changed, 22 insertions, 13 deletions

diff --git a/testing/rspamd/APKBUILD b/testing/rspamd/APKBUILD
index ff411af6fe..e61f2be0ba 100644
--- a/testing/rspamd/APKBUILD
+++ b/testing/rspamd/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Valery Kartel <valery.kartel@gmail.com>
 # Contributor: Valery Kartel <valery.kartel@gmail.com>
 pkgname=rspamd
-pkgver=1.1.4
+pkgver=1.2.0
 pkgrel=0
 pkgdesc="Rapid spam filtering system"
 url="https://rspamd.com"
@@ -48,6 +48,7 @@ package() {
 	sed -i -E 's~DBDIR(/rspamd.sock)~RUNDIR\1~' "$pkgdir"/etc/$pkgname/options.inc
 	install -Dm644 "$srcdir"/$pkgname.conf "$pkgdir"/etc/$pkgname/$pkgname.conf
 	install -Dm644 "$srcdir"/$pkgname.worker_normal "$pkgdir"/etc/$pkgname/worker.d/normal.conf
+	mkdir -p "$pkgdir"/etc/$pkgname/local.d "$pkgdir"/etc/$pkgname/override.d
 
 	install -Dm644 "$srcdir"/$pkgname.logrotated "$pkgdir"/etc/logrotate.d/$pkgname
 	install -Dm755 "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
@@ -82,24 +83,24 @@ client() {
 	mv "$pkgdir"/usr/bin/rspamc-$pkgver "$subpkgdir"/usr/bin/rspamc
 }
 
-md5sums="36513d4435ef32a1aedd3f2469a3680c  rspamd-1.1.4.tar.xz
+md5sums="221e8079ae88fe48479fc87f0aca99ad  rspamd-1.2.0.tar.xz
 c152c6a90f6ae9e5a7a1d137dfbc0305  rspamd.logrotated
 3f32a16e76e1461ffba9231cfb1e3d17  rspamd.initd
 ecfea2a25b95727ae91c04001fbd3e46  rspamd.confd
-a5f0967b3d9aa319909af7e1bfe998e1  rspamd.conf
-74e334227e9244c419abd605787c090e  rspamd.worker_normal
-03bd84228945261e2242564f9bf5f1ca  rspamd.worker_controller"
-sha256sums="7186d0448aaddc1e347af580e7ec14e34ff38859db99bf2173139a6bbc18821d  rspamd-1.1.4.tar.xz
+0ba1c9aea1820de74d831fd531cce51a  rspamd.conf
+560b2d4746510fe9a7a2fb1c09181c38  rspamd.worker_normal
+15a9f5dde0076eaab4565549b05b991c  rspamd.worker_controller"
+sha256sums="1a287608787bfdd59137ae511bafeaca3c4d2faf23aa1c628bdf84d7da6d8505  rspamd-1.2.0.tar.xz
 6c5e79e9052d957f3d0d634b2ae7a56bbc0901a5d6946dc991c92f19a72fce97  rspamd.logrotated
 6b531f95724b2a3990524ab09b7304ce4e811b6e082dfdbe633f201a6bc7eee3  rspamd.initd
 82be6a663af2e2333b0dfbbbfd05a9ff3d02e05c7e506235b1b0dbd9d0b72972  rspamd.confd
-5a223efb12e962e0f3bfe9f6d08336c6074b0b2930b8da6a22fe6582142ee40c  rspamd.conf
-7805103a2e11cf816e99dba7d67fdc584ece33d9ea3ef95f95f4fce91a34eb90  rspamd.worker_normal
-f50663096866b35095f7a6754e3cfb0bab518645d61646703715cf43da5adf77  rspamd.worker_controller"
-sha512sums="de4afb82beba9d8d28a6cf6d7eb222806671fcca51114b9668fe0484c5a2b0680763d3fe6095cb7d4b301991a5f17effef6cfbf70d6d98c8e79476bbdb8b6ee3  rspamd-1.1.4.tar.xz
+8b51fbd06a46adceb8cc4b0dc06e7b98d263336acbff913c34ff8e451173aa23  rspamd.conf
+ccb271cc6b1ff69add9d6e00edcb14e1c1ae664ee6ecf28304647f6cb32240c9  rspamd.worker_normal
+91848312e707032bb159f042da04b4a15efd43f69a17225481962cb07751e90a  rspamd.worker_controller"
+sha512sums="0c0b1c5151ee3633e40b5730a303658263b9e0d174614e92af1dedef7352f71daa524f8d9df04fc6b21d0a73bceeba18a930a6483d4fac0ef412686c36ce1b79  rspamd-1.2.0.tar.xz
 2efe28575c40d1fba84b189bb872860e744400db80dce2f6330be6c6287fb3f46e6511284729b957488bf40bcb9b0952e26df9934f5f138334bd2766075c45cb  rspamd.logrotated
 30b45812ef68f2b82d0d7f370b44bec52691296c7349c96c8273342eb4f9b5708c13ad97b13f63d81bee588b4e459c0da3092a62adff9e5b8938f44546df3dcd  rspamd.initd
 0b73b159cec9a4a1d337fbb429814f78da23b55f72c9fb8a777ab5f06634206a4f9b25e587f8dbfa7c3242ac5501ebcc90b9a0e926adfd37e14a12ac4607fa62  rspamd.confd
-90885bd8f9fcd47590eedf8f1f058df7c492005fc09058e99ee490e1730f4961909850ecf9e98723bfbd3cbe8df705f86a0de931dedb25bc66b246674f537a72  rspamd.conf
-ddf1af03878ed2f4b1e735ecd9f931f1941adf7b2085aa7a40f3ef303fa5c59791d0d7462064c2ac652af2722b83acd4379f549d341cb62767e74edefb69ba9a  rspamd.worker_normal
-932486ee517ca55534e93eb634badd9082a3952e25a66f98468c7b9c29ce4a26a5a96f465ee347dfd5443d330b1dd11b72680bc6ac04c2ebe45412f4432e8f62  rspamd.worker_controller"
+856000ab9b76dd7acff95ab9a55a0eddfc66486a439fcba7fbb36ecdeaa9740f29301cf7248c982e2d5b745b1bad521abb0f4d5e240d442440a36103d3ee634d  rspamd.conf
+e669882c35891eee37c4121ea065e72545c618ac5e16044ccd19db4cdb14bed271fa87dc261e43e587a08ea6149e13952626c8cea8a797a59b649203c2ac4731  rspamd.worker_normal
+e830ccd5d7999e8cf8d0a82baba1ca80c8b8eb3a7f710c8c067af937258fff49f010cead46619adebc1d481d1131c9e0146fa654a4f4c28749437e5b2c49e755  rspamd.worker_controller"
diff --git a/testing/rspamd/rspamd.conf b/testing/rspamd/rspamd.conf
index 93c025c849..fe737f981d 100644
--- a/testing/rspamd/rspamd.conf
+++ b/testing/rspamd/rspamd.conf
@@ -3,12 +3,16 @@
 options {
     pidfile = "$RUNDIR/rspamd.pid";
     .include "$CONFDIR/options.inc"
+    .include(try=true; priority=1) "$LOCAL_CONFDIR/local.d/options.inc"
+    .include(try=true; priority=10) "$LOCAL_CONFDIR/override.d/options.inc"
 }
 
 logging {
     type = "file";
     filename = "$LOGDIR/rspamd.log";
     .include "$CONFDIR/logging.inc"
+    .include(try=true; priority=1) "$LOCAL_CONFDIR/local.d/logging.inc"
+    .include(try=true; priority=10) "$LOCAL_CONFDIR/override.d/logging.inc"
 }
 
 .include(glob=true) "$CONFDIR/worker.d/*.conf"
diff --git a/testing/rspamd/rspamd.worker_controller b/testing/rspamd/rspamd.worker_controller
index 0ce0a75187..77464c117b 100644
--- a/testing/rspamd/rspamd.worker_controller
+++ b/testing/rspamd/rspamd.worker_controller
@@ -6,4 +6,6 @@ worker {
     secure_ip = "127.0.0.1";
     secure_ip = "::1";
     static_dir = "${WWWDIR}";
+    .include(try=true; priority=1) "$LOCAL_CONFDIR/local.d/worker-controller.inc"
+    .include(try=true; priority=10) "$LOCAL_CONFDIR/override.d/worker-controller.inc"
 }
diff --git a/testing/rspamd/rspamd.worker_normal b/testing/rspamd/rspamd.worker_normal
index 72c86c06a1..6fbee1d97b 100644
--- a/testing/rspamd/rspamd.worker_normal
+++ b/testing/rspamd/rspamd.worker_normal
@@ -3,4 +3,6 @@ worker {
     type = "normal";
     mime = true;
     task_timeout = 8s;
+    .include(try=true; priority=1) "$LOCAL_CONFDIR/local.d/worker-normal.inc"
+    .include(try=true; priority=10) "$LOCAL_CONFDIR/override.d/worker-normal.inc"
 }