Merge pull request 'upgrade Caddy to v2.11.1' (#8) from caddy into main

Reviewed-on: #8

Caddyfile

@@ -1,9 +1,14 @@
 {
-    default_sni web
+	default_sni web
 }
 
 https:// {
-    tls /tls/tls.crt /tls/tls.key
-    root * /srv
-    file_server
+	tls /tls/tls.crt /tls/tls.key
+	root * /srv
+	file_server
+}
+
+http:// {
+	root * /srv
+	file_server
 }

Dockerfile

@@ -1,6 +1,6 @@
 # Package versions
-ARG HUGO_VERSION="0.152.2"
-ARG CADDY_VERSION="2.10.2"
+ARG HUGO_VERSION="0.155.3"
+ARG CADDY_VERSION="2.11.1"
 
 # Stage 1: Build
 FROM core.harbor.brds.ca/d-b.ca/hugo-builder:${HUGO_VERSION} AS builder

config/_default/menus.en.toml

@@ -67,3 +67,7 @@
 #   name = "Categories"
 #   pageRef = "categories"
 #   weight = 20
+
+[[footer]]
+  name = "Privacy"
+  url = "https://comment.d-b.ca/web/privacy.html"

config/_default/params.toml

@@ -56,6 +56,7 @@ forgejoDefaultServer = "https://v8.next.forgejo.org"
   showDate = true
   showViews = false
   showLikes = false
+  showComments = true
   showDateOnlyInArticle = false
   showDateUpdated = false
   showAuthor = true
@@ -164,4 +165,10 @@ forgejoDefaultServer = "https://v8.next.forgejo.org"
 
 [rssnext]
   # feedId = ""
-  # userId = ""
+  # userId = ""
+
+[remark42]
+  enabled = true
+  host = "https://comment.d-b.ca"
+  site = "d-b.ca"
+  locale = "en"

go.mod

@@ -2,4 +2,4 @@ module git.brds.ca/drew/web
 
 go 1.25.4
 
-require github.com/nunocoracao/blowfish/v2 v2.92.0 // indirect
+require github.com/nunocoracao/blowfish/v2 v2.98.0 // indirect

go.sum

@@ -1,2 +1,2 @@
-github.com/nunocoracao/blowfish/v2 v2.92.0 h1:1EgHMRaY6VI438TIAN/5luNx16lg1e0Lrbi+6kDxpdA=
-github.com/nunocoracao/blowfish/v2 v2.92.0/go.mod h1:4SkMc+Ht8gpQCwArqiHMBDP3soxi2OWuAhVney+cuyk=
+github.com/nunocoracao/blowfish/v2 v2.98.0 h1:2k/f19NwAlhEIq08WOOgbYB4LlzWF2YEhoDoflSH0eU=
+github.com/nunocoracao/blowfish/v2 v2.98.0/go.mod h1:4SkMc+Ht8gpQCwArqiHMBDP3soxi2OWuAhVney+cuyk=

layouts/partials/comments.html

@@ -0,0 +1,28 @@
+{{- with .Site.Params.remark42 -}}
+<hr>
+<p><b>Comments and questions are welcome!</b> <i>You can use your email address to Sign In (your email address is not publicly displayed), or you can use your Google or GitHub account. All comment data is hosted locally by d-b.ca and is not tracked. Please refer to the <a href='https://remark42.com' target="_blank"><b>Remark42</b></a> <a href='https://remark42.com/privacy/' target="_blank">Privacy Policy</a> for more information.</i></p>
+<div id="remark42"></div>
+<script>
+    var remark_config = {
+        host: '{{ .host }}',
+        site_id: '{{ .site }}',
+        components: ['embed'],
+        url: '{{ $.Permalink }}',
+        theme: document.documentElement.classList.contains("dark") ? 'dark' : 'light',
+    };
+
+    document.getElementById("appearance-switcher").addEventListener('click', event => {
+        window.REMARK42.changeTheme(document.documentElement.classList.contains("dark") ? 'light' : 'dark');
+    });
+
+    !function(e, n) {
+        for (var o = 0; o < e.length; o++) {
+            var r = n.createElement('script'),
+            c = '.js',
+            d = n.head || n.body;
+            'noModule' in r ? (r.type = 'module', c = '.mjs') : r.async = !0, r.defer = !0, r.src = remark_config.host + '/web/' + e[o] + c, d.appendChild(r)
+        }
+    }(remark_config.components || ['embed'], document);
+
+</script>
+{{- end -}}