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.eu:/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.eu/" --cleanDestinationDir
-    volumes:
-      - /srv/woodpecker-cache/vrifox.eu:/woodpecker/src/code.cozy.town/vrifox.eu/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.eu/ --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/dev.vrifox.eu/ --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.eu/"
+      - 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
-        event: [push, pull_request, manual]

README.md

@@ -1,3 +1,3 @@
 [![status-badge](https://make.cozy.town/api/badges/vrifox/website/status.svg)](https://make.cozy.town/vrifox/website)
 
-Source code of my website [www.vrifox.eu](https://www.vrifox.eu).
+Source code of my website [vrifox.cc](https://vrifox.cc).

assets/scss/partials/footer.scss

@@ -1,23 +1,10 @@
 footer {
 	color: var(--text-accent-150);
 	grid-area: footer;
+	margin: 1em auto;
 	text-align: center;
 	font-size: 1rem;
 
-    @media (max-width: 1140px) {
-        margin-top: 1em;
-        margin-bottom: 8em;
-        margin-left: auto;
-        margin-right: auto;
-    }
-
-    @media (min-width: 1141px) {
-        margin-top: 1em;
-        margin-bottom: 1em;
-        margin-left: auto;
-        margin-right: auto;
-    }
-
 	p {
 		margin: .25em;
 

config/_default/config.yaml

@@ -1,4 +1,4 @@
-baseURL: "https://www.vrifox.eu/"
+baseURL: "https://vrifox.cc/"
 title: "Vris Cute Corner"
 
 enableRobotsTXT: false
@@ -7,7 +7,7 @@ defaultContentLanguageInSubdir: true
 enableGitInfo: true
 
 params:
-    avatar: "vrifox-avatar.png"
+    avatar: "2021_vrifox-avatar.png"
     displayName: "Vri"
     username: "@vrifox"
     staticSiteGenerator: "Hugo"

config/_default/menu.yaml

@@ -26,5 +26,5 @@ footer:
     weight: 1
   - identifier: "sourcecode"
     name: "Quellcode"
-    url: "https://code.cozy.town/vrifox/website"
+    url: "https://code.cozy.town/vri/website"
     weight: 2

content/blog/theme-for-gitea/index.de.md

@@ -14,7 +14,7 @@ description: "Mein neues Gitea-Theme scheint benutzbar zu sein, solange man nich
 slug: "theme-für-gitea"
 ---
 
-Mein – [ebenfalls neues](https://www.vrifox.eu/blog/2020/vrifox.cc-rewritten-using-a-static-site-generator/) – Gitea-Theme scheint benutzbar zu sein, solange man nicht angemeldet ist.
+Mein – [ebenfalls neues](https://vrifox.cc/blog/2020/vrifox.cc-rewritten-using-a-static-site-generator/) – Gitea-Theme scheint benutzbar zu sein, solange man nicht angemeldet ist.
 
 ![So sah meine Gitea-Instanz im September 2020 aus](2020-09-29-git.vrifox.cc-2020-09.jpg)
 

content/blog/theme-for-gitea/index.en.md

@@ -13,7 +13,7 @@ draft: false
 description: "My new Gitea theme appears to be usable, as long as you're not logged in."
 ---
 
-My – [also new](https://www.vrifox.eu/blog/2020/vrifox.cc-rewritten-using-a-static-site-generator/) – Gitea theme appears to be usable, as long as you're not logged in.
+My – [also new](https://vrifox.cc/blog/2020/vrifox.cc-rewritten-using-a-static-site-generator/) – Gitea theme appears to be usable, as long as you're not logged in.
 
 ![My Gitea instance as it appeared in September 2020](2020-09-29-git.vrifox.cc-2020-09.jpg)
 

content/gpg/index.de.md

@@ -1,6 +1,6 @@
 ---
 date: 2020-11-09T18:52:58+02:00
-title: "GNU Privacy Guard"
+title: "GPG"
 type: singlepage
 
 aliases:

content/gpg/index.en.md

@@ -1,6 +1,6 @@
 ---
 date: 2020-11-09T18:52:58+02:00
-title: "GNU Privacy Guard"
+title: "GPG"
 type: singlepage
 
 aliases:

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,5 +1,5 @@
 {{- 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" />
 {{- end -}}
 

layouts/_default/single.html

@@ -1,5 +1,5 @@
 {{- 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" />
 {{- end -}}
 

layouts/blog/list.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/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,5 +1,5 @@
 {{- 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" />
 {{- end -}}
 

layouts/errorpages/single.html

@@ -1,5 +1,5 @@
 {{- 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" />
 {{- end -}}
 

layouts/index.html

@@ -1,5 +1,5 @@
 {{- 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" />
 {{- 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 }}