From 1d4f9acc0167cfdcfdf1ff81f8cf0cea084618ad Mon Sep 17 00:00:00 2001 From: lauralani Date: Fri, 7 Apr 2023 18:56:07 +0200 Subject: [PATCH 1/8] update woodpecker CI --- .woodpecker.yml | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index a2d10d0..4c084d1 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -1,4 +1,8 @@ pipeline: + when: + branch: main + event: push + build: image: node:latest commands: @@ -6,11 +10,20 @@ pipeline: - npx @11ty/eleventy --input=. --output=public deploy: - image: node:18 - secrets: - - SWA_CLI_DEPLOYMENT_TOKEN + image: alpine:latest + secrets: + - SSH_KEY + environment: + - TARGET_SERVER=cloud.lauka.net + - TARGET_USER=webadmin + - TARGET_PATH=/webroot/www.lauka.net commands: - - npm install -D @azure/static-web-apps-cli - - npx @azure/static-web-apps-cli deploy ./public --env Production + - apk add --update --no-cache openssh rsync git + - mkdir -p $HOME/.ssh + - echo "$SSH_KEY" > $HOME/.ssh/id_ed25519 + - chmod 0600 $HOME/.ssh/id_ed25519 + - ssh-keyscan -t ed25519 $TARGET_SERVER >> $HOME/.ssh/known_hosts + - cd public/ + - rsync -avh --delete ./ $TARGET_USER@$TARGET_SERVER:$TARGET_PATH branches: main From 24f5939804a960389a95bcb3393ad8284cfa5aca Mon Sep 17 00:00:00 2001 From: lauralani Date: Fri, 7 Apr 2023 19:05:00 +0200 Subject: [PATCH 2/8] Update Git Links --- index.njk | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/index.njk b/index.njk index 267c759..db11d64 100644 --- a/index.njk +++ b/index.njk @@ -18,7 +18,8 @@ eleventyExcludeFromCollections: true I'm a network engineer, with a pretty mixed technical background. I started my career in software development, and then moved on to be a sysadmin with main emphasis on linux environments. Afterwards, I was a mix of network engineer and site reliability engineer. Now I'm responsible for the network infrastructure at a big datacenter provider. Currently I'm - primarily working on network automation and our internal network infrastructure. + primarily working on network automation and our internal network infrastructure, and I'm playing a lot with the Golang + programming language =).

Books

@@ -49,17 +50,18 @@ eleventyExcludeFromCollections: true that I already have worked on or that I want to work on in the future.

@@ -90,7 +92,7 @@ eleventyExcludeFromCollections: true

About

This website is open source and hosted at - SourceHut. It's an entirely static webpage generated by + Codeberg e.V.. It's an entirely static webpage generated by {{ eleventy.generator }} and hosted with Caddy.

From 54e15e2637e8419df1eaa964e3f935dbce0b0136 Mon Sep 17 00:00:00 2001 From: lauralani Date: Fri, 7 Apr 2023 19:06:51 +0200 Subject: [PATCH 3/8] update CI --- .woodpecker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 4c084d1..b7a0f73 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -4,7 +4,7 @@ pipeline: event: push build: - image: node:latest + image: node:19 commands: - npm install -D @11ty/eleventy - npx @11ty/eleventy --input=. --output=public From 9ff1b65fd64911c07b4c24c65e0c1e14979564ec Mon Sep 17 00:00:00 2001 From: lauralani Date: Fri, 7 Apr 2023 19:16:36 +0200 Subject: [PATCH 4/8] maybe fix CI? --- .woodpecker.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index b7a0f73..5b8fcf5 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -25,5 +25,3 @@ pipeline: - ssh-keyscan -t ed25519 $TARGET_SERVER >> $HOME/.ssh/known_hosts - cd public/ - rsync -avh --delete ./ $TARGET_USER@$TARGET_SERVER:$TARGET_PATH - -branches: main From 53d1cf4baa5a79bea04bf74687054826b3431651 Mon Sep 17 00:00:00 2001 From: lauralani Date: Fri, 7 Apr 2023 19:18:30 +0200 Subject: [PATCH 5/8] meh --- .woodpecker.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 5b8fcf5..f872601 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -1,7 +1,4 @@ pipeline: - when: - branch: main - event: push build: image: node:19 From 3b63766823d8ecff22e5ab3b6e0980cd033bb282 Mon Sep 17 00:00:00 2001 From: lauralani Date: Fri, 7 Apr 2023 19:20:46 +0200 Subject: [PATCH 6/8] add tag and branch conditions to pipeline --- .woodpecker.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index f872601..a557b07 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -1,5 +1,7 @@ +when: + event: push + branch: main pipeline: - build: image: node:19 commands: From 2e8e90d44a386fce7cff42604d28ce23b96d1f17 Mon Sep 17 00:00:00 2001 From: lauralani Date: Sat, 8 Apr 2023 21:56:09 +0200 Subject: [PATCH 7/8] remove matrix files --- .builds/deploy.yml | 21 --------------------- .well-known/.gitkeep | 0 .well-known/matrix/client | 5 ----- .well-known/matrix/server | 3 --- 4 files changed, 29 deletions(-) delete mode 100644 .builds/deploy.yml create mode 100644 .well-known/.gitkeep delete mode 100644 .well-known/matrix/client delete mode 100644 .well-known/matrix/server diff --git a/.builds/deploy.yml b/.builds/deploy.yml deleted file mode 100644 index 8952266..0000000 --- a/.builds/deploy.yml +++ /dev/null @@ -1,21 +0,0 @@ -image: debian/bullseye -packages: - - nodejs - - rsync -repositories: - nodejs: https://deb.nodesource.com/node_18.x bullseye main 1655A0AB68576280 -environment: - REMOTE: cloud.lauka.net -secrets: - - 54755283-43f7-44a6-97fb-70db08184ff1 -tasks: - - prepare: | - cd www-lauka-net - npm install -D @11ty/eleventy - - build: | - cd www-lauka-net - npx @11ty/eleventy --input=./ --output=public - - deploy: | - ssh-keyscan -t ed25519 $REMOTE >> $HOME/.ssh/known_hosts - cd www-lauka-net/public - rsync -avh --delete --chown=webadmin:caddy ./ webadmin@$REMOTE:/webroot/www.lauka.net diff --git a/.well-known/.gitkeep b/.well-known/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/.well-known/matrix/client b/.well-known/matrix/client deleted file mode 100644 index ab08d53..0000000 --- a/.well-known/matrix/client +++ /dev/null @@ -1,5 +0,0 @@ -{ - "m.homeserver": { - "base_url": "https://matrix.lauka.net" - } -} diff --git a/.well-known/matrix/server b/.well-known/matrix/server deleted file mode 100644 index e0df730..0000000 --- a/.well-known/matrix/server +++ /dev/null @@ -1,3 +0,0 @@ -{ - "m.server": "matrix.lauka.net:443" -} From 33662537200f492ac34d79121431f098b2961750 Mon Sep 17 00:00:00 2001 From: lauralani Date: Sun, 9 Apr 2023 18:55:47 +0200 Subject: [PATCH 8/8] update branding and contact options --- README.md | 6 +++--- index.njk | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index ff8839e..b691d51 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,9 @@ # www.lauka.net -## SourceHut deploy status -[![SourceHut CI Status](https://builds.sr.ht/~lauralani/www-lauka-net.svg)](https://builds.sr.ht/~lauralani/www-lauka-net) +## Deploy Status +[![CI Status Badge](https://ci.codeberg.org/api/badges/lauralani/www-lauka-net/status.svg)](https://ci.codeberg.org/lauralani/www-lauka-net) ## About This is the source code for my personal website. -It's an entirely static webpage generated by Eleventy and hosted with Caddy. +It's an entirely static webpage built with [Eleventy](https://www.11ty.dev/) and hosted with Caddy. diff --git a/index.njk b/index.njk index db11d64..2f95f79 100644 --- a/index.njk +++ b/index.njk @@ -82,6 +82,7 @@ eleventyExcludeFromCollections: true @lauralani@chaos.social

  • mail (at) (this domain)
    • +
  • matrix: @lauralani:matrix.org
  • LinkedIn