extern/zrok
1
1
Fork 0
mirror of https://github.com/openziti/zrok.git synced 2025-06-20 09:48:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

working caddy + config (#330)

Browse Source
This commit is contained in:
Michael Quigley 2023-08-11 14:25:39 -04:00
parent f3dd6c0602
commit 73eeec75f4
No known key found for this signature in database
GPG Key ID: 9B60314A9DD20A62
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/zrok/caddy.go
View File

@ -4,6 +4,7 @@ import (
"fmt" "fmt"
"github.com/caddyserver/caddy/v2" "github.com/caddyserver/caddy/v2"
"github.com/caddyserver/caddy/v2/caddyconfig/caddyfile" "github.com/caddyserver/caddy/v2/caddyconfig/caddyfile"
"github.com/caddyserver/caddy/v2/caddyconfig/httpcaddyfile"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"os" "os"
"time" "time"
@ -38,6 +39,7 @@ func (cmd *caddyCommand) run(_ *cobra.Command, args []string) {
panic(err) panic(err)
} }
var adapter caddyfile.Adapter var adapter caddyfile.Adapter
adapter.ServerType = httpcaddyfile.ServerType{}
cfg, warn, err := adapter.Adapt(data, map[string]interface{}{"filename": args[0]}) cfg, warn, err := adapter.Adapt(data, map[string]interface{}{"filename": args[0]})
if err != nil { if err != nil {
panic(err) panic(err)
@ -45,7 +47,7 @@ func (cmd *caddyCommand) run(_ *cobra.Command, args []string) {
for _, w := range warn { for _, w := range warn {
fmt.Println(w.Message) fmt.Println(w.Message)
} }
fmt.Printf("cfg: %v\n", cfg) fmt.Printf("cfg: %v\n", string(cfg))
if err := caddy.Load(cfg, true); err != nil { if err := caddy.Load(cfg, true); err != nil {
panic(err) panic(err)
} }

3
etc/Caddyfile
View File

@ -1,7 +1,6 @@
servers :2015 { :2015 {
route / { route / {
visitor_ip "stderr" visitor_ip "stderr"
} }
respond "hello, world!" respond "hello, world!"
protocols h1 h2c
} }