Update to Go-1.25.3

Windows Fehler 0x80072F8F - Installation optionaler Features schlägt fehl

.gitea/workflows/release.yml

@@ -0,0 +1,67 @@
+name: release-tag
+on:
+  push:
+    branches:
+      - 'main'
+jobs:
+  release-image:
+    runs-on: ubuntu-fast
+    env:
+      DOCKER_ORG: ${{ vars.DOCKER_ORG }}
+      DOCKER_LATEST: latest
+      RUNNER_TOOL_CACHE: /toolcache
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker BuildX
+        uses: docker/setup-buildx-action@v2
+        with: # replace it with your local IP
+          config-inline: |
+            [registry."${{ vars.DOCKER_REGISTRY }}"] 
+              http = true
+              insecure = true            
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v2
+        with:
+          registry: ${{ vars.DOCKER_REGISTRY }} # replace it with your local IP
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+          
+      - name: Get Meta
+        id: meta
+        run: |
+          echo REPO_NAME=$(echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $2}') >> $GITHUB_OUTPUT
+          echo REPO_VERSION=$(git describe --tags --always | sed 's/^v//') >> $GITHUB_OUTPUT                
+
+      - name: Build and push
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          file: ./Dockerfile
+          build-args: |
+            CONTENT_REPO=https://git.send.nrw/b1tsblog/blogcontent.git
+            CONTENT_REF=main
+          platforms: |
+            linux/amd64                       
+          push: true
+          tags: | # replace it with your local IP and tags
+            ${{ vars.DOCKER_REGISTRY }}/${{ env.DOCKER_ORG }}/${{ steps.meta.outputs.REPO_NAME }}:${{ steps.meta.outputs.REPO_VERSION }}
+            ${{ vars.DOCKER_REGISTRY }}/${{ env.DOCKER_ORG }}/${{ steps.meta.outputs.REPO_NAME }}:${{ env.DOCKER_LATEST }}
+      - name: Build and push StarCitizen
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          file: ./Dockerfile
+          build-args: |
+            CONTENT_REPO=https://git.send.nrw/b1tsblog/sccontent.git
+            CONTENT_REF=main
+          platforms: |
+            linux/amd64                       
+          push: true
+          tags: | # replace it with your local IP and tags
+            ${{ vars.DOCKER_REGISTRY }}/${{ env.DOCKER_ORG }}/${{ steps.meta.outputs.REPO_NAME }}:sc-${{ env.DOCKER_LATEST }}

.gitea/workflows/staging.yml

@@ -0,0 +1,64 @@
+name: release-tag
+on:
+  push:
+    branches:
+      - 'staging'
+jobs:
+  release-image:
+    runs-on: ubuntu-fast
+    env:
+      DOCKER_ORG: ${{ vars.DOCKER_ORG }}
+      DOCKER_LATEST: staging
+      RUNNER_TOOL_CACHE: /toolcache
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker BuildX
+        uses: docker/setup-buildx-action@v2
+        with: # replace it with your local IP
+          config-inline: |
+            [registry."${{ vars.DOCKER_REGISTRY }}"] 
+              http = true
+              insecure = true            
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v2
+        with:
+          registry: ${{ vars.DOCKER_REGISTRY }} # replace it with your local IP
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+          
+      - name: Get Meta
+        id: meta
+        run: |
+          echo REPO_NAME=$(echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $2}') >> $GITHUB_OUTPUT
+          echo REPO_VERSION=$(git describe --tags --always | sed 's/^v//') >> $GITHUB_OUTPUT                
+
+      - name: Build and push
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          file: ./Dockerfile
+          platforms: |
+            linux/amd64                       
+          push: true
+          tags: | # replace it with your local IP and tags
+            ${{ vars.DOCKER_REGISTRY }}/${{ env.DOCKER_ORG }}/${{ steps.meta.outputs.REPO_NAME }}:${{ steps.meta.outputs.REPO_VERSION }}
+            ${{ vars.DOCKER_REGISTRY }}/${{ env.DOCKER_ORG }}/${{ steps.meta.outputs.REPO_NAME }}:${{ env.DOCKER_LATEST }}
+      - name: Build and push StarCitizen
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          file: ./Dockerfile
+          build-args: |
+            CONTENT_REPO=https://git.send.nrw/b1tsblog/sccontent.git
+            CONTENT_REF=main
+          platforms: |
+            linux/amd64                       
+          push: true
+          tags: | # replace it with your local IP and tags
+            ${{ vars.DOCKER_REGISTRY }}/${{ env.DOCKER_ORG }}/${{ steps.meta.outputs.REPO_NAME }}:sc-${{ env.DOCKER_LATEST }}

Dockerfile

@@ -0,0 +1,70 @@
+############################
+# 1)  Go‑Build
+############################
+FROM golang:1.25 AS build
+
+WORKDIR /app
+COPY go.mod go.sum ./
+RUN go mod download
+COPY . .
+RUN CGO_ENABLED=0 go build -o /blog ./cmd/blog
+
+
+############################
+# 2)  Content‑Clone (Stage)
+############################
+FROM alpine/git AS content
+
+# Parameterisierbar beim docker build --build-arg …
+ARG CONTENT_REPO=https://git.send.nrw/b1tsblog/blogcontent.git
+ARG CONTENT_REF=main
+
+RUN git clone --depth 1 --branch ${CONTENT_REF} ${CONTENT_REPO} /src
+
+# ─── Repack:  bring alles in eine saubere Struktur ────────────────
+#  • Markdown‑Posts:        /articles/*.md        → /out/content
+#  • Bilder + CSS + JS:     /static/**/*          → /out/static
+#  • statische Seiten:      /pages/*              → /out/pages
+#  (Pfad‑Anpassung hier nach DEINEM Repository‑Layout)
+
+RUN mkdir -p /out/content /out/static /out/pages /out/templates/
+RUN find /src/articles -name '*.md' -exec cp {} /out/content/ \;
+RUN cp -r /src/static/* /out/static/
+RUN cp -r /src/pages/* /out/pages/
+RUN cp -r /src/templates/* /out/templates/
+
+
+############################
+# 3)  Runtime‑Image
+############################
+FROM debian:bookworm-slim
+
+# (optional) MySQL‑Client für später
+RUN apt-get update && apt-get install -y --no-install-recommends \
+      ca-certificates git \
+      && rm -rf /var/lib/apt/lists/*
+
+# ─── Binärdatei ─────
+COPY --from=build /blog /usr/local/bin/blog
+
+# ─── Content + Assets ───
+RUN mkdir -p /content /static /pages /app /templates /ticks
+COPY . /app
+COPY --from=content /out/content /content
+COPY --from=content /out/static  /static
+COPY --from=content /out/pages  /pages
+COPY --from=content /out/templates  /templates
+
+ENV BLOG_CONTENT_DIR=/content
+ENV BLOG_STATIC_DIR=/static
+ENV BLOG_PAGES_DIR=/pages
+ENV BLOG_TEMPLATES_DIR=/templates
+ENV BLOG_TICKS_DIR=/ticks
+ENV GIT_ENABLE=false
+ENV GIT_REPO=null
+ENV GIT_BRANCH=main
+ENV GIT_DIR=/git-temp
+ENV GIT_INTERVAL=10
+
+EXPOSE 8080
+CMD ["blog"]

Dockerfile_Slim

@@ -0,0 +1,41 @@
+############################
+# 1)  Go‑Build
+############################
+FROM golang:1.23.1 AS build
+
+WORKDIR /app
+COPY go.mod go.sum ./
+RUN go mod download
+COPY . .
+RUN CGO_ENABLED=0 go build -o /blog ./cmd/blog
+
+############################
+# 3)  Runtime‑Image
+############################
+FROM debian:bookworm-slim
+
+# (optional) MySQL‑Client für später
+RUN apt-get update && apt-get install -y --no-install-recommends \
+      ca-certificates git \
+      && rm -rf /var/lib/apt/lists/*
+
+# ─── Binärdatei ─────
+COPY --from=build /blog /usr/local/bin/blog
+
+# ─── Content + Assets ───
+RUN mkdir -p /content /static /pages /app /templates /ticks /git-temp
+COPY . /app
+
+ENV BLOG_CONTENT_DIR=/content
+ENV BLOG_STATIC_DIR=/static
+ENV BLOG_PAGES_DIR=/pages
+ENV BLOG_TEMPLATES_DIR=/templates
+ENV BLOG_TICKS_DIR=/ticks
+ENV GIT_ENABLE=false
+ENV GIT_REPO=null
+ENV GIT_BRANCH=main
+ENV GIT_DIR=/git-temp
+ENV GIT_INTERVAL=10
+
+EXPOSE 8080
+CMD ["blog"]

README.md

@@ -1,2 +1,25 @@
 # b1tsblog
 
+## B1tsBlog
+
+- Anpassung Datenschutzerklärung
+- Windows Server 2025 Domänen-Controller legt Netzwerkprofil auf Öffentlich fest
+- TLS-Zertifikat mit SHA3 auf Windows Server 2016 einspielen
+- Warum personenbezogene Daten nie in die Betreffzeile einer E-Mail gehören
+- Warum meldet der Client, dass die Default Domain Policy nicht gelesen werden kann
+- Open Source als Innovationsmotor: Warum Unternehmen auf offene Software setzen
+- Neue Blogserie: Open Source im Unternehmen
+- Optimiert für schnelleres Laden mit webp-Inhalten
+- docker-swarm-mit-abweichendem-port-einrichten
+- Content-Update 2025-05-05
+- PHPMyAdmin mit Serverauswahl im Homelab mittels Docker bereitstellen
+- Windows Fehler 0x80072F8F - Installation optionaler Features schlägt fehl
+- In Ubuntu den Port 53 - DNS - selber nutzen
+- Ein eigenes Docker-Image erstellen - so geht's
+- Der eigene DNS-Server im Homelab
+- Content-Update 2025-05-04
+
+## B1ts Star Citizen Blog
+
+- Anpassung Datenschutzerklärung
+- Invictus 2955 - Das Jahr der Idris-P?

cmd/blog/main.go

@@ -0,0 +1,424 @@
+package main
+
+import (
+	"encoding/json"
+	"fmt"
+	"html/template"
+	"io"
+	"net/http"
+	"os"
+	"os/exec"
+	"os/signal"
+	"path/filepath"
+	"strconv"
+	"strings"
+	"syscall"
+	"time"
+
+	"git.send.nrw/sendnrw/b1tsblog/internal/article"
+)
+
+var TickCatalog []TickEntry
+
+func SaveTickCatalog(filename string) error {
+	file, err := os.Create(filename)
+	if err != nil {
+		return err
+	}
+	defer file.Close()
+
+	encoder := json.NewEncoder(file)
+	encoder.SetIndent("", "  ")
+	return encoder.Encode(TickCatalog)
+}
+
+func LoadTickCatalog(filename string) error {
+	file, err := os.Open(filename)
+	if err != nil {
+		return err
+	}
+	defer file.Close()
+
+	return json.NewDecoder(file).Decode(&TickCatalog)
+}
+
+func IncTick(xSlug string) error {
+	for a, b := range TickCatalog {
+		if b.Slug == xSlug {
+			TickCatalog[a].Count = TickCatalog[a].Count + 1
+			return nil
+		}
+	}
+	newEntry := TickEntry{Slug: xSlug, Count: 1}
+	TickCatalog = append(TickCatalog, newEntry)
+	return fmt.Errorf("")
+}
+
+func getTick(xSlug string) string {
+	for _, b := range TickCatalog {
+		if b.Slug == xSlug {
+			var n int64 = b.Count
+			return strconv.FormatInt(n, 10)
+		}
+	}
+	return "0"
+}
+
+type TickEntry struct {
+	Slug  string `json:"slug"`
+	Count int64  `json:"count"`
+}
+
+func getenv(k, d string) string {
+	if v := os.Getenv(k); v != "" {
+		return v
+	}
+	return d
+}
+
+func enabled(k string, def bool) bool {
+	b, err := strconv.ParseBool(strings.ToLower(os.Getenv(k)))
+	if err != nil {
+		return def
+	}
+	return b
+}
+
+func cacheControl(next http.Handler) http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		w.Header().Set("Cache-Control", "public, max-age=31536000, immutable")
+		next.ServeHTTP(w, r)
+	})
+}
+
+var (
+	tplList    *template.Template
+	tplArticle *template.Template
+)
+
+var Xarticles []article.Article
+
+func main() {
+
+	// Signal-Kanal einrichten
+	stop := make(chan os.Signal, 1)
+	signal.Notify(stop, syscall.SIGINT, syscall.SIGTERM)
+
+	// Goroutine, die auf Signale wartet
+	go func() {
+		<-stop
+		fmt.Println("Stop Sign...")
+		prepareExit()
+		os.Exit(0)
+	}()
+
+	// --- Verzeichnisse konfigurierbar machen -------------------------
+	contentDir := getenv("BLOG_CONTENT_DIR", "/content")
+	staticDir := getenv("BLOG_STATIC_DIR", "/app/internal/web/static")
+	pagesDir := getenv("BLOG_PAGES_DIR", "/pages")
+	templatesDir := getenv("BLOG_TEMPLATES_DIR", "/templates")
+	storeEnabled := enabled("STORE_ENABLE", false)
+	ticksDir := getenv("BLOG_TICKS_DIR", "/ticks")
+	gitEnable := enabled("GIT_ENABLE", false)
+	gitRepo := getenv("GIT_REPO", "null")
+	gitBranch := getenv("GIT_BRANCH", "main")
+	gitDir := getenv("GIT_DIR", "/git-temp")
+	gitInterval := getenv("GIT_INTERVAL", "10")
+
+	TickCatalog = nil
+	if err := LoadTickCatalog(ticksDir + "/ticks.json"); err != nil {
+		fmt.Println("Fehler beim Laden:", err)
+	}
+
+	fmt.Println("Geladener Katalog:", TickCatalog)
+
+	cloneRepo(gitRepo, gitBranch, gitDir)
+
+	funcs := template.FuncMap{
+		"now": time.Now, // jetzt‑Zeit bereitstellen
+	}
+
+	// Basislayout zuerst parsen
+	layout := template.Must(template.New("base").Funcs(funcs).ParseFiles(templatesDir + "/base.html"))
+
+	var tplStore *template.Template
+	if storeEnabled {
+		tplStore = template.Must(template.New("store").Funcs(funcs).ParseFiles(templatesDir + "/store.html"))
+	}
+
+	// LIST‑Seite:   base + list.html
+	tplList = template.Must(layout.Clone())
+	template.Must(tplList.Funcs(funcs).ParseFiles(templatesDir + "/list.html"))
+
+	// ARTICLE‑Instanz
+	tplArticle = template.Must(layout.Clone())
+	template.Must(tplArticle.Funcs(funcs).ParseFiles(templatesDir + "/article.html"))
+
+	tplPage := template.Must(layout.Clone())
+	template.Must(tplPage.ParseFiles(templatesDir + "/page.html"))
+
+	mux := http.NewServeMux()
+
+	articles, err := article.LoadDir(contentDir)
+	if err != nil {
+		fmt.Println(err)
+	}
+
+	Xarticles = articles
+
+	staticPages, err := article.LoadStatic(pagesDir)
+	if err != nil {
+		fmt.Println(err)
+	} else {
+		fmt.Println(staticPages)
+	}
+
+	// Handler für /
+	mux.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
+		if r.URL.Path != "/" {
+			http.NotFound(w, r)
+			return
+		}
+
+		/*  */
+
+		for a, b := range Xarticles {
+			Xarticles[a].Counter = getTick(b.Slug)
+		}
+
+		/*  */
+
+		if err := tplList.ExecuteTemplate(w, "layout", article.ListPage{
+			Title:       "Startseite",
+			Description: "Alle Artikel im Überblick",
+			Articles:    Xarticles,
+		}); err != nil {
+			http.Error(w, err.Error(), 500)
+		}
+	})
+
+	mux.HandleFunc("/post/", func(w http.ResponseWriter, r *http.Request) {
+		slug := strings.TrimPrefix(r.URL.Path, "/post/")
+		for _, a := range Xarticles {
+			if a.Slug == slug {
+				IncTick(slug)
+				t := getTick(slug)
+				a.Counter = t
+				if err := tplArticle.ExecuteTemplate(w, "layout", a); err != nil {
+					http.Error(w, err.Error(), 500)
+				}
+				return
+			}
+		}
+		http.NotFound(w, r)
+	})
+
+	mux.HandleFunc("/page/", func(w http.ResponseWriter, r *http.Request) {
+		slug := strings.TrimPrefix(r.URL.Path, "/page/")
+		p, ok := staticPages[slug]
+		if !ok {
+			http.NotFound(w, r)
+			return
+		}
+		// "layout" kommt aus deinem Template‑Pool (list/article nutzen es ja auch)
+		if err := tplPage.ExecuteTemplate(w, "page", p); err != nil {
+			http.Error(w, err.Error(), 500)
+		}
+	})
+
+	mux.Handle("/static/", cacheControl(http.StripPrefix("/static/", http.FileServer(http.Dir(staticDir)))))
+
+	mux.HandleFunc("/store", func(w http.ResponseWriter, r *http.Request) {
+		if storeEnabled {
+			if err := tplStore.ExecuteTemplate(w, "store", nil); err != nil {
+				http.Error(w, err.Error(), 500)
+			}
+		} else {
+			http.NotFound(w, r)
+		}
+
+	})
+
+	if gitEnable {
+		xMinute, _ := strconv.Atoi(gitInterval)
+		xDuration := time.Duration(xMinute) * time.Minute
+		go startAutoClone(gitRepo, gitBranch, gitDir, xDuration)
+	}
+
+	StopServer(http.ListenAndServe(":8080", mux))
+
+}
+
+func prepareExit() {
+	fmt.Println("~", "Running exit tasks...")
+	if err := SaveTickCatalog(getenv("BLOG_TICKS_DIR", "/ticks") + "/ticks.json"); err != nil {
+		fmt.Println("Fehler beim Speichern:", err)
+	}
+	fmt.Println("Geladener Katalog:", TickCatalog)
+	fmt.Println("~", "Exit completed.")
+}
+
+func StopServer(e error) {
+	fmt.Println("~", "Stopping server...")
+	prepareExit()
+	fmt.Println("~", "Server stopped!")
+}
+
+func cloneRepo(repoURL, branch, dir string) {
+	fmt.Printf("Starte Klonvorgang für Branch '%s'...\n", branch)
+
+	// Verzeichnis löschen
+	if err := os.RemoveAll(dir); err != nil {
+		fmt.Println("Fehler beim Löschen des Verzeichnisses:", err)
+		return
+	}
+
+	// Git-Clone mit Branch
+	cmd := exec.Command("git", "clone", "--branch", branch, "--single-branch", repoURL, dir)
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stderr
+
+	if err := cmd.Run(); err != nil {
+		fmt.Println("Fehler beim Klonen:", err)
+	} else {
+		fmt.Println("Repo erfolgreich geklont.")
+	}
+
+	contentDir := getenv("BLOG_CONTENT_DIR", "/content")
+
+	err := os.RemoveAll("/content")
+	if err != nil {
+		fmt.Println(err, "/content")
+	}
+
+	err = os.RemoveAll("/static")
+	if err != nil {
+		fmt.Println(err, "/static")
+	}
+
+	err = os.RemoveAll("/pages")
+	if err != nil {
+		fmt.Println(err, "/pages")
+	}
+
+	err = os.RemoveAll("/templates")
+	if err != nil {
+		fmt.Println(err, "/templates")
+	}
+
+	if err := os.MkdirAll("/content", 0755); err != nil {
+		fmt.Println("Fehler beim Erstellen des Zielordners:", err)
+		return
+	}
+
+	if err := os.MkdirAll("/static", 0755); err != nil {
+		fmt.Println("Fehler beim Erstellen des Zielordners:", err)
+		return
+	}
+
+	if err := os.MkdirAll("/pages", 0755); err != nil {
+		fmt.Println("Fehler beim Erstellen des Zielordners:", err)
+		return
+	}
+
+	if err := os.MkdirAll("/templates", 0755); err != nil {
+		fmt.Println("Fehler beim Erstellen des Zielordners:", err)
+		return
+	}
+
+	if err := copyDirContents("/git-temp/articles", "/content"); err != nil {
+		fmt.Println("Fehler beim Kopieren:", err)
+	} else {
+		fmt.Println("Kopieren abgeschlossen.")
+	}
+
+	if err := copyDirContents("/git-temp/static", "/static"); err != nil {
+		fmt.Println("Fehler beim Kopieren:", err)
+	} else {
+		fmt.Println("Kopieren abgeschlossen.")
+	}
+
+	if err := copyDirContents("/git-temp/pages", "/pages"); err != nil {
+		fmt.Println("Fehler beim Kopieren:", err)
+	} else {
+		fmt.Println("Kopieren abgeschlossen.")
+	}
+
+	if err := copyDirContents("/git-temp/templates", "/templates"); err != nil {
+		fmt.Println("Fehler beim Kopieren:", err)
+	} else {
+		fmt.Println("Kopieren abgeschlossen.")
+	}
+
+	articles, err := article.LoadDir(contentDir)
+	if err != nil {
+		fmt.Println(err)
+	}
+
+	Xarticles = articles
+
+}
+
+func copyDirContents(srcDir, destDir string) error {
+	entries, err := os.ReadDir(srcDir)
+	if err != nil {
+		return fmt.Errorf("Fehler beim Lesen von %s: %w", srcDir, err)
+	}
+
+	for _, entry := range entries {
+		srcPath := filepath.Join(srcDir, entry.Name())
+		destPath := filepath.Join(destDir, entry.Name())
+
+		info, err := entry.Info()
+		if err != nil {
+			return err
+		}
+
+		if info.IsDir() {
+			if err := os.MkdirAll(destPath, info.Mode()); err != nil {
+				return fmt.Errorf("Fehler beim Erstellen von Ordner %s: %w", destPath, err)
+			}
+			// rekursiv kopieren
+			if err := copyDirContents(srcPath, destPath); err != nil {
+				return err
+			}
+		} else {
+			if err := copyFile(srcPath, destPath, info); err != nil {
+				return err
+			}
+		}
+	}
+
+	return nil
+}
+
+func copyFile(src, dest string, info os.FileInfo) error {
+	in, err := os.Open(src)
+	if err != nil {
+		return err
+	}
+	defer in.Close()
+
+	out, err := os.Create(dest)
+	if err != nil {
+		return err
+	}
+	defer out.Close()
+
+	if _, err := io.Copy(out, in); err != nil {
+		return err
+	}
+
+	return os.Chmod(dest, info.Mode())
+}
+
+func startAutoClone(repoURL, branch, dir string, interval time.Duration) {
+	go cloneRepo(repoURL, branch, dir) // sofortiger Start
+
+	ticker := time.NewTicker(interval)
+	defer ticker.Stop()
+
+	for range ticker.C {
+		go cloneRepo(repoURL, branch, dir)
+	}
+}

go.mod

@@ -0,0 +1,5 @@
+module git.send.nrw/sendnrw/b1tsblog
+
+go 1.25.3
+
+require github.com/gomarkdown/markdown v0.0.0-20250311123330-531bef5e742b

go.sum

@@ -0,0 +1,2 @@
+github.com/gomarkdown/markdown v0.0.0-20250311123330-531bef5e742b h1:EY/KpStFl60qA17CptGXhwfZ+k1sFNJIUNR8DdbcuUk=
+github.com/gomarkdown/markdown v0.0.0-20250311123330-531bef5e742b/go.mod h1:JDGcbDT52eL4fju3sZ4TeHGsQwhG9nbDV21aMyhwPoA=

internal/article/load.go

@@ -0,0 +1,199 @@
+// internal/article/load.go
+package article
+
+// internal/article/load.go  (gekürzt)
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+	"html/template"
+	"io/fs"
+	"os"
+	"path/filepath"
+	"sort"
+	"strings"
+	"time"
+
+	md "github.com/gomarkdown/markdown"
+	"github.com/gomarkdown/markdown/html"
+)
+
+// LoadDir liest alle *.html und *.md unter root/content,
+// parst Front‑Matter (JSON‑Kommentar in der 1. Zeile) und liefert []Article.
+func LoadDir(root string) ([]Article, error) {
+	var out []Article
+	seen := make(map[string]bool) // Duplikats‑Check
+
+	mdRenderer := html.NewRenderer(html.RendererOptions{
+		Flags: html.CommonFlags | html.HrefTargetBlank,
+	})
+
+	err := filepath.WalkDir(root, func(path string, d fs.DirEntry, walkErr error) error {
+		if walkErr != nil {
+			return walkErr
+		}
+		if d.IsDir() {
+			return nil
+		}
+
+		ext := strings.ToLower(filepath.Ext(path))
+		if ext != ".md" && ext != ".html" {
+			return nil // uninteressante Datei
+		}
+
+		raw, err := os.ReadFile(path)
+		if err != nil {
+			return fmt.Errorf("read %s: %w", path, err)
+		}
+
+		parts := bytes.SplitN(raw, []byte("\n"), 2)
+		if len(parts) < 2 {
+			return fmt.Errorf("%s: missing front‑matter", path)
+		}
+
+		headerJSON, err := extractJSONHeader(parts[0])
+		if err != nil {
+			return fmt.Errorf("%s: %w", path, err)
+		}
+
+		var meta struct {
+			Title       string `json:"title"`
+			Date        string `json:"date"`
+			Slug        string `json:"slug"`
+			Cover       string `json:"cover"`
+			Description string `json:"description"`
+		}
+		if err := json.Unmarshal(headerJSON, &meta); err != nil {
+			return fmt.Errorf("%s: %w", path, err)
+		}
+
+		// Fallback‑Slug aus Dateinamen
+		if meta.Slug == "" {
+			meta.Slug = strings.TrimSuffix(filepath.Base(path), ext)
+		}
+		if seen[meta.Slug] {
+			return fmt.Errorf("%s: duplicate slug %q", path, meta.Slug)
+		}
+		seen[meta.Slug] = true
+
+		body := parts[1]
+		if ext == ".md" {
+			body = md.ToHTML(body, nil, mdRenderer) // frischer Parser pro Call
+		}
+
+		date, err := time.Parse("2006-01-02", meta.Date)
+		if err != nil {
+			return fmt.Errorf("%s: parse date: %w", path, err)
+		}
+
+		out = append(out, Article{
+			Title:       meta.Title,
+			Slug:        meta.Slug,
+			Date:        date,
+			Cover:       meta.Cover,
+			Description: meta.Description,
+			Body:        template.HTML(body),
+		})
+		return nil
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	sort.Slice(out, func(i, j int) bool { return out[i].Date.After(out[j].Date) })
+	return out, nil
+}
+
+// ---------- NEU ----------
+type StaticPage struct {
+	Title       string
+	Slug        string
+	Description string
+	Body        template.HTML
+}
+
+// helper.go – einmal zentral verwenden
+func extractJSONHeader(line []byte) ([]byte, error) {
+	s := strings.TrimSpace(string(line))
+	s = strings.TrimPrefix(s, "<!--")
+
+	// alles bis zum ersten "-->" abschneiden
+	if idx := strings.Index(s, "-->"); idx != -1 {
+		s = s[:idx]
+	}
+	s = strings.TrimSpace(s)
+
+	// optional: falls doch kein JSON, besserer Fehler
+	if !strings.HasPrefix(s, "{") {
+		return nil, fmt.Errorf("no JSON front‑matter found")
+	}
+	return []byte(s), nil
+}
+
+// LoadStatic liest alle .md/.html‑Dateien unter dir und liefert sie als Map[slug]StaticPage.
+func LoadStatic(dir string) (map[string]StaticPage, error) {
+	pages := make(map[string]StaticPage)
+
+	entries, err := os.ReadDir(dir)
+	if err != nil {
+		return nil, err
+	}
+
+	for _, e := range entries {
+		if e.IsDir() {
+			continue
+		}
+		ext := filepath.Ext(e.Name())
+		if ext != ".md" && ext != ".html" {
+			continue // unbekanntes Format
+		}
+
+		path := filepath.Join(dir, e.Name())
+		raw, err := os.ReadFile(path)
+		if err != nil {
+			return nil, fmt.Errorf("read %s: %w", path, err)
+		}
+
+		// Front‑Matter (erste Zeile) herauslösen
+		parts := bytes.SplitN(raw, []byte("\n"), 2)
+		if len(parts) < 2 {
+			return nil, fmt.Errorf("%s: missing front‑matter", path)
+		}
+
+		headerJSON, err := extractJSONHeader(parts[0])
+		if err != nil {
+			return nil, fmt.Errorf("%s: %w", path, err)
+		}
+
+		var meta struct {
+			Title       string `json:"title"`
+			Slug        string `json:"slug"`
+			Description string `json:"description"`
+		}
+		if err := json.Unmarshal(headerJSON, &meta); err != nil {
+			return nil, fmt.Errorf("%s: %w", path, err)
+		}
+
+		// Fallback: Slug aus Dateinamen ableiten, falls im Header leer
+		if meta.Slug == "" {
+			meta.Slug = strings.TrimSuffix(e.Name(), ext)
+		}
+		if _, dup := pages[meta.Slug]; dup {
+			return nil, fmt.Errorf("%s: duplicate slug %q", path, meta.Slug)
+		}
+
+		body := parts[1]
+		if ext == ".md" {
+			body = md.ToHTML(body, nil, nil) // eigener Parser je Aufruf
+		}
+
+		pages[meta.Slug] = StaticPage{
+			Title:       meta.Title,
+			Slug:        meta.Slug,
+			Description: meta.Description,
+			Body:        template.HTML(body),
+		}
+	}
+	return pages, nil
+}

internal/article/model.go

@@ -0,0 +1,23 @@
+// internal/article/model.go
+package article
+
+import (
+	"html/template"
+	"time"
+)
+
+type Article struct {
+	Title       string
+	Slug        string
+	Date        time.Time
+	Cover       string
+	Body        template.HTML
+	Description string
+	Counter     string
+}
+
+type ListPage struct {
+	Title       string
+	Description string
+	Articles    []Article
+}

internal/web/static/main.css

@@ -0,0 +1,182 @@
+/* ---------- Local Web‑Fonts ---------- */
+@font-face {
+  font-family: "Fira Code";
+  src: url("/static/fonts/FiraCode-VariableFont.woff2") format("woff2");
+  font-weight: 400 700;
+  font-style: normal;
+  font-display: swap;
+}
+@font-face {
+  font-family: "Inter";
+  src: url("/static/fonts/Inter-VariableFont.woff2") format("woff2");
+  font-weight: 100 900;
+  font-style: normal;
+  font-display: swap;
+}
+
+/* ---------- Farbpalette ---------- */
+:root {
+  /* Light theme */
+  --bg:            #f5f7fa;
+  --bg-alt:        #ffffff;
+  --card-bg:       #ffffff;
+  --text:          #000000;
+  --text-muted:    #1f2933;
+  --accent:        #2563eb;            /* Indigo‑600  */
+  --accent-light:  #3b82f6;            /* Indigo‑500  */
+  --code-bg:       #f1f5f9;
+  --code-border:   #e2e8f0;
+  --radius:        0.75rem;
+  --gap:           2rem;
+  --shadow:        0 4px 16px rgba(0,0,0,.08);
+  font-size: 16px;
+  font-family: "Inter", system-ui, sans-serif;
+  color-scheme: light;
+}
+
+/* Dark mode (optional) */
+@media (prefers-color-scheme: dark) {
+  :root {
+    --bg:          #0d1117;
+    --bg-alt:      #161b22;
+    --card-bg:     #161b22;
+    --text:        #ffffff;
+    --text-muted:  #e4e8ec;
+    --accent:      #3b82f6;
+    --accent-light:#60a5fa;
+    --code-bg:     #1e242c;
+    --code-border: #30363d;
+    --shadow:      0 4px 16px rgba(0,0,0,.32);
+  }
+}
+
+/* ---------- Grundlayout ---------- */
+* { box-sizing: border-box; }
+body {
+  margin: 0;
+  background: var(--bg);
+  color: var(--text);
+  line-height: 1.65;
+}
+a {
+  color: var(--accent);
+  text-decoration: underline dotted;
+  transition: color .15s;
+}
+a:hover { color: var(--accent-light); }
+
+a.no-underline {
+  text-decoration: none;
+}
+
+/* Container in der Mitte */
+.wrapper {
+  max-width: 1200px;
+  margin: 0 auto;
+  padding: var(--gap) calc(var(--gap) / 1.5);
+}
+
+img.footer {
+  max-width: 150px;
+  max-height: 60px; /* oder ein anderer fixer Wert, z. B. 500px */
+  width: auto;
+  height: auto;
+}
+
+/* ---------- Kopf & Fuß ---------- */
+header, footer {
+  background: var(--bg-alt);
+  box-shadow: var(--shadow);
+}
+header {
+  position: sticky; top: 0; z-index: 10;
+  display: flex; justify-content: space-between; align-items: center;
+  padding: 10px calc(var(--gap) / 1.2);
+}
+header h1 { margin: 0; font-size: 1.4rem; }
+footer {
+  text-align: center;
+  padding: 2rem 1rem;
+  color: var(--text-muted);
+  font-size: .9rem;
+  margin-top: var(--gap);
+}
+
+/* ---------- Karten‑Grid ---------- */
+.post-list {
+  display: grid;
+  gap: var(--gap);
+  grid-template-columns: repeat(auto-fill, minmax(280px, 1fr));
+  list-style: none;
+  padding: 0;
+  margin: 0;
+}
+.card {
+  display: flex;
+  flex-direction: column;
+  background: var(--card-bg);
+  border-radius: var(--radius);
+  box-shadow: var(--shadow);
+  overflow: hidden;
+  transition: transform .2s ease, box-shadow .2s ease;
+}
+.card:hover { transform: translateY(-6px); box-shadow: 0 6px 24px rgba(0,0,0,.1); }
+.card img {
+  width: 100%; height: 180px; object-fit: cover;
+}
+.card-content { padding: 1rem 1.25rem 1.5rem; }
+.card h2 { margin: .25rem 0 .5rem; font-size: 1.25rem; line-height: 1.3; }
+.card time { color: var(--text-muted); font-size: .85rem; }
+
+/* ---------- Artikel ---------- */
+.hero {
+  width: 100%; height: 320px; object-fit: cover;
+  border-radius: var(--radius);
+  box-shadow: var(--shadow);
+}
+article h1 { font-size: 2.2rem; margin: 1.2rem 0 .3rem; }
+article time { color: var(--text-muted); font-size: .9rem; }
+article img:not(.hero), article video {
+  max-width: 100%; height: auto; border-radius: var(--radius);
+  box-shadow: var(--shadow);
+  margin: 1rem 0;
+}
+article pre {
+  background: var(--code-bg);
+  border: 1px solid var(--code-border);
+  padding: 1rem 1.2rem;
+  border-radius: var(--radius);
+  overflow: auto;
+  font-family: "Fira Code", Consolas, monospace;
+}
+article blockquote {
+  border-left: 4px solid var(--accent);
+  padding: .5rem 1rem; margin: 1rem 0;
+  background: var(--code-bg);
+  color: var(--text-muted);
+}
+code {
+  background: var(--code-bg);
+  color: var(--text-muted);
+}
+.main-nav ul {
+  display: flex;
+  gap: 1.25rem;
+  list-style: none;
+  margin: 0;
+  padding: 0;
+}
+.main-nav a {
+  font-weight: 600;
+  color: var(--text);
+}
+.main-nav a:hover {
+  color: var(--accent);
+}
+
+/* ---------- Responsive ---------- */
+@media (max-width: 640px) {
+  :root { font-size: 15px; }
+  .hero { height: 200px; }
+  header { flex-direction: column; gap: .5rem; }
+}

internal/web/templates/article.html

@@ -0,0 +1,20 @@
+{{ define "title" }}{{ .Title }} – B1tsblog{{ end }}
+
+{{ define "body" }}
+<article>
+  {{ if .Cover }}
+    <img class="hero" src="{{ .Cover }}" alt="">
+  {{ end }}
+  <p><a class="no-underline" href="/">← Zurück zur Übersicht</a></p>
+  <h1>{{ .Title }}</h1>
+  <time datetime="{{ .Date.Format "2006-01-02" }}">{{ .Date.Format "02.01.2006" }}</time>
+
+  <div class="article-content">
+    {{ .Body }}
+  </div>
+
+  <p><a class="no-underline" href="/">← Zurück zur Übersicht</a></p>
+</article>
+{{ end }}
+
+{{ define "article" }}{{ template "layout" . }}{{ end }}

internal/web/templates/base.html

@@ -0,0 +1,39 @@
+{{ define "layout" }}
+<!DOCTYPE html>
+<html lang="de">
+    <head>
+        <meta charset="utf-8">
+        <meta name="viewport" content="width=device-width,initial-scale=1">
+        {{ if .Description }}
+        <meta name="description" content="{{ .Description }}">
+        {{ end }}
+        <title>{{ block "title" . }}B1tsblog{{ end }}</title>
+        <link rel="icon" type="image/vnd.icon" href="/static/img/favicon.ico">
+        <link rel="stylesheet" href="/static/main.css">
+    </head>
+    <body>
+        <header>
+        <h1><a href="/" class="no-underline">B1tsblog</a></h1>
+        <nav class="main-nav">
+            <ul>
+                <li><a class="no-underline" href="/">Start</a></li>
+                <li><a class="no-underline" href="/page/welcome">Hallo</a></li>
+                <li><a class="no-underline" href="/page/ai">KI</a></li>
+                <li><a class="no-underline" href="/page/datenschutzerklaerung">Datenschutz</a></li>
+                <li><a class="no-underline" href="/page/impressum">Impressum</a></li>
+              </ul>
+        </nav>
+        </header>
+        
+        <main class="wrapper">
+        {{ template "body" . }}
+        </main>
+        
+        <footer class="wrapper">
+        © {{ now.Year }} · Jan Bergner / B1tsBlog
+        <hr>
+        Ich verzichte auf Cookies, affiliate Links, Tracking und die Einbindung von Drittanbieter-Diensten.
+        </footer>
+    </body>
+</html>
+{{ end }}

internal/web/templates/list.html

@@ -0,0 +1,19 @@
+{{ define "body" }}
+<ul class="post-list">
+  {{ range .Articles  }}
+    <li>
+      <a class="card no-underline" href="/post/{{ .Slug }}">
+        {{ if .Cover }}
+          <img src="{{ .Cover }}" alt="">
+        {{ else }}
+          <img src="/static/img/placeholder.webp" alt="">
+        {{ end }}
+        <div class="card-content">
+          <h2>{{ .Title }}</h2>
+          <time datetime="{{ .Date.Format "2006-01-02" }}">{{ .Date.Format "02.01.2006" }}</time> ({{ .Counter }})
+        </div>
+      </a>
+    </li>
+  {{ end }}
+</ul>
+{{ end }}

internal/web/templates/page.html

@@ -0,0 +1,12 @@
+{{ define "title" }}{{ .Title }} – B1tsblog{{ end }}
+
+{{ define "body" }}
+  <article>
+    <p><a class="no-underline" href="/">← Zurück</a></p>
+    <h1>{{ .Title }}</h1>
+    <div class="article-content">{{ .Body }}</div>
+    <p><a class="no-underline" href="/">← Zurück</a></p>
+  </article>
+{{ end }}
+
+{{ define "page" }}{{ template "layout" . }}{{ end }}

pages/impressum.md

@@ -0,0 +1,6 @@
+<!--{"title": "Impressum", "slug": "impressum"}-->
+Max Mustermann  
+Musterstraße 1  
+12345 Musterstadt
+
+E‑Mail: max@example.com