Merge branch 'main' of codeberg.org:lauralani/www-lauka-net

.builds/deploy.yml

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

.well-known/matrix/client

@@ -1,5 +0,0 @@
-{
-    "m.homeserver": {
-        "base_url": "https://matrix.lauka.net"
-    }
-}

.well-known/matrix/server

@@ -1,3 +0,0 @@
-{
-    "m.server": "matrix.lauka.net:443"
-}

.woodpecker.yml

@@ -1,16 +1,26 @@
+when:
+  event: push
+  branch: main
 pipeline:
   build:
-    image: node:latest
+    image: node:19
     commands:
       - npm install -D @11ty/eleventy
       - npx @11ty/eleventy --input=. --output=public
 
   deploy:
-    image: node:18
+    image: alpine:latest
     secrets:
-      - SWA_CLI_DEPLOYMENT_TOKEN
+      - 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
+      - apk add --update --no-cache openssh rsync git
-      - npx @azure/static-web-apps-cli deploy ./public --env Production
+      - mkdir -p $HOME/.ssh
-
+      - echo "$SSH_KEY" > $HOME/.ssh/id_ed25519
-branches: main
+      - 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

README.md

@@ -1,9 +1,9 @@
 # www.lauka.net
 
-## SourceHut deploy status
+## Deploy Status
-[![SourceHut CI Status](https://builds.sr.ht/~lauralani/www-lauka-net.svg)](https://builds.sr.ht/~lauralani/www-lauka-net)
+[![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. 

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 =).
 </p>
 <h2>Books</h2>
 <p class="p-note">
@@ -49,17 +50,18 @@ eleventyExcludeFromCollections: true
     that I already have worked on or that I want to work on in the future.
 </p>
 <ul>
-    <li>building my own IPAM with <a href="https://go.dev/" target="_blank">Go</a>. 
+    <li>building my own IPAM with <a href="https://go.dev/" target="_blank">Golang</a>.
-        Source: <a href="https://sr.ht/~lauralani/ipam/" target="_blank">sr.ht/~lauralani/ipam</a> (still in development)
+        Source: <a href="https://codeberg.org/lauralani/ipam" target="_blank">https://codeberg.org/lauralani/ipam</a>
+        (still in development, but has a lot of features already! :)
     </li>
     <li>hosting my own mail with
         <a href="https://mailcow.email/" target="_blank">mailcow</a>
     </li>
-    <li>managing my domains via Infrastructure as Code and sourcehut CI with
+    <li>managing my domains via Infrastructure as Code and CI/CD with
         <a href="https://github.com/octodns/octodns" target="_blank">OctoDNS</a>
     </li>
     <li>wrote my own
-        <a href="https://sr.ht/~lauralani/dyndns-script/" target="_blank">dyndns tool</a>
+        <a href="https://codeberg.org/lauralani/dyndns-script" target="_blank">dyndns tool</a>
         in Python (supports Azure DNS and OVH)</li>
     <li>Automated my home WIFI with radius assigned VLANs via Freeradius and custom frontend</li>
 </ul>
@@ -80,6 +82,7 @@ eleventyExcludeFromCollections: true
         <a rel="me" href="https://chaos.social/@lauralani">@lauralani@chaos.social</a>
     </li>
     <li>mail (at) (this domain)</li>
+    <li>matrix: @lauralani:matrix.org</li>
     <li>
         <a href="https://www.linkedin.com/in/laura-kalb/" target="_blank">LinkedIn</a>
     </li>
@@ -90,7 +93,7 @@ eleventyExcludeFromCollections: true
 <h2>About</h2>
 <p class="p-note">
     This website is open source and hosted at 
-    <a href="https://git.sr.ht/~lauralani/www-lauka-net" target="_blank">SourceHut</a>. It's an entirely static webpage generated by
+    <a href="https://codeberg.org/lauralani/www-lauka-net" target="_blank">Codeberg e.V.</a>. It's an entirely static webpage generated by
     <a href="https://www.11ty.dev/" target="_blank">{{ eleventy.generator }}</a>
     and hosted with Caddy.
     <br/><br/>