From 8dc2d35b36b367902dd08f23762c14d86f4d0fd8 Mon Sep 17 00:00:00 2001
From: Michael <m.muenz@gmail.com>
Date: Fri, 29 Nov 2019 18:54:07 +0100
Subject: [PATCH] mail/rspamd: add history rows (#1587)

---
 mail/rspamd/Makefile                                     | 2 +-
 mail/rspamd/pkg-descr                                    | 4 ++++
 .../app/controllers/OPNsense/Rspamd/forms/settings.xml   | 7 +++++++
 .../opnsense/mvc/app/models/OPNsense/Rspamd/RSpamd.xml   | 9 ++++++++-
 .../opnsense/service/templates/OPNsense/Rspamd/+TARGETS  | 1 +
 .../service/templates/OPNsense/Rspamd/history_redis.conf | 6 ++++++
 6 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 mail/rspamd/src/opnsense/service/templates/OPNsense/Rspamd/history_redis.conf

diff --git a/mail/rspamd/Makefile b/mail/rspamd/Makefile
index f627723ab..fef81f2f2 100644
--- a/mail/rspamd/Makefile
+++ b/mail/rspamd/Makefile
@@ -1,5 +1,5 @@
 PLUGIN_NAME=		rspamd
-PLUGIN_VERSION=		1.8
+PLUGIN_VERSION=		1.9
 PLUGIN_COMMENT=		Protect your network from spam
 PLUGIN_DEPENDS=		rspamd
 PLUGIN_MAINTAINER=	franz.fabian.94@gmail.com
diff --git a/mail/rspamd/pkg-descr b/mail/rspamd/pkg-descr
index b64b6b698..32b7704d3 100644
--- a/mail/rspamd/pkg-descr
+++ b/mail/rspamd/pkg-descr
@@ -5,6 +5,10 @@ lua.
 Plugin Changelog
 ----------------
 
+1.9
+
+* Add History Rows field
+
 1.8
 
 * Add Bayes autolearn option
diff --git a/mail/rspamd/src/opnsense/mvc/app/controllers/OPNsense/Rspamd/forms/settings.xml b/mail/rspamd/src/opnsense/mvc/app/controllers/OPNsense/Rspamd/forms/settings.xml
index 57b906f9f..b027f57b4 100644
--- a/mail/rspamd/src/opnsense/mvc/app/controllers/OPNsense/Rspamd/forms/settings.xml
+++ b/mail/rspamd/src/opnsense/mvc/app/controllers/OPNsense/Rspamd/forms/settings.xml
@@ -55,6 +55,13 @@
                 <advanced>true</advanced>
                 <help>Enter a prefix added to the subject when Subject Score is reached.</help>
             </field>
+            <field>
+                <id>rspamd.general.historyrows</id>
+                <label>History Rows</label>
+                <type>text</type>
+                <advanced>true</advanced>
+                <help>Set the number of rows to be displayed in rspamd UI.</help>
+            </field>
         </subtab>
         <subtab id="rspamd-general-multimap" description="Multimap Settings">
             <field>
diff --git a/mail/rspamd/src/opnsense/mvc/app/models/OPNsense/Rspamd/RSpamd.xml b/mail/rspamd/src/opnsense/mvc/app/models/OPNsense/Rspamd/RSpamd.xml
index c986c74a5..483d55d6e 100644
--- a/mail/rspamd/src/opnsense/mvc/app/models/OPNsense/Rspamd/RSpamd.xml
+++ b/mail/rspamd/src/opnsense/mvc/app/models/OPNsense/Rspamd/RSpamd.xml
@@ -1,7 +1,7 @@
 <model>
   <mount>//OPNsense/Rspamd</mount>
   <description>rspamd anti spam filter</description>
-  <version>1.0.0</version>
+  <version>1.0.1</version>
   <items>
     <general>
       <enabled type="BooleanField">
@@ -119,6 +119,13 @@
       <rewritesubject type="TextField">
         <Required>N</Required>
       </rewritesubject>
+      <historyrows type="IntegerField">
+        <default>200</default>
+        <Required>Y</Required>
+        <MinimumValue>1</MinimumValue>
+        <MaximumValue>100000</MaximumValue>
+        <ValidationMessage>Choose a value between 1 and 100000.</ValidationMessage>
+      </historyrows>
     </general>
 
     <milter_headers>
diff --git a/mail/rspamd/src/opnsense/service/templates/OPNsense/Rspamd/+TARGETS b/mail/rspamd/src/opnsense/service/templates/OPNsense/Rspamd/+TARGETS
index 3569838ba..f4db33f7b 100644
--- a/mail/rspamd/src/opnsense/service/templates/OPNsense/Rspamd/+TARGETS
+++ b/mail/rspamd/src/opnsense/service/templates/OPNsense/Rspamd/+TARGETS
@@ -20,3 +20,4 @@ ratelimit.conf:/usr/local/etc/rspamd/local.d/ratelimit.conf
 redis.conf:/usr/local/etc/rspamd/local.d/redis.conf
 spamtrap-map:/usr/local/etc/rspamd/maps.d/spamtrap.map
 classifier-bayes.conf:/usr/local/etc/rspamd/local.d/classifier-bayes.conf
+history_redis.conf:/usr/local/etc/rspamd/local.d/history_redis.conf
diff --git a/mail/rspamd/src/opnsense/service/templates/OPNsense/Rspamd/history_redis.conf b/mail/rspamd/src/opnsense/service/templates/OPNsense/Rspamd/history_redis.conf
new file mode 100644
index 000000000..267b6c5cc
--- /dev/null
+++ b/mail/rspamd/src/opnsense/service/templates/OPNsense/Rspamd/history_redis.conf
@@ -0,0 +1,6 @@
+# Please don't modify this file as your changes might be overwritten with
+# the next update.
+#
+{% if helpers.exists('OPNsense.Rspamd.general.enabled') and OPNsense.Rspamd.general.enabled == '1' %}
+  nrows = {{ OPNsense.Rspamd.general.historyrows }};
+{% endif %}