Compare commits

..

2 commits

Author SHA1 Message Date
b548a19c2f
test cksum
All checks were successful
ci/woodpecker/push/hugo-build Pipeline was successful
2023-10-23 16:55:37 +02:00
2390a11121
test cksum
All checks were successful
ci/woodpecker/push/hugo-build Pipeline was successful
2023-10-23 16:54:30 +02:00
21 changed files with 123 additions and 202 deletions

View file

@ -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
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]
branch: main
upload-stable:
image: code.cozy.town/vrifox/hugoci:latest
commands:
- mkdir -p /root/.ssh
- echo "$${DEPLOY_BOT_SSH_KEY}" > /root/.ssh/id_ed25519
- chmod 400 /root/.ssh/id_ed25519
- echo "$SSH_KEY" > /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
environment:
DEPLOY_BOT_SSH_KEY:
from_secret: deploy_bot_ssh_key
- 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
secrets:
- ssh_key
- ssh_port
- ssh_host
when:
- branch: main
event: [push, pull_request_closed, manual]
branch: main
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
- chmod 400 /root/.ssh/id_ed25519
- echo "$SSH_KEY" > /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
- echo "The preview is now available on https://dev.vrifox.eu/"
environment:
DEPLOY_BOT_SSH_KEY:
from_secret: deploy_bot_ssh_key
- 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/${CI_COMMIT_BRANCH}/${CI_COMMIT_SHA}/"
secrets:
- ssh_key
- ssh_port
- ssh_host
when:
- branch:
exclude: main
event: [push, pull_request, manual]
branch:
exclude: main

View file

@ -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).

Binary file not shown.

After

Width:  |  Height:  |  Size: 296 KiB

View file

@ -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;
@ -42,4 +29,4 @@ footer {
}
}
}
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 234 KiB

View file

@ -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"
@ -28,4 +28,4 @@ markup:
unsafe: true
disableKinds:
- sitemap
- sitemap

View file

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

View file

@ -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)

View file

@ -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)

View file

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

View file

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

27
flake.lock generated
View file

@ -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
}

View file

@ -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";
};
});
};
}

View file

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

View file

@ -1,31 +1,31 @@
{{- define "stylesheet" -}}
{{- $style := resources.Get "/scss/default.scss" | css.Sass (dict "outputStyle" "compressed") -}}
<link rel="preload stylesheet" as="style" href="{{ $style.Permalink }}" type="text/css" media="screen" />
{{- $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 -}}
{{- define "main" }}
<main>
{{- 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>
{{- end }}
<h1 class="title">{{ .Title }}</h1>
{{ .Content -}}
<aside>
{{- with .Params.topics }}
<ul class="topics">
{{- range . }}
<li>
<a href="{{ "topics" | relURL}}/{{ . | urlize }}">{{ . }}</a>
</li>
{{ end }}
</ul>
{{- end }}
{{- with .Params.tags }}
tags
{{- range . }}
<a href="{{ "tags" | relURL }}/{{ . | urlize }}">{{ . }}</a>
{{- end }}
{{- end }}
</aside>
</main>
{{- end }}
<main>
{{- 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>
{{- end }}
<h1 class="title">{{ .Title }}</h1>
{{ .Content -}}
<aside>
{{- with .Params.topics }}
<ul class="topics">
{{- range . }}
<li>
<a href="{{ "topics" | relURL}}/{{ . | urlize }}">{{ . }}</a>
</li>
{{ end }}
</ul>
{{- end }}
{{- with .Params.tags }}
tags
{{- range . }}
<a href="{{ "tags" | relURL }}/{{ . | urlize }}">{{ . }}</a>
{{- end }}
{{- end }}
</aside>
</main>
{{- end }}

View file

@ -1,6 +1,6 @@
{{- define "stylesheet" -}}
{{- $style := resources.Get "/scss/blog.scss" | css.Sass (dict "outputStyle" "compressed") -}}
<link rel="preload stylesheet" as="style" href="{{ $style.Permalink }}" type="text/css" media="screen" />
{{- $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 -}}
{{- define "header" }}
@ -12,19 +12,19 @@
{{- define "main" }}
<main>
<div id="posts-wrapper">
<main>
<div id="posts-wrapper">
{{ range (where .Site.RegularPages "Section" "blog") }}
<a href="{{ .Permalink }}" class="post-wrapper">
<p class="title">{{ .Title }}</p>
<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="author">{{ with .Params.author }}by {{ end }}{{ .Params.author }}</span>
</aside>
</a>
<a href="{{ .Permalink }}" class="post-wrapper">
<p class="title">{{ .Title }}</p>
<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="author">{{ with .Params.author }}by {{ end }}{{ .Params.author }}</span>
</aside>
</a>
{{ end }}
</div>
</div>
</main>
</main>
{{- end }}
{{- end }}

View file

@ -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 -}}

View file

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

View file

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

View file

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

View file

@ -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>