test cksum

.woodpecker/.hugo-build.yml

@@ -3,51 +3,46 @@ steps:
     image: code.cozy.town/vrifox/hugoci:latest
     commands:
       - hugo --destination /woodpecker/build/ --minify --cleanDestinationDir
-    volumes:
-      - /srv/woodpecker-cache/vrifox.cc:/woodpecker/src/code.cozy.town/vrifox/website/resources/_gen
     when:
-      - branch: main
+      branch: main
-        event: [push, pull_request_closed, manual]
-
-  build-dev:
-    image: code.cozy.town/vrifox/hugoci:latest
-    commands:
-      - hugo --destination /woodpecker/build/ --baseURL "https://dev.vrifox.cc/" --cleanDestinationDir
-    volumes:
-      - /srv/woodpecker-cache/vrifox.cc:/woodpecker/src/code.cozy.town/vrifox.cc/website/resources/_gen
-    when:
-      - branch:
-          exclude: main
-        event: [push, pull_request, manual]
 
   upload-stable:
     image: code.cozy.town/vrifox/hugoci:latest
     commands:
       - mkdir -p /root/.ssh
-      - echo "$${DEPLOY_BOT_SSH_KEY}" > /root/.ssh/id_ed25519
+      - echo "$SSH_KEY" > /root/.ssh/id_ed25519
-      - chmod 400 /root/.ssh/id_ed25519
+      - chmod 700 /root/.ssh/id_ed25519
       - echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > /root/.ssh/config
-      - rsync -rv --delete -e "ssh -p 42824 -i /root/.ssh/id_ed25519" /woodpecker/build/ deploy-bot@cozytown-main.cozy.town:/srv/http/vrifox.cc/ --mkpath --checksum
+      - rsync -rv --delete -e "ssh -p $SSH_PORT -i /root/.ssh/id_ed25519" /woodpecker/build/ caddy@$SSH_HOST:/var/lib/caddy/woodpecker/vrifox.cc/ --mkpath --checksum
-    environment:
+    secrets:
-      DEPLOY_BOT_SSH_KEY:
+      - ssh_key
-        from_secret: deploy_bot_ssh_key
+      - ssh_port
+      - ssh_host
     when:
-      - branch: main
+      branch: main
-        event: [push, pull_request_closed, manual]
+
+  build-dev:
+    image: code.cozy.town/vrifox/hugoci:latest
+    commands:
+      - hugo --destination /woodpecker/build/ --baseURL "https://dev.vrifox.cc/${CI_COMMIT_BRANCH}/${CI_COMMIT_SHA}/" --cleanDestinationDir
+    when:
+      branch:
+        exclude: main
 
   upload-dev:
     image: code.cozy.town/vrifox/hugoci:latest
     commands:
       - mkdir -p /root/.ssh
-      - echo "$${DEPLOY_BOT_SSH_KEY}" > /root/.ssh/id_ed25519
+      - echo "$SSH_KEY" > /root/.ssh/id_ed25519
-      - chmod 400 /root/.ssh/id_ed25519
+      - chmod 700 /root/.ssh/id_ed25519
+      - cksum /root/.ssh/id_ed25519
       - echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > /root/.ssh/config
-      - rsync -rv --delete -e "ssh -p 42824 -i /root/.ssh/id_ed25519" /woodpecker/build/ deploy-bot@cozytown-main.cozy.town:/srv/http/vrifox.cc-dev/ --mkpath --checksum
+      - rsync -rv --delete -e "ssh -p $SSH_PORT -i /root/.ssh/id_ed25519" /woodpecker/build/ caddy@$SSH_HOST:/var/lib/caddy/woodpecker/vrifox.cc-dev/${CI_COMMIT_BRANCH}/${CI_COMMIT_SHA}/ --mkpath --checksum
-      - echo "The preview is now available on https://dev.vrifox.cc/"
+      - echo "The preview is now available on https://dev.vrifox.cc/${CI_COMMIT_BRANCH}/${CI_COMMIT_SHA}/"
-    environment:
+    secrets:
-      DEPLOY_BOT_SSH_KEY:
+      - ssh_key
-        from_secret: deploy_bot_ssh_key
+      - ssh_port
+      - ssh_host
     when:
-      - branch:
+      branch:
-          exclude: main
+        exclude: main
-        event: [push, pull_request, manual]

flake.lock

@@ -1,27 +0,0 @@
-{
-  "nodes": {
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1739736696,
-        "narHash": "sha256-zON2GNBkzsIyALlOCFiEBcIjI4w38GYOb+P+R4S8Jsw=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "d74a2335ac9c133d6bbec9fc98d91a77f1604c1f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "root": {
-      "inputs": {
-        "nixpkgs": "nixpkgs"
-      }
-    }
-  },
-  "root": "root",
-  "version": 7
-}

flake.nix

@@ -1,34 +0,0 @@
-{
-  inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
-
-  outputs = {
-    nixpkgs,
-    self,
-  }: let
-    pkgs = nixpkgs;
-
-    mkAllSystems = genAttrs [
-      "aarch64-darwin"
-      "aarch64-linux"
-      "i686-linux"
-      "x86_64-darwin"
-      "x86_64-linux"
-    ];
-
-    inherit (lib) genAttrs;
-    inherit (pkgs) alejandra lib;
-  in {
-    formatter = mkAllSystems (system: alejandra);
-
-    devShells = mkAllSystems (system: let
-      pkgs = nixpkgs.legacyPackages.${system};
-
-      inherit (pkgs) mkShell;
-    in {
-      default = mkShell {
-        nativeBuildInputs = [pkgs.hugo];
-        shellHook = "hugo server";
-      };
-    });
-  };
-}

layouts/_default/list.html

@@ -1,16 +1,16 @@
 {{- define "stylesheet" -}}
-{{- $style := resources.Get "/scss/default.scss" | css.Sass (dict "outputStyle" "compressed") -}}
+    {{- $style := resources.Get "/scss/default.scss" | resources.ToCSS (dict "outputStyle" "compressed") -}}
-<link rel="preload stylesheet" as="style" href="{{ $style.Permalink }}" type="text/css" media="screen" />
+    <link rel="preload stylesheet" as="style" href="{{ $style.Permalink }}" type="text/css" media="screen" />
 {{- end -}}
 
 {{- define "main" }}
 
-<main>
+    <main>
-  <h1 class="title">{{ .Title }}</h1>
+      <h1 class="title">{{ .Title }}</h1>
-  <p>{{ .Content }}</p>
+      <p>{{ .Content }}</p>
-  {{- range .Pages }}
+    {{- range .Pages }}
-  <p> <a href="{{ .Permalink }}">{{ .Title }}</a> <span>{{ .Date | time.Format ":date_long" }}</span> </p>
+      <p> <a href="{{ .Permalink }}">{{ .Title }}</a> <span>{{ .Date | time.Format ":date_long" }}</span> </p>
-  {{- end }}
+    {{- end }}
-</main>
+    </main>
 
-{{- end }}
+{{- end }} 

layouts/_default/single.html

@@ -1,31 +1,31 @@
 {{- define "stylesheet" -}}
-{{- $style := resources.Get "/scss/default.scss" | css.Sass (dict "outputStyle" "compressed") -}}
+    {{- $style := resources.Get "/scss/default.scss" | resources.ToCSS (dict "outputStyle" "compressed") -}}
-<link rel="preload stylesheet" as="style" href="{{ $style.Permalink }}" type="text/css" media="screen" />
+    <link rel="preload stylesheet" as="style" href="{{ $style.Permalink }}" type="text/css" media="screen" />
 {{- end -}}
 
 {{- define "main" }}
-<main>
+    <main>
-  {{- if eq .Params.type "post" }}
+      {{- if eq .Params.type "post" }}
-  <p class="date-published" title="{{ .Date | time.Format "2. January 2006, 15:04 MST" }}">{{ .Date | time.Format "2. January 2006" }}</p>
+      <p class="date-published" title="{{ .Date | time.Format "2. January 2006, 15:04 MST" }}">{{ .Date | time.Format "2. January 2006" }}</p>
-  {{- end }}
+      {{- end }}
-  <h1 class="title">{{ .Title }}</h1>
+      <h1 class="title">{{ .Title }}</h1>
-  {{ .Content -}}
+      {{ .Content -}}
-  <aside>
+      <aside>
-    {{- with .Params.topics }}
+      {{- with .Params.topics }}
-    <ul class="topics">
+        <ul class="topics">
-      {{- range . }}
+          {{- range . }}
-      <li>
+          <li>
-        <a href="{{ "topics" | relURL}}/{{ . | urlize }}">{{ . }}</a>
+            <a href="{{ "topics" | relURL}}/{{ . | urlize }}">{{ . }}</a>
-      </li>
+          </li>
-      {{ end }}
+          {{ end }}
-    </ul>
+        </ul>
-    {{- end }}
+      {{- end }}
-    {{- with .Params.tags }}
+      {{- with .Params.tags }}
-    tags
+        tags
-    {{- range . }}
+        {{- range . }}
-    <a href="{{ "tags" | relURL }}/{{ . | urlize }}">{{ . }}</a>
+        <a href="{{ "tags" | relURL }}/{{ . | urlize }}">{{ . }}</a>
-    {{- end }}
+        {{- end }}
-    {{- end }}
+      {{- end }}
-  </aside>
+      </aside>
-</main>
+    </main>
-{{- end }}
+{{- end }} 

layouts/blog/list.html

@@ -1,6 +1,6 @@
 {{- define "stylesheet" -}}
-{{- $style := resources.Get "/scss/blog.scss" | css.Sass (dict "outputStyle" "compressed") -}}
+    {{- $style := resources.Get "/scss/blog.scss" | resources.ToCSS (dict "outputStyle" "compressed") -}}
-<link rel="preload stylesheet" as="style" href="{{ $style.Permalink }}" type="text/css" media="screen" />
+    <link rel="preload stylesheet" as="style" href="{{ $style.Permalink }}" type="text/css" media="screen" />
 {{- end -}}
 
 {{- define "header" }}
@@ -12,19 +12,19 @@
 
 {{- define "main" }}
 
-<main>
+    <main>
-    <div id="posts-wrapper">
+        <div id="posts-wrapper">
         {{ range (where .Site.RegularPages "Section" "blog") }}
-        <a href="{{ .Permalink }}" class="post-wrapper">
+            <a href="{{ .Permalink }}" class="post-wrapper">
-            <p class="title">{{ .Title }}</p>
+                <p class="title">{{ .Title }}</p>
-            <aside class="meta" title="{{ .Date | time.Format " 2 Jan 2006, 15:04 MST" }}">
+                <aside class="meta" title="{{ .Date | time.Format "2 Jan 2006, 15:04 MST" }}">
-                <span class="date">{{ .Date | time.Format "2. January 2006" }}</span>
+                    <span class="date">{{ .Date | time.Format "2. January 2006" }}</span>
-                <span class="author">{{ with .Params.author }}by {{ end }}{{ .Params.author }}</span>
+                    <span class="author">{{ with .Params.author }}by {{ end }}{{ .Params.author }}</span>
-            </aside>
+                </aside>
-        </a>
+            </a>
         {{ end }}
-    </div>
+        </div>
+        
+    </main>
 
-</main>
+{{- end }} 
-
-{{- end }}

layouts/blog/single.html

@@ -1,5 +1,5 @@
 {{- define "stylesheet" -}}
-{{- $style := resources.Get "/scss/blog.scss" | css.Sass (dict "outputStyle" "compressed") -}}
+{{- $style := resources.Get "/scss/blog.scss" | resources.ToCSS (dict "outputStyle" "compressed") -}}
 <link rel="preload stylesheet" as="style" href="{{ $style.Permalink }}" type="text/css" media="screen" />
 {{- end -}}
 

layouts/errorpages/list.html

@@ -1,11 +1,11 @@
 {{- define "stylesheet" -}}
-{{- $style := resources.Get "/scss/default.scss" | css.Sass (dict "outputStyle" "compressed") -}}
+    {{- $style := resources.Get "/scss/default.scss" | resources.ToCSS (dict "outputStyle" "compressed") -}}
-<link rel="preload stylesheet" as="style" href="{{ $style.Permalink }}" type="text/css" media="screen" />
+    <link rel="preload stylesheet" as="style" href="{{ $style.Permalink }}" type="text/css" media="screen" />
 {{- end -}}
 
 {{- define "main" }}
-<main>
+    <main>
-  <h2>{{ .Params.heading }}</h2>
+      <h2>{{ .Params.heading }}</h2>
-  <p>{{ .Params.subheading}}</p>
+      <p>{{ .Params.subheading}}</p>
-</main>
+    </main>
-{{- end }}
+{{- end }}

layouts/errorpages/single.html

@@ -1,11 +1,11 @@
 {{- define "stylesheet" -}}
-{{- $style := resources.Get "/scss/default.scss" | css.Sass (dict "outputStyle" "compressed") -}}
+    {{- $style := resources.Get "/scss/default.scss" | resources.ToCSS (dict "outputStyle" "compressed") -}}
-<link rel="preload stylesheet" as="style" href="{{ $style.Permalink }}" type="text/css" media="screen" />
+    <link rel="preload stylesheet" as="style" href="{{ $style.Permalink }}" type="text/css" media="screen" />
 {{- end -}}
 
 {{- define "main" }}
-<main>
+    <main>
-  <h2>{{ .Params.heading }}</h2>
+      <h2>{{ .Params.heading }}</h2>
-  <p>{{ .Params.subheading}}</p>
+      <p>{{ .Params.subheading}}</p>
-</main>
+    </main>
-{{- end }}
+{{- end }}

layouts/index.html

@@ -1,6 +1,6 @@
 {{- define "stylesheet" -}}
-{{- $style := resources.Get "/scss/home.scss" | css.Sass (dict "outputStyle" "compressed") -}}
+    {{- $style := resources.Get "/scss/home.scss" | resources.ToCSS (dict "outputStyle" "compressed") -}}
-<link rel="preload stylesheet" as="style" href="{{ $style.Permalink }}" type="text/css" media="screen" />
+    <link rel="preload stylesheet" as="style" href="{{ $style.Permalink }}" type="text/css" media="screen" />
 {{- end -}}
 
 {{- define "header" }}
@@ -12,15 +12,15 @@
 {{ end }}
 
 {{- define "main" }}
-<main id="main">
+    <main id="main">
-    <div id="general-description">
+        <div id="general-description">
-        <p id="websites-and-graphics">
+            <p id="websites-and-graphics">
-            {{ i18n "home-websites-and-graphics" | safeHTML }}
+                {{ i18n "home-websites-and-graphics" | safeHTML }}
-        </p>
+            </p>
-        <p id="cozy-town">
+            <p id="cozy-town">
-            {{ i18n "home-cozy-town" | safeHTML }}
+                {{ i18n "home-cozy-town" | safeHTML }}
-        </p>
+            </p>
-    </div>
+        </div>
-    {{ partial "moreposts.html" . }}
+        {{ partial "moreposts.html" . }}
-</main>
+    </main>
-{{- end }}
+{{- end }}

layouts/partials/sidebar.html

@@ -24,7 +24,7 @@
             <a class="hint-text" rel="me" href="https://social.anoxinon.de/@vri" aria-label="Mastodon">{{ partial "helpers/icons" "mastodon" }}</a>
         </nav>
         <div id="languages">
-            {{- if hugo.IsMultilingual }}
+        {{- if .Site.IsMultiLingual }}
             {{ $siteLanguages := .Site.Languages }}
             {{ $pageLanguage := .Page.Lang }}
     
@@ -41,4 +41,4 @@
         {{- end }}
         </div>
     </div>
-</header>
+</header>