From ac2899806972540d5b9ab5d1823ec4ffacfc3aac Mon Sep 17 00:00:00 2001
From: Omar Khalil <omar@khalil.pw>
Date: Sun, 17 Jun 2018 00:21:55 +0200
Subject: [PATCH] security/acme-client: add helpful tips to DNS providers and
 reorder the DNS providers menu

---
 .../OPNsense/AcmeClient/forms/dialogValidation.xml           | 5 +++++
 .../mvc/app/models/OPNsense/AcmeClient/AcmeClient.xml        | 4 ++--
 2 files changed, 7 insertions(+), 2 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 4b19839ab..d5e2b3a56 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
@@ -258,6 +258,7 @@
         <id>validation.dns_da_insecure</id>
         <label>Disable SSL Verification</label>
         <type>checkbox</type>
+        <help><![CDATA[Uncheck this box if you have a valid SSL certificate for your DirectAdmin installation]]></help>
     </field>
     <field>
         <label>DigitalOcean</label>
@@ -278,6 +279,7 @@
         <id>validation.dns_dnsimple_token</id>
         <label>OAuth Token</label>
         <type>text</type>
+        <help><![CDATA[Note that this is the account token not the user token.]]></help>
     </field>
     <field>
         <label>Domain-Offensive</label>
@@ -475,6 +477,7 @@
         <id>validation.dns_ispconfig_insecure</id>
         <label>Disable SSL Verification</label>
         <type>checkbox</type>
+        <help><![CDATA[Uncheck this box if you have a valid SSL certificate for your ISPConfig installation]]></help>
     </field>
     <field>
         <label>KingHost</label>
@@ -500,11 +503,13 @@
         <id>validation.dns_knot_server</id>
         <label>Server</label>
         <type>text</type>
+        <help><![CDATA[Knot server address, like: dns.example.com]]></help>
     </field>
     <field>
         <id>validation.dns_knot_key</id>
         <label>Key</label>
         <type>text</type>
+        <help><![CDATA[Specify the location of the generated TSIG Key inside the TSIG file using grep and cut, example: grep \# /etc/knot/acme.key | cut -d' ' -f2 ]]></help>
     </field>
     <field>
         <label>lexicon</label>
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 4cd5bca1a..42c77727d 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
@@ -348,8 +348,9 @@
                         <dns_da>DirectAdmin API</dns_da>
                         <dns_dgon>DigitalOcean API</dns_dgon>
                         <dns_dnsimple>DNSimple API</dns_dnsimple>
-                        <dns_do>Domain-Offensive/Resellerinterface/Domainrobot API</dns_do>
+                        <dns_me>DNSMadeEasy.com API</dns_me>
                         <dns_dp>DNSPod.cn API</dns_dp>
+                        <dns_do>Domain-Offensive/Resellerinterface/Domainrobot API</dns_do>
                         <dns_dreamhost>DreamHost DNS API</dns_dreamhost>
                         <dns_duckdns>DuckDNS API</dns_duckdns>
                         <dns_dyn>Dyn Managed DNS API</dns_dyn>
@@ -366,7 +367,6 @@
                         <dns_lexicon>lexicon DNS API</dns_lexicon>
                         <dns_linode>Linode API</dns_linode>
                         <dns_lua>LuaDNS.com API</dns_lua>
-                        <dns_me>DNSMadeEasy.com API</dns_me>
                         <dns_namecom>Name.com API</dns_namecom>
                         <dns_namesilo>Namesilo.com API</dns_namesilo>
                         <dns_nsone>NS1.com API</dns_nsone>