From 5604c3232ab70e5692492be690c0115dd7a6d858 Mon Sep 17 00:00:00 2001 From: saces Date: Mon, 16 Feb 2026 23:29:45 +0100 Subject: [PATCH] dns already taken --- caddyapp/README.md | 4 ++-- caddyapp/app.go | 6 +++--- caddyapp/provider.go | 4 ++-- caddyapp/server_test.go | 4 ++-- caddyapp/stub.go | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/caddyapp/README.md b/caddyapp/README.md index ed59f9a..fd17f63 100644 --- a/caddyapp/README.md +++ b/caddyapp/README.md @@ -122,7 +122,7 @@ To use this module for the ACME DNS challenge, [configure the ACME issuer in you { "module": "acme", "challenges": { - "dns": { + "dns01": { "provider": { "name": "internal" } @@ -152,7 +152,7 @@ Both are optional. ```json { "apps": { - "dns": { + "dns01": { "address": "192.0.2.123:53", "records": [ "example.com.\t3600\tIN\tA\t192.0.2.123" diff --git a/caddyapp/app.go b/caddyapp/app.go index 4898536..c8f00a1 100644 --- a/caddyapp/app.go +++ b/caddyapp/app.go @@ -28,7 +28,7 @@ type App struct { func (App) CaddyModule() caddy.ModuleInfo { return caddy.ModuleInfo{ - ID: "dns", + ID: "dns01", New: func() caddy.Module { return &App{} }, } } @@ -155,7 +155,7 @@ func (a *App) UnmarshalCaddyfile(d *caddyfile.Dispenser) error { return nil } -// parseApp configures the "dns" global option from Caddyfile. +// parseApp configures the "dns01" global option from Caddyfile. // Syntax: // // dns [address] { @@ -176,7 +176,7 @@ func parseApp(d *caddyfile.Dispenser, prev interface{}) (interface{}, error) { // tell Caddyfile adapter that this is the JSON for an app return httpcaddyfile.App{ - Name: "dns", + Name: "dns01", Value: caddyconfig.JSON(a, &warnings), }, nil } diff --git a/caddyapp/provider.go b/caddyapp/provider.go index c3dd904..eb99f42 100644 --- a/caddyapp/provider.go +++ b/caddyapp/provider.go @@ -27,11 +27,11 @@ func (Provider) CaddyModule() caddy.ModuleInfo { // Provision sets up the module. Implements caddy.Provisioner. func (p *Provider) Provision(ctx caddy.Context) error { p.logger = ctx.Logger() - _, err := ctx.AppIfConfigured("dns") + _, err := ctx.AppIfConfigured("dns01") if err != nil { p.logger.Warn("DNS app not yet configured") } - app, err := ctx.App("dns") + app, err := ctx.App("dns01") if err != nil { return err } diff --git a/caddyapp/server_test.go b/caddyapp/server_test.go index c93989e..0f588d9 100644 --- a/caddyapp/server_test.go +++ b/caddyapp/server_test.go @@ -43,7 +43,7 @@ const dns_only_json string = `{ } }, "apps": { - "dns": { + "dns01": { "address": "127.0.0.1:53535", "records": [ "sub123.example.com.\t3600\tIN\tA\t127.0.0.1", @@ -79,7 +79,7 @@ const dns_but_empty_json string = `{ } }, "apps": { - "dns": { + "dns01": { "address": "127.0.0.1:53535" } } diff --git a/caddyapp/stub.go b/caddyapp/stub.go index f11f847..c3a88b0 100644 --- a/caddyapp/stub.go +++ b/caddyapp/stub.go @@ -21,7 +21,7 @@ func init() { caddy.RegisterModule(App{}) caddy.RegisterModule(Provider{}) - httpcaddyfile.RegisterGlobalOption("dns", parseApp) + httpcaddyfile.RegisterGlobalOption("dns01", parseApp) } func record_to_rr(zone string, record libdns.Record) (dns.RR, error) {