Finished changing structure to modules:

- ntfy
- keyserver
- webhook
- webserver
functional modules.

Dockerfile

@@ -1,9 +1,8 @@
 FROM golang:1.25-alpine AS builder
 WORKDIR /app
-COPY main.go webhook.go config.go .
+COPY . .
-RUN go mod init varde && \
+RUN go mod tidy && \
-    go mod tidy && \
+    CGO_ENABLED=0 GOOS=linux go build -o server .
-    CGO_ENABLED=0 GOOS=linux go build -o server main.go webhook.go config.go
 
 FROM scratch
 COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/

config.go

@@ -3,34 +3,46 @@ package main
 import (
 	"flag"
 	"os"
+
+	"varde/internal/ntfy"
+	"varde/modules/keyserver"
+	"varde/modules/webhook"
+	"varde/modules/webserver"
 )
 
 type Config struct {
-	ContentDir    string
-	KeysDir       string
 	Port string
-	RepoURL       string
+
-	RepoToken     string
+	Webserver webserver.Config
-	WebhookSecret string
+	Keyserver keyserver.Config
-	NtfyURL       string
+	Webhook   webhook.Config
-	NtfyTopic     string
+	Ntfy      ntfy.Config
-	EnableWebhook bool
 }
 
 func loadConfig() *Config {
 	cfg := &Config{}
 
-	flag.StringVar(&cfg.ContentDir, "content-dir", envOrDefault("CONTENT_DIR", "./content"), "directory to serve as content")
-	flag.StringVar(&cfg.KeysDir, "keys-dir", envOrDefault("KEYS_DIR", "./keys"), "directory to serve as WKD keys")
 	flag.StringVar(&cfg.Port, "port", envOrDefault("PORT", "80"), "port to listen on")
-	flag.StringVar(&cfg.RepoURL, "repo-url", envOrDefault("REPO_URL", ""), "git repo URL for webhook auto-update")
+
-	flag.StringVar(&cfg.RepoToken, "repo-token", envOrDefault("REPO_TOKEN", ""), "git repo access token")
+	flag.BoolVar(&cfg.Webserver.Enabled, "enable-webserver", envOrDefaultBool("ENABLE_WEBSERVER", false), "enable static webserver module")
-	flag.StringVar(&cfg.WebhookSecret, "webhook-secret", envOrDefault("WEBHOOK_SECRET", ""), "HMAC secret for webhook validation")
+	flag.StringVar(&cfg.Webserver.ContentDir, "content-dir", envOrDefault("CONTENT_DIR", "./content"), "directory to serve as content")
-	flag.StringVar(&cfg.NtfyURL, "ntfy-url", envOrDefault("NTFY_URL", ""), "ntfy server URL for failure notifications")
+
-	flag.StringVar(&cfg.NtfyTopic, "ntfy-topic", envOrDefault("NTFY_TOPIC", ""), "ntfy topic for failure notifications")
+	flag.BoolVar(&cfg.Keyserver.Enabled, "enable-keyserver", envOrDefaultBool("ENABLE_KEYSERVER", false), "enable WKD keyserver module")
-	flag.BoolVar(&cfg.EnableWebhook, "webhook", envOrDefaultBool("ENABLE_WEBHOOK", false), "enable git-webhook auto-update feature")
+	flag.StringVar(&cfg.Keyserver.KeysDir, "keys-dir", envOrDefault("KEYS_DIR", "./keys"), "directory to serve as WKD keys")
+
+	flag.BoolVar(&cfg.Webhook.Enabled, "enable-webhook", envOrDefaultBool("ENABLE_WEBHOOK", false), "enable git-webhook auto-update module")
+	flag.StringVar(&cfg.Webhook.RepoURL, "repo-url", envOrDefault("REPO_URL", ""), "git repo URL for webhook auto-update")
+	flag.StringVar(&cfg.Webhook.RepoToken, "repo-token", envOrDefault("REPO_TOKEN", ""), "git repo access token")
+	flag.StringVar(&cfg.Webhook.WebhookSecret, "webhook-secret", envOrDefault("WEBHOOK_SECRET", ""), "HMAC secret for webhook validation")
+
+	flag.StringVar(&cfg.Ntfy.URL, "ntfy-url", envOrDefault("NTFY_URL", ""), "ntfy server URL for failure notifications")
+	flag.StringVar(&cfg.Ntfy.Topic, "ntfy-topic", envOrDefault("NTFY_TOPIC", ""), "ntfy topic for failure notifications")
 
 	flag.Parse()
+
+	// webhook pulls into the same directory the webserver serves
+	cfg.Webhook.ContentDir = cfg.Webserver.ContentDir
+
 	return cfg
 }
 

internal/middleware/middleware.go

@@ -0,0 +1,52 @@
+package middleware
+
+import (
+	"log"
+	"net/http"
+	"strings"
+
+	"golang.org/x/time/rate"
+)
+
+func SecurityHeaders(next http.Handler) http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
+		w.Header().Set("X-Content-Type-Options", "nosniff")
+		w.Header().Set("X-Frame-Options", "DENY")
+		w.Header().Set("Referrer-Policy", "strict-origin-when-cross-origin")
+		next.ServeHTTP(w, req)
+	})
+}
+
+func NoListing(next http.Handler) http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
+		if strings.HasSuffix(req.URL.Path, "/") {
+			http.NotFound(w, req)
+			return
+		}
+		next.ServeHTTP(w, req)
+	})
+}
+
+func WKDHeaders(next http.Handler) http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
+		w.Header().Set("Content-Type", "application/octet-stream")
+		w.Header().Set("Access-Control-Allow-Origin", "*")
+		next.ServeHTTP(w, req)
+	})
+}
+
+// RateLimit is parameterized by the limiter instance, so each module
+// that needs rate limiting owns its own limiter rather than sharing
+// a package-level global.
+func RateLimit(limiter *rate.Limiter) func(http.Handler) http.Handler {
+	return func(next http.Handler) http.Handler {
+		return http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
+			if !limiter.Allow() {
+				log.Println("rate limit exceeded")
+				w.WriteHeader(http.StatusTooManyRequests)
+				return
+			}
+			next.ServeHTTP(w, req)
+		})
+	}
+}

internal/ntfy/ntfy.go

@@ -0,0 +1,45 @@
+package ntfy
+
+import (
+	"bytes"
+	"fmt"
+	"log"
+	"net/http"
+	"time"
+)
+
+type Config struct {
+	URL   string
+	Topic string
+}
+
+// Notify sends a failure notification. Silently does nothing if
+// URL or Topic are unset, so callers don't need to check first.
+func Notify(cfg Config, context string, err error) {
+	if cfg.URL == "" || cfg.Topic == "" {
+		return
+	}
+
+	msg := fmt.Sprintf("%s: %v", context, err)
+	url := fmt.Sprintf("%s/%s", cfg.URL, cfg.Topic)
+
+	req, reqErr := http.NewRequest("POST", url, bytes.NewBufferString(msg))
+	if reqErr != nil {
+		log.Printf("ntfy request build failed: %v", reqErr)
+		return
+	}
+	req.Header.Set("Title", "Varde Notification")
+	req.Header.Set("Priority", "high")
+
+	client := &http.Client{Timeout: 5 * time.Second}
+	resp, sendErr := client.Do(req)
+	if sendErr != nil {
+		log.Printf("ntfy notification failed: %v", sendErr)
+		return
+	}
+	defer resp.Body.Close()
+
+	if resp.StatusCode >= 300 {
+		log.Printf("ntfy notification returned status %d", resp.StatusCode)
+	}
+}

main.go

@@ -1,121 +1,102 @@
 package main
 
 import (
+	"context"
 	"log"
 	"net/http"
 	"os"
-	"strings"
-	"time"
-	"context"
 	"os/signal"
+	"sync"
 	"syscall"
+	"time"
 
 	"github.com/gorilla/mux"
-	"golang.org/x/time/rate"
+
+	"varde/internal/middleware"
+	"varde/modules/keyserver"
+	"varde/modules/webhook"
+	"varde/modules/webserver"
 )
 
-func noListing(next http.Handler) http.Handler {
-	return http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
-		if strings.HasSuffix(req.URL.Path, "/") {
-			http.NotFound(w, req)
-			return
-		}
-		next.ServeHTTP(w, req)
-	})
-}
-
-func securityHeaders(next http.Handler) http.Handler {
-	return http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
-		w.Header().Set("X-Content-Type-Options", "nosniff")
-		w.Header().Set("X-Frame-Options", "DENY")
-		w.Header().Set("Referrer-Policy", "strict-origin-when-cross-origin")
-		next.ServeHTTP(w, req)
-	})
-}
-
-var webhookLimiter = rate.NewLimiter(rate.Every(10*time.Second), 1)
-
-func rateLimit(next http.Handler) http.Handler {
-	return http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
-		if !webhookLimiter.Allow() {
-			log.Println("webhook rate limit exceeded")
-			w.WriteHeader(http.StatusTooManyRequests)
-			return
-		}
-		next.ServeHTTP(w, req)
-	})
-}
-
-func wkdHeaders(next http.Handler) http.Handler {
-	return http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
-		w.Header().Set("Content-Type", "application/octet-stream")
-		w.Header().Set("Access-Control-Allow-Origin", "*")
-		next.ServeHTTP(w, req)
-	})
-}
-
-func healthHandler(w http.ResponseWriter, req *http.Request) {
-	w.WriteHeader(http.StatusOK)
-	w.Write([]byte("ok"))
-}
-
 func main() {
 	cfg := loadConfig()
 
-	if cfg.EnableWebhook {
-		cloneOrOpen(cfg)
-	}
-
-	contentFS	:= http.FileServer(http.Dir(cfg.ContentDir))
-	keysFS 		:= http.FileServer(http.Dir(cfg.KeysDir))
-
-
 	r := mux.NewRouter()
-	r.Use(securityHeaders)
+	r.Use(middleware.SecurityHeaders)
 
+	r.HandleFunc("/api/healthz", healthHandler).Methods("GET", "HEAD")
 
-	api := r.PathPrefix("/api/").Subrouter()
+	var active []Module
-	api.HandleFunc("/healthz", healthHandler).Methods("GET", "HEAD")
 
-	if cfg.EnableWebhook {
+	// Registration order matters: gorilla/mux matches in the order
-		r.Handle("/webhook", rateLimit(webhookHandler(cfg))).Methods("POST")
+	// routes are registered, not by specificity. Webhook and keyserver
+	// use specific paths and must come before webserver's catch-all "/".
+	if cfg.Webhook.Enabled {
+		m := webhook.New(cfg.Webhook, cfg.Ntfy)
+		m.RegisterRoutes(r)
+		active = append(active, m)
+	}
+	if cfg.Keyserver.Enabled {
+		m := keyserver.New(cfg.Keyserver)
+		m.RegisterRoutes(r)
+		active = append(active, m)
+	}
+	if cfg.Webserver.Enabled {
+		m := webserver.New(cfg.Webserver)
+		m.RegisterRoutes(r) // catch-all — must stay last
+		active = append(active, m)
 	}
 
-	// Eigener Bereich für .well-known: kein Listing, WKD-Header
+	ctx, cancel := context.WithCancel(context.Background())
-	wkd := r.PathPrefix("/.well-known/").Subrouter()
-	wkd.Use(noListing)
-	wkd.Use(wkdHeaders)
-	wkd.PathPrefix("/").Handler(keysFS)
 
-	// Alles andere: normaler Fileserver, Listing erlaubt, hier kommt später zB /downloads/ rein
+	var wg sync.WaitGroup
-	r.PathPrefix("/").Handler(contentFS)
+	for _, m := range active {
+		wg.Add(1)
+		go func(m Module) {
+			defer wg.Done()
+			if err := m.Start(ctx); err != nil {
+				log.Printf("module %s: start error: %v", m.Name(), err)
+			}
+		}(m)
+	}
 
 	srv := &http.Server{
 		Addr:    ":" + cfg.Port,
 		Handler: r,
 	}
 
-	// Server in eigener Goroutine starten, damit main() weiterlaufen kann
 	go func() {
-		log.Printf("Listening on :%s, content=%s keys=%s (webhook: %v)", cfg.Port, cfg.ContentDir, cfg.KeysDir, cfg.EnableWebhook)
+		log.Printf("Listening on :%s", cfg.Port)
 		if err := srv.ListenAndServe(); err != nil && err != http.ErrServerClosed {
 			log.Fatalf("server error: %v", err)
 		}
 	}()
 
-	// Auf SIGTERM/SIGINT warten
 	stop := make(chan os.Signal, 1)
 	signal.Notify(stop, syscall.SIGTERM, syscall.SIGINT)
 	<-stop
 
 	log.Println("Shutdown signal received, draining connections...")
+	cancel()
 
-	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+	shutdownCtx, shutdownCancel := context.WithTimeout(context.Background(), 10*time.Second)
-	defer cancel()
+	defer shutdownCancel()
 
-	if err := srv.Shutdown(ctx); err != nil {
+	if err := srv.Shutdown(shutdownCtx); err != nil {
 		log.Printf("graceful shutdown failed: %v", err)
-	} else {
+	}
+
+	for _, m := range active {
+		if err := m.Stop(shutdownCtx); err != nil {
+			log.Printf("module %s: stop error: %v", m.Name(), err)
+		}
+	}
+
+	wg.Wait()
 	log.Println("Server shut down cleanly")
 }
+
+func healthHandler(w http.ResponseWriter, req *http.Request) {
+	w.WriteHeader(http.StatusOK)
+	w.Write([]byte("ok"))
 }

module.go

@@ -0,0 +1,15 @@
+package main
+
+import (
+	"context"
+
+	"github.com/gorilla/mux"
+)
+
+// Module represents a self-contained feature of varde.
+type Module interface {
+	Name() string
+	RegisterRoutes(r *mux.Router)
+	Start(ctx context.Context) error
+	Stop(ctx context.Context) error
+}

modules/keyserver/keyserver.go

@@ -0,0 +1,36 @@
+package keyserver
+
+import (
+	"context"
+	"net/http"
+
+	"github.com/gorilla/mux"
+
+	"varde/internal/middleware"
+)
+
+type Config struct {
+	Enabled bool
+	KeysDir string
+}
+
+type Module struct {
+	cfg Config
+}
+
+func New(cfg Config) *Module {
+	return &Module{cfg: cfg}
+}
+
+func (m *Module) Name() string { return "keyserver" }
+
+func (m *Module) RegisterRoutes(r *mux.Router) {
+	fs := http.FileServer(http.Dir(m.cfg.KeysDir))
+	wkd := r.PathPrefix("/.well-known/").Subrouter()
+	wkd.Use(middleware.NoListing)
+	wkd.Use(middleware.WKDHeaders)
+	wkd.PathPrefix("/").Handler(fs)
+}
+
+func (m *Module) Start(ctx context.Context) error { return nil }
+func (m *Module) Stop(ctx context.Context) error  { return nil }

modules/webhook/webhook.go

@@ -0,0 +1,138 @@
+package webhook
+
+import (
+	"context"
+	"crypto/hmac"
+	"crypto/sha256"
+	"encoding/hex"
+	"io"
+	"log"
+	"net/http"
+	"os"
+	"time"
+
+	"github.com/go-git/go-git/v5"
+	githttp "github.com/go-git/go-git/v5/plumbing/transport/http"
+	"github.com/gorilla/mux"
+	"golang.org/x/time/rate"
+
+	"varde/internal/middleware"
+	"varde/internal/ntfy"
+)
+
+type Config struct {
+	Enabled       bool
+	ContentDir    string
+	RepoURL       string
+	RepoToken     string
+	WebhookSecret string
+}
+
+type Module struct {
+	cfg     Config
+	ntfyCfg ntfy.Config
+	repo    *git.Repository
+	limiter *rate.Limiter
+}
+
+func New(cfg Config, ntfyCfg ntfy.Config) *Module {
+	return &Module{
+		cfg:     cfg,
+		ntfyCfg: ntfyCfg,
+		limiter: rate.NewLimiter(rate.Every(10*time.Second), 1),
+	}
+}
+
+func (m *Module) Name() string { return "webhook" }
+
+func (m *Module) RegisterRoutes(r *mux.Router) {
+	r.Handle("/webhook", middleware.RateLimit(m.limiter)(http.HandlerFunc(m.handleWebhook))).Methods("POST")
+}
+
+// Start clones or opens the content repo. Returns an error instead of
+// calling log.Fatalf directly — a failing webhook module should not
+// necessarily bring down other, unrelated modules in the same process.
+func (m *Module) Start(ctx context.Context) error {
+	return m.cloneOrOpen()
+}
+
+func (m *Module) Stop(ctx context.Context) error { return nil }
+
+func (m *Module) cloneOrOpen() error {
+	auth := &githttp.BasicAuth{
+		Username: "x-token",
+		Password: m.cfg.RepoToken,
+	}
+
+	if _, err := os.Stat(m.cfg.ContentDir + "/.git"); os.IsNotExist(err) {
+		log.Println("webhook: cloning repo...")
+		r, err := git.PlainClone(m.cfg.ContentDir, false, &git.CloneOptions{
+			URL:  m.cfg.RepoURL,
+			Auth: auth,
+		})
+		if err != nil {
+			ntfy.Notify(m.ntfyCfg, "webhook clone failed", err)
+			return err
+		}
+		m.repo = r
+		return nil
+	}
+
+	log.Println("webhook: opening existing repo...")
+	r, err := git.PlainOpen(m.cfg.ContentDir)
+	if err != nil {
+		ntfy.Notify(m.ntfyCfg, "webhook open failed", err)
+		return err
+	}
+	m.repo = r
+	return nil
+}
+
+func (m *Module) pull() error {
+	w, err := m.repo.Worktree()
+	if err != nil {
+		return err
+	}
+	err = w.Pull(&git.PullOptions{
+		Auth: &githttp.BasicAuth{
+			Username: "x-token",
+			Password: m.cfg.RepoToken,
+		},
+	})
+	if err == git.NoErrAlreadyUpToDate {
+		return nil
+	}
+	return err
+}
+
+func validateSignature(secret, signature string, body []byte) bool {
+	mac := hmac.New(sha256.New, []byte(secret))
+	mac.Write(body)
+	expected := hex.EncodeToString(mac.Sum(nil))
+	return hmac.Equal([]byte(expected), []byte(signature))
+}
+
+func (m *Module) handleWebhook(w http.ResponseWriter, r *http.Request) {
+	body, err := io.ReadAll(r.Body)
+	if err != nil {
+		w.WriteHeader(http.StatusBadRequest)
+		return
+	}
+
+	sig := r.Header.Get("X-Gitea-Signature")
+	if !validateSignature(m.cfg.WebhookSecret, sig, body) {
+		log.Println("webhook: invalid signature")
+		w.WriteHeader(http.StatusUnauthorized)
+		return
+	}
+
+	if err := m.pull(); err != nil {
+		ntfy.Notify(m.ntfyCfg, "webhook pull failed", err)
+		log.Printf("webhook: pull failed: %v", err)
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	log.Println("webhook: pulled new content")
+	w.WriteHeader(http.StatusOK)
+}

modules/webserver/webserver.go

@@ -0,0 +1,34 @@
+package webserver
+
+import (
+	"context"
+	"net/http"
+
+	"github.com/gorilla/mux"
+)
+
+type Config struct {
+	Enabled    bool
+	ContentDir string
+}
+
+type Module struct {
+	cfg Config
+}
+
+func New(cfg Config) *Module {
+	return &Module{cfg: cfg}
+}
+
+func (m *Module) Name() string { return "webserver" }
+
+// RegisterRoutes uses a catch-all "/" handler — must be registered
+// LAST in main.go, after any more specific routes (keyserver, webhook),
+// since gorilla/mux matches in registration order.
+func (m *Module) RegisterRoutes(r *mux.Router) {
+	fs := http.FileServer(http.Dir(m.cfg.ContentDir))
+	r.PathPrefix("/").Handler(fs)
+}
+
+func (m *Module) Start(ctx context.Context) error { return nil }
+func (m *Module) Stop(ctx context.Context) error  { return nil }

webhook.go

@@ -1,127 +0,0 @@
-package main
-
-import (
-	"crypto/hmac"
-	"crypto/sha256"
-	"encoding/hex"
-	"io"
-	"log"
-	"net/http"
-	"os"
-	"bytes"
-	"fmt"
-	"time"
-
-	"github.com/go-git/go-git/v5"
-	githttp "github.com/go-git/go-git/v5/plumbing/transport/http"
-)
-
-var repo *git.Repository
-
-func cloneOrOpen(cfg *Config) {
-	auth := &githttp.BasicAuth{
-		Username: "x-token",
-		Password: cfg.RepoToken,
-	}
-
-	if _, err := os.Stat(cfg.ContentDir + "/.git"); os.IsNotExist(err) {
-		log.Println("Cloning repo...")
-		r, err := git.PlainClone(cfg.ContentDir, false, &git.CloneOptions{
-			URL:  cfg.RepoURL,
-			Auth: auth,
-		})
-		if err != nil {
-			notifyFailure(cfg, "clone failed", err)    // NEU
-			log.Fatalf("clone failed: %v", err)
-		}
-		repo = r
-	} else {
-		log.Println("Opening existing repo...")
-		r, err := git.PlainOpen(cfg.ContentDir)
-		if err != nil {
-			notifyFailure(cfg, "open failed", err)     // NEU
-			log.Fatalf("open failed: %v", err)
-		}
-		repo = r
-	}
-}
-
-func pull(cfg *Config) error {
-	w, err := repo.Worktree()
-	if err != nil {
-		return err
-	}
-	err = w.Pull(&git.PullOptions{
-		Auth: &githttp.BasicAuth{
-			Username: "x-token",
-			Password: cfg.RepoToken,
-		},
-	})
-	if err == git.NoErrAlreadyUpToDate {
-		return nil
-	}
-	return err
-}
-
-func validateSignature(secret, signature string, body []byte) bool {
-	mac := hmac.New(sha256.New, []byte(secret))
-	mac.Write(body)
-	expected := hex.EncodeToString(mac.Sum(nil))
-	return hmac.Equal([]byte(expected), []byte(signature))
-}
-
-func webhookHandler(cfg *Config) http.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request) {
-		body, err := io.ReadAll(r.Body)
-		if err != nil {
-			w.WriteHeader(http.StatusBadRequest)
-			return
-		}
-
-		sig := r.Header.Get("X-Gitea-Signature")
-		if !validateSignature(cfg.WebhookSecret, sig, body) {
-			log.Println("invalid webhook signature")
-			w.WriteHeader(http.StatusUnauthorized)
-			return
-		}
-
-		if err := pull(cfg); err != nil {
-			notifyFailure(cfg, "pull failed", err)    // NEU
-			log.Printf("pull failed: %v", err)
-			w.WriteHeader(http.StatusInternalServerError)
-			return
-		}
-
-		log.Println("pulled new content")
-		w.WriteHeader(http.StatusOK)
-	}
-}
-
-func notifyFailure(cfg *Config, context string, err error) {
-	if cfg.NtfyURL == "" || cfg.NtfyTopic == "" {
-		return
-	}
-
-	msg := fmt.Sprintf("%s: %v", context, err)
-	url := fmt.Sprintf("%s/%s", cfg.NtfyURL, cfg.NtfyTopic)
-
-	req, reqErr := http.NewRequest("POST", url, bytes.NewBufferString(msg))
-	if reqErr != nil {
-		log.Printf("ntfy request build failed: %v", reqErr)
-		return
-	}
-	req.Header.Set("Title", "Varde Webhook Failure")
-	req.Header.Set("Priority", "high")
-
-	client := &http.Client{Timeout: 5 * time.Second}
-	resp, sendErr := client.Do(req)
-	if sendErr != nil {
-		log.Printf("ntfy notification failed: %v", sendErr)
-		return
-	}
-	defer resp.Body.Close()
-
-	if resp.StatusCode >= 300 {
-		log.Printf("ntfy notification returned status %d", resp.StatusCode)
-	}
-}