From 73eeec75f4a6329df7065ea8c4b4f8319af15ba2 Mon Sep 17 00:00:00 2001
From: Michael Quigley <michael@quigley.com>
Date: Fri, 11 Aug 2023 14:25:39 -0400
Subject: [PATCH] working caddy + config (#330)

---
 cmd/zrok/caddy.go | 4 +++-
 etc/Caddyfile     | 3 +--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/cmd/zrok/caddy.go b/cmd/zrok/caddy.go
index 471022ca..b46dcd32 100644
--- a/cmd/zrok/caddy.go
+++ b/cmd/zrok/caddy.go
@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"github.com/caddyserver/caddy/v2"
 	"github.com/caddyserver/caddy/v2/caddyconfig/caddyfile"
+	"github.com/caddyserver/caddy/v2/caddyconfig/httpcaddyfile"
 	"github.com/spf13/cobra"
 	"os"
 	"time"
@@ -38,6 +39,7 @@ func (cmd *caddyCommand) run(_ *cobra.Command, args []string) {
 		panic(err)
 	}
 	var adapter caddyfile.Adapter
+	adapter.ServerType = httpcaddyfile.ServerType{}
 	cfg, warn, err := adapter.Adapt(data, map[string]interface{}{"filename": args[0]})
 	if err != nil {
 		panic(err)
@@ -45,7 +47,7 @@ func (cmd *caddyCommand) run(_ *cobra.Command, args []string) {
 	for _, w := range warn {
 		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 {
 		panic(err)
 	}
diff --git a/etc/Caddyfile b/etc/Caddyfile
index d5679f29..8e11b272 100644
--- a/etc/Caddyfile
+++ b/etc/Caddyfile
@@ -1,7 +1,6 @@
-servers :2015 {
+:2015 {
 	route / {
 		visitor_ip "stderr"
 	}
 	respond "hello, world!"
-	protocols h1 h2c
 }