From 740762605514894d1ad285c16f4886c039499f2b Mon Sep 17 00:00:00 2001
From: Bill Gertz <bill.gertz@blockfish.net>
Date: Tue, 15 Oct 2019 18:05:06 +0200
Subject: [PATCH 1/3] Update settings.xml for deeper debugging

Add to the help message explaining the two new debug levels.
---
 .../mvc/app/controllers/OPNsense/AcmeClient/forms/settings.xml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/forms/settings.xml b/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/forms/settings.xml
index 190fcb190..97e65af79 100644
--- a/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/forms/settings.xml
+++ b/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/forms/settings.xml
@@ -41,7 +41,7 @@
         <id>acmeclient.settings.logLevel</id>
         <label>Log Level</label>
         <type>dropdown</type>
-        <help><![CDATA[Specifies the log level for acme.sh, default is "normal". All other log levels add information for debug purposes, but be aware that this will break the log formatting in the GUI.]]></help>
+        <help><![CDATA[Specifies the log level for acme.sh, default is "normal". All other log levels add information for debug purposes, but be aware that this will break the log formatting in the GUI.  Levels "debug 2" and "debug 3" log successively deeper log messages from the acme.sh including messages from DNS-01 DNSAPI scripts.]]></help>
         <advanced>true</advanced>
     </field>
 </form>

From 3b34e60074d3378816c02aeaa5c1d22e29966f44 Mon Sep 17 00:00:00 2001
From: Bill Gertz <bill.gertz@blockfish.net>
Date: Tue, 15 Oct 2019 18:19:54 +0200
Subject: [PATCH 2/3] Add debug2 and debug3 options to logLevel

Add options to support deeper logLevel acme.sh debug options debug 2 (_--debug 2_ and _--debug 3_)
---
 .../opnsense/mvc/app/models/OPNsense/AcmeClient/AcmeClient.xml  | 2 ++
 1 file changed, 2 insertions(+)

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 a28d09d47..e8ae22dde 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
@@ -105,6 +105,8 @@
                     <normal>normal</normal>
                     <extended>extended</extended>
                     <debug>debug</debug>
+                    <debug2>debug 2</debug2>
+                    <debug3>debug 3</debug3>
                 </OptionValues>
             </logLevel>
         </settings>

From 74bf043a44515e7ecd6da9cecab6728c6d703bff Mon Sep 17 00:00:00 2001
From: Bill Gertz <bill.gertz@blockfish.net>
Date: Tue, 15 Oct 2019 18:31:14 +0200
Subject: [PATCH 3/3] Output right switch depending on logLevel choice

Noticed that from the controller form settings.xml the logLevel selection is a drop down allowing only once choice between:
  - normal
  - extensive
  - debug

Added the additional choices:
  - debug 2
  - debug 3

Altered the php code to implement a switch in line with that single possible choice.
---
 .../scripts/OPNsense/AcmeClient/certhelper.php     | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/security/acme-client/src/opnsense/scripts/OPNsense/AcmeClient/certhelper.php b/security/acme-client/src/opnsense/scripts/OPNsense/AcmeClient/certhelper.php
index 764bdcc0e..307aa79da 100755
--- a/security/acme-client/src/opnsense/scripts/OPNsense/AcmeClient/certhelper.php
+++ b/security/acme-client/src/opnsense/scripts/OPNsense/AcmeClient/certhelper.php
@@ -328,8 +328,18 @@ function eval_optional_acme_args()
     $acme_args[] = isset($options["S"]) ? "--staging" : null; // for debug purpose
 
     // Set log level
-    $acme_args[] = $configObj->OPNsense->AcmeClient->settings->logLevel == "normal" ? "--log-level 1" : "--log-level 2";
-    $acme_args[] = $configObj->OPNsense->AcmeClient->settings->logLevel == "debug" ? "--debug" : null;
+    switch($configObj->OPNsense->AcmeClient->settings->logLevel) {
+        case "extended":
+            $acme_args[] = "--log-level 2";
+        case "debug":
+            $acme_args[] = "--debug";
+        case "debug2":
+            $acme_args[] = "--debug 2";
+        case "debug3":
+            $acme_args[] = "--debug 3";
+        default:
+            $acme_args[] = "--log-level 1";
+    }
 
     // Remove empty and duplicate elements from array
     return(array_unique(array_filter($acme_args)));