commit 601ea12d68287e7674e71da71370037c73ab4e55
parent 98c8a4169eb29606ae480fc68b9ae4435f35eb7c
Author: weetat <wtenison@protonmail.com>
Date: Sun, 23 Feb 2025 21:27:28 +0000
Drop MongoDB and add favicon and 404 routes
Remove the MongoDB connection and driver again. Serve /favicon.ico from
web/global, and only redirect the exact / path to /home so anything
else returns a 404.
Diffstat:
4 files changed, 25 insertions(+), 82 deletions(-)
diff --git a/go.mod b/go.mod
@@ -2,19 +2,4 @@ module miki
go 1.23.2
-require (
- github.com/goccy/go-yaml v1.15.17
- go.mongodb.org/mongo-driver/v2 v2.0.1
-)
-
-require (
- github.com/golang/snappy v0.0.4 // indirect
- github.com/klauspost/compress v1.16.7 // indirect
- github.com/xdg-go/pbkdf2 v1.0.0 // indirect
- github.com/xdg-go/scram v1.1.2 // indirect
- github.com/xdg-go/stringprep v1.0.4 // indirect
- github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 // indirect
- golang.org/x/crypto v0.31.0 // indirect
- golang.org/x/sync v0.10.0 // indirect
- golang.org/x/text v0.21.0 // indirect
-)
+require github.com/goccy/go-yaml v1.15.17
diff --git a/go.sum b/go.sum
@@ -1,50 +1,2 @@
-github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
-github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/goccy/go-yaml v1.15.17 h1:dK4FbbTTEOZTLH/NW3/xBqg0JdC14YKVmYwS9GT3H60=
github.com/goccy/go-yaml v1.15.17/go.mod h1:XBurs7gK8ATbW4ZPGKgcbrY1Br56PdM69F7LkFRi1kA=
-github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
-github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
-github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
-github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/klauspost/compress v1.16.7 h1:2mk3MPGNzKyxErAw8YaohYh69+pa4sIQSC0fPGCFR9I=
-github.com/klauspost/compress v1.16.7/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE=
-github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c=
-github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI=
-github.com/xdg-go/scram v1.1.2 h1:FHX5I5B4i4hKRVRBCFRxq1iQRej7WO3hhBuJf+UUySY=
-github.com/xdg-go/scram v1.1.2/go.mod h1:RT/sEzTbU5y00aCK8UOx6R7YryM0iF1N2MOmC3kKLN4=
-github.com/xdg-go/stringprep v1.0.4 h1:XLI/Ng3O1Atzq0oBs3TWm+5ZVgkq2aqdlvP9JtoZ6c8=
-github.com/xdg-go/stringprep v1.0.4/go.mod h1:mPGuuIYwz7CmR2bT9j4GbQqutWS1zV24gijq1dTyGkM=
-github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 h1:ilQV1hzziu+LLM3zUTJ0trRztfwgjqKnBWNtSRkbmwM=
-github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78/go.mod h1:aL8wCCfTfSfmXjznFBSZNN13rSJjlIOI1fUNAtF7rmI=
-github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
-go.mongodb.org/mongo-driver/v2 v2.0.1 h1:mhB/ZJkLSv6W6LGzY7sEjpZif47+JdfEEXjlLCIv7Qc=
-go.mongodb.org/mongo-driver/v2 v2.0.1/go.mod h1:w7iFnTcQDMXtdXwcvyG3xljYpoBa1ErkI0yOzbkZ9b8=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
-golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
-golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
-golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
-golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
-golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
-golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
diff --git a/src/miki/miki.go b/src/miki/miki.go
@@ -2,7 +2,7 @@ package main
import (
"bytes"
- "context"
+ // "context"
"fmt"
"html/template"
"log"
@@ -12,8 +12,8 @@ import (
"regexp"
"github.com/goccy/go-yaml"
- "go.mongodb.org/mongo-driver/v2/mongo"
- "go.mongodb.org/mongo-driver/v2/mongo/options"
+ // "go.mongodb.org/mongo-driver/v2/mongo"
+ // "go.mongodb.org/mongo-driver/v2/mongo/options"
)
type DirectorySignature struct {
@@ -25,7 +25,7 @@ type DirectorySignature struct {
func MakeDirectorySig(dir string, depth int, pattern *regexp.Regexp) (DirectorySignature, error) {
if dir == "" || depth < -1 || pattern == nil {
- return DirectorySignature{}, fmt.Errorf("_ERROR:\tResource:Make(%s, %d, %s)", dir, depth, pattern)
+ return DirectorySignature{}, fmt.Errorf("invalid directory signature (%s, %d, %s)", dir, depth, pattern)
}
if _, _err := os.Stat(dir); _err != nil {
@@ -141,13 +141,19 @@ func main() {
////////// SET UP SERVER MUX //////////
_mux := http.NewServeMux()
+
_mux.Handle("/web/", http.StripPrefix("/web/", http.FileServer(http.Dir(_mfilesys.FileSystemInfo.WebDir))))
- _mux.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
- http.Redirect(w, r, "/home", http.StatusMovedPermanently)
- // log.Println("DONE\tmain:mux.HandleFunc(\"/\"):redirect(\"/home\")")
+
+ _mux.HandleFunc("/favicon.ico", func(w http.ResponseWriter, r *http.Request) {
+ // log.Printf("CALL\tmain:mux.HandleFunc:%s\n", r.URL)
+ http.ServeFile(w, r, _mfilesys.FileSystemInfo.WebDir+"/global/favicon.ico")
+ // log.Printf("DONE\tmain:mux.HandleFunc:%s\n", r.URL)
})
+
_mux.HandleFunc("/home", func(w http.ResponseWriter, r *http.Request) {
+ log.Printf("CALL\tmain:mux.HandleFunc:%s\n", r.URL)
+ // Produce URL path to directory relation.
_r, _err := MakeDirectorySig(_mfilesys.FileSystemInfo.WebDir+"/home", 0, regexp.MustCompile("^([a-zA-Z0-9.]+).html$"))
if _err != nil {
log.Printf("_ERROR\tmain:HandleFunc(\"/\"):MakeResourceSig():%s\n", _err)
@@ -155,6 +161,7 @@ func main() {
return
}
+ // Collect HTML template files from directory.
_rPkg, _err := MakeDirectoryPkg(_r)
if _err != nil {
log.Printf("_ERROR\tmain:HandleFunc(\"/\"):MakeResourcePkg():%s\n", _err)
@@ -175,20 +182,19 @@ func main() {
return
}
- log.Printf("DONE\tmain:mux.HandleFunc:%s\n", _rPkg.root)
+ log.Printf("DONE\tmain:mux.HandleFunc:%s\n", r.URL)
})
- ////////// CONNTECT NoSQL //////////
-
- _mdb, _err := mongo.Connect(options.Client().ApplyURI("mongodb://localhost:27017"))
- if _err != nil {
- log.Panicf("_ERROR\tmain():mongo.Connect():%s\n", _err)
- }
- defer func() {
- if _err = _mdb.Disconnect(context.Background()); _err != nil {
- log.Panicf("_ERROR\tmain():mongo.Disconnect:%s\n", _err)
+ _mux.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
+ // log.Printf("CALL\tmain:mux.HandleFunc:%s\n", r.URL)
+ if r.URL.Path == "/" {
+ http.Redirect(w, r, "/home", http.StatusMovedPermanently)
+ return
+ } else {
+ http.NotFound(w, r)
}
- }()
+ // log.Printf("DONE\tmain:mux.HandleFunc:%s\n", r.URL)
+ })
////////// RUN SERVERS //////////
diff --git a/web/global/favicon.ico b/web/global/favicon.ico
Binary files differ.
