فهرست منبع

auto update script executed

Toby Chui 1 سال پیش
والد
کامیت
10ca798b8f
3فایلهای تغییر یافته به همراه5 افزوده شده و 4 حذف شده
  1. 2 1
      Makefile
  2. 0 1
      mod/acme/ca.go
  3. 3 2
      web/snippet/acme.html

+ 2 - 1
Makefile

@@ -19,7 +19,8 @@ clean:
 
 $(PLATFORMS):
 	@echo "Building $(os)/$(arch)"
-	GOROOT_FINAL=Git/ GOOS=$(os) GOARCH=$(arch) GOARM=6 go build -o './dist/zoraxy_$(os)_$(arch)'  -ldflags "-s -w" -trimpath
+	GOROOT_FINAL=Git/ GOOS=$(os) GOARCH=$(arch) $(if $(filter linux/arm,$(os)/$(arch)),GOARM=6,) go build -o './dist/zoraxy_$(os)_$(arch)'  -ldflags "-s -w" -trimpath
+#	GOROOT_FINAL=Git/ GOOS=$(os) GOARCH=$(arch) GOARM=6 go build -o './dist/zoraxy_$(os)_$(arch)'  -ldflags "-s -w" -trimpath
 
 
 fixwindows:

+ 0 - 1
mod/acme/ca.go

@@ -32,7 +32,6 @@ func init() {
 	}
 
 	caDef = runtimeCaDef
-
 }
 
 // Get the CA ACME server endpoint and error if not found

+ 3 - 2
web/snippet/acme.html

@@ -124,7 +124,7 @@
         <label>Ignore TLS/SSL Verification Error<br><small>E.g. self-signed, expired certificate (Not Recommended)</small></label>
       </div>
     </div>
-    <button id="obtainButton" class="ui basic button" type="submit"><i class="yellow refresh icon"></i> Renew Certificate</button>
+    <button id="obtainButton" class="ui basic button" type="submit"><i class="yellow refresh icon"></i> Get Certificate</button>
   </div>
   <div class="ui divider"></div>
   <small>First time setting up HTTPS?<br>Try out our <a href="../tools/https.html" target="_blank">wizard</a></small>
@@ -323,7 +323,8 @@
       var filename = $("#filenameInput").val();
       var email = $("#caRegisterEmail").val();
       if (email == ""){
-        parent.msgbox("ACME renew email is not set")
+        parent.msgbox("ACME renew email is not set", false)
+        $("#obtainButton").removeClass("loading").removeClass("disabled");
         return;
       }
       if (filename.trim() == "" && !domains.includes(",")){