GuanM/hysteria-dev
1
0
Fork 0
mirror of https://github.com/cmz0228/hysteria-dev.git synced 2025-06-29 15:59:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(acme): fix config name

Browse Source 
fix config name

Signed-off-by: kovacs <mritd@linux.com>
This commit is contained in:
kovacs 2024-05-27 12:45:50 +08:00
parent 3024fc079c
commit 3c22e5967f
No known key found for this signature in database
GPG Key ID: 150E1851F767CDDD
3 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/cmd/server.go
View File

@ -98,7 +98,7 @@ type serverConfigACME struct {
} }
type serverConfigACMEDNSProvider struct { type serverConfigACMEDNSProvider struct {
Name string `mapstructure:"provider"` Name string `mapstructure:"name"`
Config map[string]string `mapstructure:"config"` Config map[string]string `mapstructure:"config"`
} }
@ -333,40 +333,40 @@ func (c *serverConfig) fillTLSConfig(hyConfig *server.Config) error {
case "cloudflare": case "cloudflare":
cmIssuer.DNS01Solver = &certmagic.DNS01Solver{ cmIssuer.DNS01Solver = &certmagic.DNS01Solver{
DNSProvider: &cloudflare.Provider{ DNSProvider: &cloudflare.Provider{
APIToken: c.ACME.DNSProvider.Config["CLOUDFLARE_API_TOKEN"], APIToken: c.ACME.DNSProvider.Config["cloudflare_api_token"],
}, },
} }
case "duckdns": case "duckdns":
cmIssuer.DNS01Solver = &certmagic.DNS01Solver{ cmIssuer.DNS01Solver = &certmagic.DNS01Solver{
DNSProvider: &duckdns.Provider{ DNSProvider: &duckdns.Provider{
APIToken: c.ACME.DNSProvider.Config["DUCKDNS_API_TOKEN"], APIToken: c.ACME.DNSProvider.Config["duckdns_api_token"],
OverrideDomain: c.ACME.DNSProvider.Config["DUCKDNS_OVERRIDE_DOMAIN"], OverrideDomain: c.ACME.DNSProvider.Config["duckdns_override_domain"],
}, },
} }
case "gandi": case "gandi":
cmIssuer.DNS01Solver = &certmagic.DNS01Solver{ cmIssuer.DNS01Solver = &certmagic.DNS01Solver{
DNSProvider: &gandi.Provider{ DNSProvider: &gandi.Provider{
BearerToken: c.ACME.DNSProvider.Config["GANDI_API_TOKEN"], BearerToken: c.ACME.DNSProvider.Config["gandi_api_token"],
}, },
} }
case "godaddy": case "godaddy":
cmIssuer.DNS01Solver = &certmagic.DNS01Solver{ cmIssuer.DNS01Solver = &certmagic.DNS01Solver{
DNSProvider: &godaddy.Provider{ DNSProvider: &godaddy.Provider{
APIToken: c.ACME.DNSProvider.Config["GODADDY_API_TOKEN"], APIToken: c.ACME.DNSProvider.Config["godaddy_api_token"],
}, },
} }
case "namedotcom": case "namedotcom":
cmIssuer.DNS01Solver = &certmagic.DNS01Solver{ cmIssuer.DNS01Solver = &certmagic.DNS01Solver{
DNSProvider: &namedotcom.Provider{ DNSProvider: &namedotcom.Provider{
Token: c.ACME.DNSProvider.Config["NAMEDOTCOM_TOKEN"], Token: c.ACME.DNSProvider.Config["namedotcom_token"],
User: c.ACME.DNSProvider.Config["NAMEDOTCOM_USER"], User: c.ACME.DNSProvider.Config["namedotcom_user"],
Server: c.ACME.DNSProvider.Config["NAMEDOTCOM_SERVER"], Server: c.ACME.DNSProvider.Config["namedotcom_server"],
}, },
} }
case "vultr": case "vultr":
cmIssuer.DNS01Solver = &certmagic.DNS01Solver{ cmIssuer.DNS01Solver = &certmagic.DNS01Solver{
DNSProvider: &vultr.Provider{ DNSProvider: &vultr.Provider{
APIToken: c.ACME.DNSProvider.Config["VULTR_API_TOKEN"], APIToken: c.ACME.DNSProvider.Config["vultr_api_token"],
}, },
} }
} }

6
app/cmd/server_test.go
View File

@ -41,6 +41,12 @@ func TestServerConfig(t *testing.T) {
AltHTTPPort: 9980, AltHTTPPort: 9980,
AltTLSALPNPort: 9443, AltTLSALPNPort: 9443,
Dir: "random_dir", Dir: "random_dir",
DNSProvider: serverConfigACMEDNSProvider{
Name: "cloudflare",
Config: map[string]string{
"cloudflare_api_token": "xxxxxxxxxx",
},
},
}, },
QUIC: serverConfigQUIC{ QUIC: serverConfigQUIC{
InitStreamReceiveWindow: 77881, InitStreamReceiveWindow: 77881,

4
app/cmd/server_test.yaml
View File

@ -20,6 +20,10 @@ acme:
altHTTPPort: 9980 altHTTPPort: 9980
altTLSALPNPort: 9443 altTLSALPNPort: 9443
dir: random_dir dir: random_dir
dnsProvider:
name: "cloudflare"
config:
cloudflare_api_token: "xxxxxxxxxx"
quic: quic:
initStreamReceiveWindow: 77881 initStreamReceiveWindow: 77881