From 3da1edcd511003220824f72620d57a5c3b3aca41 Mon Sep 17 00:00:00 2001
From: Marvo2011 <Marvin.Edeler@gmail.com>
Date: Mon, 12 Sep 2022 09:28:08 +0200
Subject: [PATCH 1/3] Replace rid, rid2 with selfhost_map

Replace rid, rid2 with selfhost_map, required for the actual acme.sh master.
---
 .../OPNsense/AcmeClient/forms/dialogValidation.xml | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/forms/dialogValidation.xml b/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/forms/dialogValidation.xml
index f7c912ed1..890240560 100644
--- a/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/forms/dialogValidation.xml
+++ b/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/forms/dialogValidation.xml
@@ -1065,16 +1065,10 @@
         <type>password</type>
     </field>
     <field>
-        <id>validation.dns_selfhost_rid</id>
-        <label>rid</label>
-        <type>text</type>
-        <help>Please create the TXT Record with Subdomain _acme-challenge first, than you can get the ID from the edit page.</help>
-    </field>
-    <field>
-        <id>validation.dns_selfhost_rid2</id>
-        <label>rid2</label>
-        <type>text</type>
-        <help>Please create a second TXT Record with Subdomain _acme-challenge (needed to support ACME v2).</help>
+        <id>validation.dns_selfhost_map</id>
+        <label>RID Mapping</label>
+        <type>textbox</type>
+        <help>Please create the TXT Record with Subdomain _acme-challenge first, than you can get the ID from the edit page. Up to two RIDs per fulldomain are supported but at least one must be set, e.g. _acme-challenge.domain.net:RID:RI>
     </field>
     <field>
         <label>Servercow</label>

From 89e3cfc88844ed1b73991e27e361abc743282f43 Mon Sep 17 00:00:00 2001
From: Marvo2011 <Marvin.Edeler@gmail.com>
Date: Mon, 12 Sep 2022 09:30:10 +0200
Subject: [PATCH 2/3] Replace rid, rid2 with SELFHOSTDNS_MAP export

Replace rid, rid2 with SELFHOSTDNS_MAP export, required for the actual acme.sh master.
---
 .../library/OPNsense/AcmeClient/LeValidation/DnsSelfhost.php   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/DnsSelfhost.php b/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/DnsSelfhost.php
index f487e9a01..881ebf792 100644
--- a/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/DnsSelfhost.php
+++ b/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidation/DnsSelfhost.php
@@ -41,7 +41,6 @@ class DnsSelfhost extends Base implements LeValidationInterface
     {
         $this->acme_env['SELFHOSTDNS_USERNAME'] = (string)$this->config->dns_selfhost_user;
         $this->acme_env['SELFHOSTDNS_PASSWORD'] = (string)$this->config->dns_selfhost_password;
-        $this->acme_env['SELFHOSTDNS_RID'] = (string)$this->config->dns_selfhost_rid;
-        $this->acme_env['SELFHOSTDNS_RID2'] = (string)$this->config->dns_selfhost_rid2;
+        $this->acme_env['SELFHOSTDNS_MAP'] = (string)$this->config->dns_selfhost_map;
     }
 }

From 6f1eb3785dc0d4801730d15f478105a21e17cd45 Mon Sep 17 00:00:00 2001
From: Marvo2011 <Marvin.Edeler@gmail.com>
Date: Mon, 12 Sep 2022 09:32:22 +0200
Subject: [PATCH 3/3] Replace rid, rid2 with selfhost_map validation

Replace rid, rid2 with selfhost_map validation, required for the actual acme.sh master.
---
 .../mvc/app/models/OPNsense/AcmeClient/AcmeClient.xml      | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/security/acme-client/src/opnsense/mvc/app/models/OPNsense/AcmeClient/AcmeClient.xml b/security/acme-client/src/opnsense/mvc/app/models/OPNsense/AcmeClient/AcmeClient.xml
index 237e2b76b..5fd41ff30 100644
--- a/security/acme-client/src/opnsense/mvc/app/models/OPNsense/AcmeClient/AcmeClient.xml
+++ b/security/acme-client/src/opnsense/mvc/app/models/OPNsense/AcmeClient/AcmeClient.xml
@@ -948,12 +948,9 @@
                 <dns_selfhost_password type="TextField">
                     <Required>N</Required>
                 </dns_selfhost_password>
-                <dns_selfhost_rid type="TextField">
+                <dns_selfhost_map type="TextField">
                     <Required>N</Required>
-                </dns_selfhost_rid>
-                <dns_selfhost_rid2 type="TextField">
-                    <Required>N</Required>
-                </dns_selfhost_rid2>
+                </dns_selfhost_map>
                 <dns_servercow_username type="TextField">
                     <Required>N</Required>
                 </dns_servercow_username>