From 9078aea5150bf04f81622fdb1ec68f31b5071809 Mon Sep 17 00:00:00 2001
From: Michael <m.muenz@gmail.com>
Date: Thu, 10 Sep 2020 15:46:28 +0200
Subject: [PATCH] mail/rspamd: add option to set a nameserver (#2025)

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

diff --git a/mail/rspamd/Makefile b/mail/rspamd/Makefile
index fef81f2f2..f19a4a45e 100644
--- a/mail/rspamd/Makefile
+++ b/mail/rspamd/Makefile
@@ -1,5 +1,5 @@
 PLUGIN_NAME=		rspamd
-PLUGIN_VERSION=		1.9
+PLUGIN_VERSION=		1.10
 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 32b7704d3..c2118b525 100644
--- a/mail/rspamd/pkg-descr
+++ b/mail/rspamd/pkg-descr
@@ -5,6 +5,10 @@ lua.
 Plugin Changelog
 ----------------
 
+1.10
+
+* Add nameserver option
+
 1.9
 
 * Add History Rows field
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 b027f57b4..b37c8b780 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
@@ -62,6 +62,15 @@
                 <advanced>true</advanced>
                 <help>Set the number of rows to be displayed in rspamd UI.</help>
             </field>
+            <field>
+                <id>rspamd.general.nameserver</id>
+                <label>Nameserver</label>
+                <type>select_multiple</type>
+                <style>tokenize</style>
+                <allownew>true</allownew>
+                <advanced>true</advanced>
+                <help>Set the nameservers for resolving DNS requests.</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 483d55d6e..fccb94dfc 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.1</version>
+  <version>1.0.2</version>
   <items>
     <general>
       <enabled type="BooleanField">
@@ -126,6 +126,12 @@
         <MaximumValue>100000</MaximumValue>
         <ValidationMessage>Choose a value between 1 and 100000.</ValidationMessage>
       </historyrows>
+      <nameserver type="HostnameField">
+        <default>127.0.0.1</default>
+        <Required>Y</Required>
+        <FieldSeparator>,</FieldSeparator>
+        <asList>Y</asList>
+      </nameserver>
     </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 f4db33f7b..ec5b4811a 100644
--- a/mail/rspamd/src/opnsense/service/templates/OPNsense/Rspamd/+TARGETS
+++ b/mail/rspamd/src/opnsense/service/templates/OPNsense/Rspamd/+TARGETS
@@ -21,3 +21,4 @@ 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
+options.inc:/usr/local/etc/rspamd/local.d/options.inc
diff --git a/mail/rspamd/src/opnsense/service/templates/OPNsense/Rspamd/options.inc b/mail/rspamd/src/opnsense/service/templates/OPNsense/Rspamd/options.inc
new file mode 100644
index 000000000..eec227c1b
--- /dev/null
+++ b/mail/rspamd/src/opnsense/service/templates/OPNsense/Rspamd/options.inc
@@ -0,0 +1,7 @@
+# Please don't modify this file as your changes might be overwritten with
+# the next update.
+#
+
+dns {
+         nameserver = [{{ "'" + ("','".join(OPNsense.Rspamd.general.nameserver.split(','))) + "'" }}];
+}