diff --git a/.woodpecker/.hugo-build.yml b/.woodpecker/.hugo-build.yml index 91adbcd..0842a76 100644 --- a/.woodpecker/.hugo-build.yml +++ b/.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 - 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 diff --git a/README.md b/README.md index 121abbe..5ac71aa 100644 --- a/README.md +++ b/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). diff --git a/assets/2021_vrifox-avatar.png b/assets/2021_vrifox-avatar.png new file mode 100644 index 0000000..18d87cb Binary files /dev/null and b/assets/2021_vrifox-avatar.png differ diff --git a/assets/scss/partials/footer.scss b/assets/scss/partials/footer.scss index 95f1395..205f4f5 100644 --- a/assets/scss/partials/footer.scss +++ b/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; @@ -42,4 +29,4 @@ footer { } } } -} +} \ No newline at end of file diff --git a/assets/vrifox-avatar.png b/assets/vrifox-avatar.png deleted file mode 100644 index bdafdd7..0000000 Binary files a/assets/vrifox-avatar.png and /dev/null differ diff --git a/config/_default/config.yaml b/config/_default/config.yaml index 318b6c6..05a5675 100644 --- a/config/_default/config.yaml +++ b/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" @@ -28,4 +28,4 @@ markup: unsafe: true disableKinds: - - sitemap + - sitemap \ No newline at end of file diff --git a/config/_default/menu.yaml b/config/_default/menu.yaml index 370f6c6..1a1fc37 100644 --- a/config/_default/menu.yaml +++ b/config/_default/menu.yaml @@ -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 \ No newline at end of file diff --git a/content/blog/theme-for-gitea/index.de.md b/content/blog/theme-for-gitea/index.de.md index 051d56c..8e765eb 100644 --- a/content/blog/theme-for-gitea/index.de.md +++ b/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) diff --git a/content/blog/theme-for-gitea/index.en.md b/content/blog/theme-for-gitea/index.en.md index 80fedf9..15a11a8 100644 --- a/content/blog/theme-for-gitea/index.en.md +++ b/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) diff --git a/content/gpg/index.de.md b/content/gpg/index.de.md index 86fc074..ecec807 100644 --- a/content/gpg/index.de.md +++ b/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: diff --git a/content/gpg/index.en.md b/content/gpg/index.en.md index 1a27032..e291314 100644 --- a/content/gpg/index.en.md +++ b/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: diff --git a/flake.lock b/flake.lock deleted file mode 100644 index 1fd6ae2..0000000 --- a/flake.lock +++ /dev/null @@ -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 -} diff --git a/flake.nix b/flake.nix deleted file mode 100644 index 5aca172..0000000 --- a/flake.nix +++ /dev/null @@ -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"; - }; - }); - }; -} diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 94125af..7d40504 100644 --- a/layouts/_default/list.html +++ b/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") -}} + {{- end -}} {{- define "main" }} -
-

{{ .Title }}

-

{{ .Content }}

- {{- range .Pages }} -

{{ .Title }} {{ .Date | time.Format ":date_long" }}

- {{- end }} -
+
+

{{ .Title }}

+

{{ .Content }}

+ {{- range .Pages }} +

{{ .Title }} {{ .Date | time.Format ":date_long" }}

+ {{- end }} +
-{{- end }} \ No newline at end of file +{{- end }} diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 5d330ac..e4c8157 100644 --- a/layouts/_default/single.html +++ b/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") -}} + {{- end -}} {{- define "main" }} -
- {{- if eq .Params.type "post" }} -

{{ .Date | time.Format "2. January 2006" }}

- {{- end }} -

{{ .Title }}

- {{ .Content -}} - -
-{{- end }} \ No newline at end of file +
+ {{- if eq .Params.type "post" }} +

{{ .Date | time.Format "2. January 2006" }}

+ {{- end }} +

{{ .Title }}

+ {{ .Content -}} + +
+{{- end }} diff --git a/layouts/blog/list.html b/layouts/blog/list.html index 90c3431..d111df3 100644 --- a/layouts/blog/list.html +++ b/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") -}} + {{- end -}} {{- define "header" }} @@ -12,19 +12,19 @@ {{- define "main" }} -
-
+
+ +
+ +
- - -{{- end }} \ No newline at end of file +{{- end }} diff --git a/layouts/blog/single.html b/layouts/blog/single.html index 2f2f22b..ec43732 100644 --- a/layouts/blog/single.html +++ b/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") -}} {{- end -}} diff --git a/layouts/errorpages/list.html b/layouts/errorpages/list.html index 126038e..308c258 100644 --- a/layouts/errorpages/list.html +++ b/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") -}} + {{- end -}} {{- define "main" }} -
-

{{ .Params.heading }}

-

{{ .Params.subheading}}

-
-{{- end }} \ No newline at end of file +
+

{{ .Params.heading }}

+

{{ .Params.subheading}}

+
+{{- end }} diff --git a/layouts/errorpages/single.html b/layouts/errorpages/single.html index 126038e..308c258 100644 --- a/layouts/errorpages/single.html +++ b/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") -}} + {{- end -}} {{- define "main" }} -
-

{{ .Params.heading }}

-

{{ .Params.subheading}}

-
-{{- end }} \ No newline at end of file +
+

{{ .Params.heading }}

+

{{ .Params.subheading}}

+
+{{- end }} diff --git a/layouts/index.html b/layouts/index.html index 83137e1..198379d 100644 --- a/layouts/index.html +++ b/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") -}} + {{- end -}} {{- define "header" }} @@ -12,15 +12,15 @@ {{ end }} {{- define "main" }} -
-
-

- {{ i18n "home-websites-and-graphics" | safeHTML }} -

-

- {{ i18n "home-cozy-town" | safeHTML }} -

-
- {{ partial "moreposts.html" . }} -
-{{- end }} \ No newline at end of file +
+
+

+ {{ i18n "home-websites-and-graphics" | safeHTML }} +

+

+ {{ i18n "home-cozy-town" | safeHTML }} +

+
+ {{ partial "moreposts.html" . }} +
+{{- end }} diff --git a/layouts/partials/sidebar.html b/layouts/partials/sidebar.html index b9561f2..b2d71cd 100644 --- a/layouts/partials/sidebar.html +++ b/layouts/partials/sidebar.html @@ -24,7 +24,7 @@ {{ partial "helpers/icons" "mastodon" }}
- {{- if hugo.IsMultilingual }} + {{- if .Site.IsMultiLingual }} {{ $siteLanguages := .Site.Languages }} {{ $pageLanguage := .Page.Lang }} @@ -41,4 +41,4 @@ {{- end }}
- \ No newline at end of file +