{{ .Title }}
-{{ .Content }}
- {{- range .Pages }} -{{ .Title }} {{ .Date | time.Format ":date_long" }}
- {{- end }} -diff --git a/.woodpecker/.hugo-build.yml b/.woodpecker/.hugo-build.yml
index 18c11a3..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.cc:/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.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]
+ 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.cc/ --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/vrifox.cc-dev/ --mkpath --checksum
- - echo "The preview is now available on https://dev.vrifox.cc/"
- 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/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" }}
- {{ .Content }} {{ .Title }} {{ .Date | time.Format ":date_long" }} {{ .Content }} {{ .Title }} {{ .Date | time.Format ":date_long" }} {{ .Date | time.Format "2. January 2006" }} {{ .Date | time.Format "2. January 2006" }} {{ .Title }} {{ .Title }} {{ .Params.subheading}} {{ .Params.subheading}} {{ .Params.subheading}} {{ .Params.subheading}}
- {{ i18n "home-websites-and-graphics" | safeHTML }}
-
- {{ i18n "home-cozy-town" | safeHTML }}
-
+ {{ i18n "home-websites-and-graphics" | safeHTML }}
+
+ {{ i18n "home-cozy-town" | safeHTML }}
+ {{ .Title }}
- {{ .Title }}
+ {{ .Title }}
- {{ .Content -}}
-
-{{ .Title }}
+ {{ .Content -}}
+
+ {{ .Params.heading }}
- {{ .Params.heading }}
+ {{ .Params.heading }}
- {{ .Params.heading }}
+