diff --git a/.github/workflows/cloudflare-pages-preview.yml b/.github/workflows/cloudflare-pages-preview.yml index 9a97a29..d48c669 100644 --- a/.github/workflows/cloudflare-pages-preview.yml +++ b/.github/workflows/cloudflare-pages-preview.yml @@ -19,11 +19,11 @@ jobs: env: HUGO_VERSION: 0.168.0 - NODE_VERSION: 18 + NODE_VERSION: '22' steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v5 with: submodules: recursive @@ -55,10 +55,11 @@ jobs: - name: Publish to Cloudflare Pages id: deploy - uses: cloudflare/wrangler-action@v3 + uses: cloudflare/wrangler-action@v4 with: apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }} accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }} + wranglerVersion: "4.152.0" command: pages deploy public --project-name=devopsdays-ch --branch=preview-pr-${{ github.event.pull_request.number }} --commit-dirty=true - name: Comment PR with preview URL diff --git a/.github/workflows/cloudflare-pages.yml b/.github/workflows/cloudflare-pages.yml index d2d220d..a29a0f2 100644 --- a/.github/workflows/cloudflare-pages.yml +++ b/.github/workflows/cloudflare-pages.yml @@ -22,11 +22,11 @@ jobs: env: HUGO_VERSION: 0.168.0 - NODE_VERSION: 18 + NODE_VERSION: '22' steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v5 with: submodules: recursive @@ -57,8 +57,9 @@ jobs: run: hugo --minify --baseURL "${{ vars.CLOUDFLARE_PAGES_URL || 'https://devopsdays.ch' }}" - name: Publish to Cloudflare Pages - uses: cloudflare/wrangler-action@v3 + uses: cloudflare/wrangler-action@v4 with: apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }} accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }} + wranglerVersion: "4.152.0" command: pages deploy public --project-name=devopsdays-ch --branch=main --commit-dirty=true diff --git a/config.yaml b/config.yaml index d822655..5a4ce39 100644 --- a/config.yaml +++ b/config.yaml @@ -1,5 +1,5 @@ baseURL: 'https://devopsdays.ch' -languageCode: 'en-us' +locale: 'en-us' title: DevOpsDays Zurich theme: 'devopsdays' diff --git a/static/_headers b/static/_headers new file mode 100644 index 0000000..8e6aa5a --- /dev/null +++ b/static/_headers @@ -0,0 +1,11 @@ +# Cloudflare Pages custom headers +# https://developers.cloudflare.com/pages/configuration/headers/ + +# Security headers (shared standard across all sites; CSP in report-only mode) +/* + Strict-Transport-Security: max-age=31536000; includeSubDomains + X-Frame-Options: DENY + X-Content-Type-Options: nosniff + Referrer-Policy: strict-origin-when-cross-origin + Permissions-Policy: camera=(), microphone=(), geolocation=() + Content-Security-Policy-Report-Only: default-src 'self'; base-uri 'self'; object-src 'none'; frame-ancestors 'none'; img-src 'self' data: https:; script-src 'self' 'unsafe-inline' https://cdn.jsdelivr.net https://js.tito.io; style-src 'self' 'unsafe-inline' https://cdn.jsdelivr.net https://js.tito.io; font-src 'self' data: https://cdn.jsdelivr.net; connect-src 'self' https://*.tito.io; frame-src https://www.google.com https://player.vimeo.com https://*.tito.io; form-action 'self' https://devopsdays.us12.list-manage.com diff --git a/themes/devopsdays/layouts/_default/baseof.html b/themes/devopsdays/layouts/_default/baseof.html index d323592..fb9482a 100644 --- a/themes/devopsdays/layouts/_default/baseof.html +++ b/themes/devopsdays/layouts/_default/baseof.html @@ -1,7 +1,7 @@ -{{- $upcoming := index (where .Site.Data.events.events "status" "upcoming") 0 -}} +{{- $upcoming := index (where hugo.Data.events.events "status" "upcoming") 0 -}} {{- $upcomingYear := printf "%.0f" $upcoming.year -}} {{- $description := cond (ne .Description "") (replace .Description "{YEAR}" $upcomingYear) .Site.Params.description -}} diff --git a/themes/devopsdays/layouts/index.html b/themes/devopsdays/layouts/index.html index aa611bd..eab7fb0 100644 --- a/themes/devopsdays/layouts/index.html +++ b/themes/devopsdays/layouts/index.html @@ -48,8 +48,8 @@ -{{ if .Site.Data.events }} -{{ $currentEvent := index (where .Site.Data.events.events "status" "upcoming") 0 }} +{{ if hugo.Data.events }} +{{ $currentEvent := index (where hugo.Data.events.events "status" "upcoming") 0 }} {{ if $currentEvent }}
@@ -80,8 +80,8 @@
- {{ $currentEvent := index (where .Site.Data.events.events "status" "upcoming") 0 }} - {{ if and .Site.Data.sessions $currentEvent }} + {{ $currentEvent := index (where hugo.Data.events.events "status" "upcoming") 0 }} + {{ if and hugo.Data.sessions $currentEvent }}
@@ -89,19 +89,19 @@
up to Attendees
-
{{ len (where .Site.Data.sessions.sessions "type" "keynote") }}
+
{{ len (where hugo.Data.sessions.sessions "type" "keynote") }}
Keynote-Speakers
-
{{ len (where .Site.Data.sessions.sessions "type" "talk") }}
+
{{ len (where hugo.Data.sessions.sessions "type" "talk") }}
Talks
-
{{ len (where .Site.Data.sessions.sessions "type" "ignite") }}
+
{{ len (where hugo.Data.sessions.sessions "type" "ignite") }}
Ignites
-
{{ len (where .Site.Data.sessions.sessions "type" "workshop") }}
+
{{ len (where hugo.Data.sessions.sessions "type" "workshop") }}
Workshops
diff --git a/themes/devopsdays/layouts/partials/breadcrumbs.html b/themes/devopsdays/layouts/partials/breadcrumbs.html index 952dd64..14d638f 100644 --- a/themes/devopsdays/layouts/partials/breadcrumbs.html +++ b/themes/devopsdays/layouts/partials/breadcrumbs.html @@ -22,7 +22,7 @@ {{ if and (eq .Type "session") .Params.sessionId }} - {{ $session := index (where .Site.Data.sessions.sessions "id" .Params.sessionId) 0 }} + {{ $session := index (where hugo.Data.sessions.sessions "id" .Params.sessionId) 0 }} {{ if $session }} {{ $session.title }} {{ else }} diff --git a/themes/devopsdays/layouts/partials/page-header.html b/themes/devopsdays/layouts/partials/page-header.html index b4ebd8b..10905c3 100644 --- a/themes/devopsdays/layouts/partials/page-header.html +++ b/themes/devopsdays/layouts/partials/page-header.html @@ -4,7 +4,7 @@ Usage: {{ partial "page-header.html" . }} */}} -{{- $upcomingYear := printf "%.0f" (index (where .Site.Data.events.events "status" "upcoming") 0).year -}} +{{- $upcomingYear := printf "%.0f" (index (where hugo.Data.events.events "status" "upcoming") 0).year -}}
{{ partial "breadcrumbs.html" . }} diff --git a/themes/devopsdays/layouts/partials/session-card.html b/themes/devopsdays/layouts/partials/session-card.html index 2ee20c7..afdd636 100644 --- a/themes/devopsdays/layouts/partials/session-card.html +++ b/themes/devopsdays/layouts/partials/session-card.html @@ -50,7 +50,7 @@ {{ if $session.speakers }}
{{ range $session.speakers }} - {{ $speaker := index (where $ctx.Site.Data.speakers.speakers "id" .) 0 }} + {{ $speaker := index (where hugo.Data.speakers.speakers "id" .) 0 }} {{ if $speaker }}
{{ $speaker.name }} {{- /* Iterate through all sponsors and display those matching any level in this group */ -}} - {{- range $.Site.Data.sponsors.sponsors -}} + {{- range hugo.Data.sponsors.sponsors -}} {{- if in $isGroup .level -}} {{- $displayedLevels = $displayedLevels | append .level -}}

{{ .Content }} - {{ if .Site.Data.events }} + {{ if hugo.Data.events }}
- {{ range where .Site.Data.events.events "status" "past" }} + {{ range where hugo.Data.events.events "status" "past" }}
diff --git a/themes/devopsdays/layouts/program/list.html b/themes/devopsdays/layouts/program/list.html index f789d72..09d6af2 100644 --- a/themes/devopsdays/layouts/program/list.html +++ b/themes/devopsdays/layouts/program/list.html @@ -5,11 +5,11 @@
{{ .Content }} - {{ if .Site.Data.sessions }} + {{ if hugo.Data.sessions }}
- {{ $sessions := .Site.Data.sessions.sessions }} + {{ $sessions := hugo.Data.sessions.sessions }} {{ $dayMap := dict }} {{ range $sessions }} {{ $dayMap = merge $dayMap (dict .day (slice)) }} diff --git a/themes/devopsdays/layouts/program/single.html b/themes/devopsdays/layouts/program/single.html index dad7283..bfa7c0d 100644 --- a/themes/devopsdays/layouts/program/single.html +++ b/themes/devopsdays/layouts/program/single.html @@ -1,7 +1,7 @@ {{ define "main" }} {{ partial "page-header.html" . }} -{{- $upcoming := index (where .Site.Data.events.events "status" "upcoming") 0 -}} +{{- $upcoming := index (where hugo.Data.events.events "status" "upcoming") 0 -}} {{- $day1 := $upcoming.date -}} {{- $day2 := $upcoming.endDate -}} {{- $day1Label := (time $day1).Format "January 2, 2006" -}} @@ -11,7 +11,7 @@
{{ .Content }} - {{ if .Site.Data.sessions }} + {{ if hugo.Data.sessions }}
@@ -28,7 +28,7 @@

- {{ range where .Site.Data.sessions.sessions "day" $day1 }} + {{ range where hugo.Data.sessions.sessions "day" $day1 }} {{ partial "session-card.html" (dict "session" . "context" $) }} {{ end }}
@@ -46,7 +46,7 @@

- {{ range where .Site.Data.sessions.sessions "day" $day2 }} + {{ range where hugo.Data.sessions.sessions "day" $day2 }} {{ partial "session-card.html" (dict "session" . "context" $) }} {{ end }}
diff --git a/themes/devopsdays/layouts/session/single.html b/themes/devopsdays/layouts/session/single.html index 9735e08..3641bea 100644 --- a/themes/devopsdays/layouts/session/single.html +++ b/themes/devopsdays/layouts/session/single.html @@ -4,7 +4,7 @@ {{ partial "breadcrumbs.html" . }} {{ if .Params.sessionId }} - {{ $session := index (where .Site.Data.sessions.sessions "id" .Params.sessionId) 0 }} + {{ $session := index (where hugo.Data.sessions.sessions "id" .Params.sessionId) 0 }} {{ if $session }} @@ -60,7 +60,7 @@

{{ .Title }}

{{ if .Params.sessionId }} - {{ $session := index (where .Site.Data.sessions.sessions "id" .Params.sessionId) 0 }} + {{ $session := index (where hugo.Data.sessions.sessions "id" .Params.sessionId) 0 }} {{ if $session }} @@ -81,7 +81,7 @@

Session De
{{ range $session.speakers }} - {{ $speaker := index (where $.Site.Data.speakers.speakers "id" .) 0 }} + {{ $speaker := index (where hugo.Data.speakers.speakers "id" .) 0 }} {{ if $speaker }} {{ $speakerPage := $.Site.GetPage (printf "/event/speakers/%s" .) }} {{ if $speakerPage }} diff --git a/themes/devopsdays/layouts/shortcodes/event-year.html b/themes/devopsdays/layouts/shortcodes/event-year.html index e901637..8c37a07 100644 --- a/themes/devopsdays/layouts/shortcodes/event-year.html +++ b/themes/devopsdays/layouts/shortcodes/event-year.html @@ -1,2 +1,2 @@ -{{- $upcoming := index (where .Site.Data.events.events "status" "upcoming") 0 -}} +{{- $upcoming := index (where hugo.Data.events.events "status" "upcoming") 0 -}} {{- printf "%.0f" $upcoming.year -}} diff --git a/themes/devopsdays/layouts/shortcodes/sponsor_availability.html b/themes/devopsdays/layouts/shortcodes/sponsor_availability.html index 81fc698..7690c91 100644 --- a/themes/devopsdays/layouts/shortcodes/sponsor_availability.html +++ b/themes/devopsdays/layouts/shortcodes/sponsor_availability.html @@ -1,6 +1,6 @@ {{- $packageName := .Get 0 -}} -{{- $packages := .Site.Data.sponsor_packages.packages -}} -{{- $sponsors := .Site.Data.sponsors.sponsors -}} +{{- $packages := hugo.Data.sponsor_packages.packages -}} +{{- $sponsors := hugo.Data.sponsors.sponsors -}} {{- $sponsorCounts := dict -}} {{- range $sponsors -}} diff --git a/themes/devopsdays/layouts/speaker/list.html b/themes/devopsdays/layouts/speaker/list.html index a810d30..4a98180 100644 --- a/themes/devopsdays/layouts/speaker/list.html +++ b/themes/devopsdays/layouts/speaker/list.html @@ -7,9 +7,9 @@ {{ .Content }}
- {{ if .Site.Data.speakers }} + {{ if hugo.Data.speakers }}