Преглед на файлове

Added ca name check if empty use default

Toby Chui преди 11 месеца
родител
ревизия
3a8416333e
променени са 2 файла, в които са добавени 18 реда и са изтрити 14 реда
  1. 5 0
      mod/acme/acme.go
  2. 13 14
      web/snippet/acme.html

+ 5 - 0
mod/acme/acme.go

@@ -117,6 +117,11 @@ func (a *ACMEHandler) ObtainCert(domains []string, certificateName string, email
 		}
 	}
 
+	//Fallback to Let's Encrypt if it is not set
+	if caName == "" {
+		caName = "Let's Encrypt"
+	}
+
 	// setup the custom ACME url endpoint.
 	if caUrl != "" {
 		config.CADirURL = caUrl

+ 13 - 14
web/snippet/acme.html

@@ -133,7 +133,7 @@
     </div>
     <div class="field dnsChallengeOnly" style="display:none;">
       <div class="ui divider"></div>
-      <p>Required Configurations</p>
+      <p>DNS Credentials (Leave all fields empty to use previous settings)</p>
       <div id="dnsProviderAPIFields">
 
       </div>
@@ -521,19 +521,6 @@
     function readDnsCredentials(){
       let dnsCredentials = {};
       $(".dnsConfigField").each(function(){
-        /*
-        let thisKey = $(this).attr("key");
-        if ($(this).hasClass("checkbox")){
-          //Boolean option
-          let checked = $(this).find("input")[0].checked;
-          dnsCredentials += `${thisKey}=${checked?"true":"false"}\n`
-        }else{
-          //String or int options
-          let value = $(this).find("input").val().trim();
-          dnsCredentials += `${thisKey}=${value}\n`
-        }
-        */
-
         let thisKey = $(this).attr("key");
         let value = "";
         if ($(this).hasClass("checkbox")){
@@ -561,6 +548,18 @@
         return;
       }
 
+      //Check if all fields is empty. If yes, do not update the config
+      let allFieldsEmpty = true;
+      $(".dnsConfigField").each(function(){
+        if ($(this).find("input").val().trim() != ""){
+          allFieldsEmpty = false;
+        }
+      });
+      if (allFieldsEmpty){
+        //Do not update config on server side
+        return;
+      }
+
       dnsProvider = $("#dnsProvider").dropdown("get value");
 
       //dnsCredentials = $("#dnsCredentials").val();