tobychui 1 год назад
Родитель
Сommit
db428d6afc
3 измененных файлов с 26 добавлено и 1 удалено
  1. 1 0
      api.go
  2. 6 0
      mod/acme/autorenew.go
  3. 19 1
      web/snippet/acme.html

+ 1 - 0
api.go

@@ -160,6 +160,7 @@ func initAPIs() {
 	authRouter.HandleFunc("/api/acme/autoRenew/email", acmeAutoRenewer.HandleACMEEmail)
 	authRouter.HandleFunc("/api/acme/autoRenew/setDomains", acmeAutoRenewer.HandleSetAutoRenewDomains)
 	authRouter.HandleFunc("/api/acme/autoRenew/listDomains", acmeAutoRenewer.HandleLoadAutoRenewDomains)
+	authRouter.HandleFunc("/api/acme/autoRenew/renewPolicy", acmeAutoRenewer.HandleRenewPolicy)
 	authRouter.HandleFunc("/api/acme/autoRenew/renewNow", acmeAutoRenewer.HandleRenewNow)
 	authRouter.HandleFunc("/api/acme/wizard", acmewizard.HandleGuidedStepCheck) //ACME Wizard
 

+ 6 - 0
mod/acme/autorenew.go

@@ -184,6 +184,12 @@ func (a *AutoRenewer) HandleLoadAutoRenewDomains(w http.ResponseWriter, r *http.
 	utils.SendJSONResponse(w, string(js))
 }
 
+func (a *AutoRenewer) HandleRenewPolicy(w http.ResponseWriter, r *http.Request) {
+	//Load the current value
+	js, _ := json.Marshal(a.RenewerConfig.RenewAll)
+	utils.SendJSONResponse(w, string(js))
+}
+
 func (a *AutoRenewer) HandleRenewNow(w http.ResponseWriter, r *http.Request) {
 	renewedDomains, err := a.CheckAndRenewCertificates()
 	if err != nil {

+ 19 - 1
web/snippet/acme.html

@@ -56,7 +56,7 @@
           <div class="content">
               <p>Renew all certificates with ACME supported CAs</p>
               <div class="ui toggle checkbox">
-                <input type="checkbox" id="renewAllSupported" onchange="setAutoRenewIfCASupportMode(this.checked);" checked>
+                <input type="checkbox" id="renewAllSupported" onchange="setAutoRenewIfCASupportMode(this.checked);">
                 <label>Renew All Certs</label>
               </div><br>
               <button id="renewNowBtn" onclick="renewNow();" class="ui basic right floated button" style="margin-top: -2em;"><i class="yellow refresh icon"></i> Renew Now</button>
@@ -139,6 +139,7 @@
     }
 
     function initRenewerConfigFromFile(){
+      //Set the renew switch state
       $.get("/api/acme/autoRenew/enable", function(data){
         if (data == true){
           $("#enableCertAutoRenew").parent().checkbox("set checked");
@@ -152,11 +153,21 @@
         })
       });
 
+      //Load the email from server side
       $.get("/api/acme/autoRenew/email", function(data){
         if (data != "" && data != undefined && data != null){
           $("#caRegisterEmail").val(data);
         }
       });
+
+      //Load the domain selection options
+      $.get("/api/acme/autoRenew/renewPolicy", function(data){
+        if (data == true){
+          $("#renewAllSupported").parent().checkbox("set checked");
+        }else{
+          $("#renewAllSupported").parent().checkbox("set unchecked");
+        }
+      });
     }
     initRenewerConfigFromFile();
 
@@ -238,6 +249,13 @@
 
         counter++;
       }
+
+      if (Object.keys(domainFileList).length == 0){
+        //No certificate in this system
+        tableBody.append(`<tr>
+          <td colspan="3"><i class="ui green circle check icon"></i> No certificate in use</td>
+        </tr>`);
+      }
     }
 
     //Initiate domain table. If you needs to update the expired domain as well