Compare commits

..

3 Commits

Author SHA1 Message Date
Bel LaPointe
d3e98d543e err
All checks were successful
cicd / ci (push) Successful in 2m8s
2025-10-06 07:29:12 -06:00
Bel LaPointe
38786d3b1a can redir, save data.yaml to image 2025-10-06 07:28:18 -06:00
Bel LaPointe
1e7adcf45c gov down 2025-10-06 07:23:52 -06:00
5 changed files with 54 additions and 26 deletions

View File

@@ -7,5 +7,6 @@ RUN cd ./srv; go build -o /go/bin/25-bday-qt
FROM alpine:3.18.4 FROM alpine:3.18.4
COPY --from=builder /go/bin/25-bday-qt /bin/ COPY --from=builder /go/bin/25-bday-qt /bin/
COPY ./ /go/src/25-bday-qt
CMD [] CMD []
ENTRYPOINT ["/bin/25-bday-qt"] ENTRYPOINT ["/bin/25-bday-qt"]

View File

@@ -1,11 +1,21 @@
routes: routes:
"/diagonalheart/ancestries/clank": "" "/diagonalheart/ancestries/clank":
"/diagonalheart/ancestries/katari": "" redirect: "https://daggerheartsrd.com/ancestries/clank/"
"/diagonalheart/classes/bard": "" "/diagonalheart/ancestries/katari":
"/diagonalheart/classes/rogue": "" redirect: "https://daggerheartsrd.com/diagonalheart/ancestries/katari/"
"/diagonalheart/weapons/legendary-returning-blade": "" "/diagonalheart/classes/bard":
"/diagonalheart/weapons/ilmaris-rifle": "" redirect: dhttps://daggerheartsrd.comiagonalheart/classes/bard/"
"/diagonalheart/consumables/stardrop": "" "/diagonalheart/classes/rogue":
"/diagonalheart/consumables/death-tea": "" redirect: "https://daggerheartsrd.com/diagonalheart/classes/rogue/"
"/diagonalheart/adversaries/tiny-red-ooze": "" "/diagonalheart/weapons/legendary-returning-blade":
"/diagonalheart/adversaries/young-ice-dragon": "" redirect: "https://daggerheartsrd.comgonalheart/weapons/legendary-returning-blade/"
"/diagonalheart/weapons/ilmaris-rifle":
redirect: "https://daggerheartsrd.comiagonalheart/weapons/ilmaris-rifle/"
"/diagonalheart/consumables/stardrop":
redirect: "https://daggerheartsrd.comiagonalheart/consumables/stardrop/"
"/diagonalheart/consumables/death-tea":
redirect: "https://daggerheartsrd.comiagonalheart/consumables/death-tea/"
"/diagonalheart/adversaries/tiny-red-ooze":
redirect: "https://daggerheartsrd.comiagonalheart/adversaries/tiny-red-ooze/"
"/diagonalheart/adversaries/young-ice-dragon":
redirect: "https://daggerheartsrd.comiagonalheart/adversaries/young-ice-dragon/"

View File

@@ -1,5 +1,5 @@
module srv module srv
go 1.24.2 go 1.22
require gopkg.in/yaml.v3 v3.0.1 // indirect require gopkg.in/yaml.v3 v3.0.1

View File

@@ -1,3 +1,4 @@
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

View File

@@ -13,21 +13,33 @@ func main() {
} }
} }
type (
Data struct {
Routes map[string]Route
}
Route struct {
Body string
Redirect string
}
)
func run() error { func run() error {
f := os.Args[1] f := os.Args[1]
b, err := os.ReadFile(f)
if err != nil {
return err
}
var data struct {
Routes map[string]string
}
if err := yaml.Unmarshal(b, &data); err != nil {
return err
}
return http.ListenAndServe(":3001", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { return http.ListenAndServe(":3001", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
b, err := os.ReadFile(f)
if err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
return
}
type Route struct {
}
var data Data
if err := yaml.Unmarshal(b, &data); err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
return
}
k := r.URL.Path k := r.URL.Path
v, ok := data.Routes[k] v, ok := data.Routes[k]
@@ -36,7 +48,11 @@ func run() error {
return return
} }
w.Header().Set("Content-Type", "text/html") if u := v.Redirect; u != "" {
w.Write([]byte(v)) http.Redirect(w, r, u, http.StatusSeeOther)
} else {
w.Header().Set("Content-Type", "text/html")
w.Write([]byte(v.Body))
}
})) }))
} }