diff --git a/Caddyfile.forge.wit.com b/Caddyfile.forge.wit.com new file mode 100644 index 0000000..102d2cc --- /dev/null +++ b/Caddyfile.forge.wit.com @@ -0,0 +1,29 @@ +{ + email forge@wit.com + debug + servers { + metrics + } + + log { + output file /var/log/caddy/caddy.log { + roll_size 500mb + } + format json { + time_format iso8601 + } + } +} + +forge.wit.com { + encode zstd gzip + reverse_proxy localhost:2520 + log { + output file /var/log/caddy/forge.wit.com.log { + roll_size 100mb + } + format json { + time_format iso8601 + } + } +} diff --git a/Makefile b/Makefile index 0939820..eb6fa4e 100644 --- a/Makefile +++ b/Makefile @@ -46,6 +46,12 @@ run: build ./forged --port 2233 --hostname forge.wit.com # setcap 'cap_net_bind_service=+ep' forged # allow the binary to open ports below 1024 +prod: build + make stop + cp forged /usr/bin/forged + make start + make log + goimports: reset goimports -w *.go diff --git a/http.go b/http.go index 96a443a..fae1800 100644 --- a/http.go +++ b/http.go @@ -32,10 +32,10 @@ func okHandler(w http.ResponseWriter, r *http.Request) { log.Warn("forged REQUEST URL =", requrl, "msg =", len(msg)) if route == "/" { - // indexHeader(w) - // indexBodyStart(w) - // indexBodyScanConfig(w) - // indexDivEnd(w) + w.Header().Set("Content-Type", "text") + fmt.Fprintf(w, "go.wit.com/apps/utils/forged Version: %s\n", argv.Version()) + fmt.Fprintf(w, "\n") + listPatchsets(w) return } if route == "/patchset" { @@ -58,6 +58,7 @@ func okHandler(w http.ResponseWriter, r *http.Request) { } if route == "/goReference.svg" { + w.Header().Set("Content-Type", "image/svg+xml") writeFile(w, "goReference.svg") return } @@ -90,9 +91,6 @@ func writeFile(w http.ResponseWriter, filename string) { var repohtml string repohtml = string(pfile) - if filename == "goReference.svg" { - w.Header().Set("Content-Type", "image/svg+xml") - } fmt.Fprintln(w, repohtml) log.Println("writeFile() found internal file:", filename) } @@ -105,9 +103,9 @@ func badurl(w http.ResponseWriter, badurl string) { fmt.Fprintln(w, " ") fmt.Fprintln(w, "
") fmt.Fprintln(w, " IPv4 IS NOT SUPPORTED