feat: configuration

internal/server/routes.go

@@ -3,16 +3,15 @@ package server
 import (
 	"log/slog"
 	"net/http"
-	"os"
 	"time"
 
 	"git.schreifuchs.ch/schreifuchs/schreifuchs.ch/internal/components/images"
 	"git.schreifuchs.ch/schreifuchs/schreifuchs.ch/internal/components/page"
 	"git.schreifuchs.ch/schreifuchs/schreifuchs.ch/internal/components/translate"
-	"git.schreifuchs.ch/schreifuchs/schreifuchs.ch/internal/filesystem"
 	"git.schreifuchs.ch/schreifuchs/schreifuchs.ch/internal/handlers/resthome"
 	"git.schreifuchs.ch/schreifuchs/schreifuchs.ch/internal/handlers/restimage"
-	"git.schreifuchs.ch/schreifuchs/schreifuchs.ch/internal/templer"
+	"git.schreifuchs.ch/schreifuchs/schreifuchs.ch/internal/pkg/filesystem"
+	"git.schreifuchs.ch/schreifuchs/schreifuchs.ch/internal/pkg/templer"
 	"git.schreifuchs.ch/schreifuchs/schreifuchs.ch/web"
 	"github.com/studio-b12/gowebdav"
 	"github.com/valkey-io/valkey-go"
@@ -22,7 +21,7 @@ func (s *Server) RegisterRoutes() (h http.Handler) {
 	mux := http.NewServeMux()
 
 	registerStatic(mux)
-	mux.Handle("/", registerOther())
+	mux.Handle("/", s.registerOther())
 
 	h = mux
 	h = templer.Middleware(h)
@@ -30,23 +29,19 @@ func (s *Server) RegisterRoutes() (h http.Handler) {
 	return h
 }
 
-func registerOther() (h http.Handler) {
+func (s *Server) registerOther() (h http.Handler) {
 	mux := http.NewServeMux()
 
-	webdavClient := gowebdav.NewClient("https://cloud.schreifuchs.ch/remote.php/dav/files/test/website", "test", os.Getenv("TEST_PW"))
+	webdavClient := gowebdav.NewClient(s.cfg.FileSystem.URL, s.cfg.FileSystem.User, s.cfg.FileSystem.Password)
 	if err := webdavClient.Connect(); err != nil {
-		slog.Error("could not connect webdavClient", "err", err, "pw", os.Getenv("TEST_PW"))
+		slog.Error("could not connect webdavClient", "err", err)
 	}
 
 	var fs filesystem.FS = webdavClient
 
-	valkeyAddr := os.Getenv("VALKEY_ADDR")
-	if valkeyAddr == "" {
-		valkeyAddr = "127.0.0.1:6379"
-	}
 	valkeyClient, err := valkey.NewClient(valkey.ClientOption{
-		InitAddress: []string{valkeyAddr},
-		Password:    os.Getenv("VALKEY_PASSWORD"),
+		InitAddress: s.cfg.Cache.InitAddress,
+		Password:    s.cfg.Cache.Password,
 	})
 	if err != nil {
 		slog.Error("failed to create valkey client", "err", err)
@@ -63,7 +58,7 @@ func registerOther() (h http.Handler) {
 
 	h = mux
 	h = translator.Middleware(h)
-	h = cacheMiddleware(time.Second * 45)(h)
+	h = cacheMiddleware(time.Minute * 5)(h)
 	return h
 }