Fixes for ACMEv2

1 files changed, 7 insertions, 2 deletions

diff --git a/web/controllers/acmev2.go b/web/controllers/acmev2.go
index a2fadf5..7ea76af 100644
--- a/web/controllers/acmev2.go
+++ b/web/controllers/acmev2.go
@@ -42,16 +42,21 @@ func CreateAcmeChallengeV2(c *gin.Context) {
                 return
         }
 
+        testFor := fmt.Sprintf("_acme-challenge.%s.%s", prefix, zone.Name)
+        if prefix == "" {
+                testFor = fmt.Sprintf("_acme-challenge.%s", zone.Name)
+        }
+
         if err := cfg.DNSClient.WaitForDNSPropagation(
                 c.Request.Context(),
-                fmt.Sprintf("_acme-challenge.%s.", prefix),
+                testFor,
                 ch.Challenge,
         ); err != nil {
                 jsonError(c, http.StatusInternalServerError, fmt.Errorf("Error polling for DNS propagation: %w", err))
                 return
         }
 
-        c.JSON(http.StatusCreated, "")
+        c.String(http.StatusCreated, "")
 }
 
 func DeleteAcmeChallengeV2(c *gin.Context) {