diff options
| -rw-r--r-- | Caddyfile.forge.wit.com | 29 | ||||
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | http.go | 16 | ||||
| -rw-r--r-- | https.go | 18 | ||||
| -rw-r--r-- | resources/uptime.html | 8 |
5 files changed, 50 insertions, 27 deletions
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 [email protected] + 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 + } + } +} @@ -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 @@ -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, " </head>") fmt.Fprintln(w, " <body>") fmt.Fprintln(w, " IPv4 IS NOT SUPPORTED<br>") - fmt.Fprintln(w, " MANY OF THESE REPOS REQUIRE IPv6.<br>") + fmt.Fprintln(w, " FORGE REQUIRES IPv6.<br>") fmt.Fprintln(w, " <br>") - fmt.Fprintln(w, " bad url", badurl, "<a href=\"https://go.wit.com/\">redirecting</a>") + fmt.Fprintln(w, " bad url", badurl, "<a href=\"https://forge.wit.com/\">redirecting</a>") fmt.Fprintln(w, " </body>") fmt.Fprintln(w, "</html>") } diff --git a/https.go b/https.go deleted file mode 100644 index 00fca19..0000000 --- a/https.go +++ /dev/null @@ -1,18 +0,0 @@ -package main - -import ( - "fmt" - "net/http" -) - -func https() { - // http.HandleFunc("/", okHandler) - - certPath := "/etc/letsencrypt/live/go.wit.com/fullchain.pem" - keyPath := "/etc/letsencrypt/live/go.wit.com/privkey.pem" - - err := http.ListenAndServeTLS(":443", certPath, keyPath, nil) - if err != nil { - fmt.Println("Error starting HTTPS server:", err) - } -} diff --git a/resources/uptime.html b/resources/uptime.html new file mode 100644 index 0000000..5aa0900 --- /dev/null +++ b/resources/uptime.html @@ -0,0 +1,8 @@ +<!DOCTYPE html> +<html> + <head> + </head> + <body> + OKFORGE + </body> +</html> |