17 files changed, 153 insertions, 63 deletions
diff --git a/hosts.d/anoia.tyil.net b/hosts.d/anoia.tyil.net
index da37125..c41fbfb 100644
--- a/hosts.d/anoia.tyil.net
+++ b/hosts.d/anoia.tyil.net
@@ -1,4 +1,6 @@
-bashtard.backup.fs.paths.1=/home/tyil
-bashtard.ssh.host=10.57.100.3
+bashtard.backup.fs.paths.1=/etc
+bashtard.backup.fs.paths.2=/home/tyil
+bashtard.backup.repositories.1=rsync.net:{fqdn}
 meta.provider=self
-vpn-tinc.ipv4=10.57.100.3
+vpn-tinc.ipv4=10.57.0.4
+vpn-tinc.ipv6=fd68:1057:1992:3381:0:0:3317:4
diff --git a/hosts.d/caeghi.tyil.net b/hosts.d/caeghi.tyil.net
index ce19c3f..b17df23 100644
--- a/hosts.d/caeghi.tyil.net
+++ b/hosts.d/caeghi.tyil.net
@@ -3,6 +3,8 @@ bashtard.backup.fs.paths.1=/etc
 bashtard.backup.fs.paths.2=/home
 bashtard.backup.fs.paths.3=/var/lib/mumble-server
 bashtard.backup.repositories.1=rsync.net:{fqdn}
-bashtard.ssh.host=10.57.20.2
 meta.provider=hetzner
-vpn-tinc.ipv4=10.57.20.2
+vpn-tinc.ipv4=10.57.1.3
+vpn-tinc.ipv6=fd68:1057:1992:3381:0:1:1:1
+vpn-wireguard.ipv4=10.58.1.3
+vpn-wireguard.ipv6=fd68:1058:1992:3381:0:1:1:1
diff --git a/hosts.d/denahnu.tyil.net b/hosts.d/denahnu.tyil.net
deleted file mode 100644
index e699c41..0000000
--- a/hosts.d/denahnu.tyil.net
+++ /dev/null
@@ -1,7 +0,0 @@
-bashtard.backup.borg.remote_paths.1=borg1
-bashtard.backup.fs.paths.1=/usr/home
-bashtard.backup.fs.paths.2=/usr/local/etc
-bashtard.backup.repositories.1=rsync.net:{fqdn}
-bashtard.ssh.host=10.57.20.4
-meta.provider=arubacloud
-vpn-tinc.ipv4=10.57.20.4
diff --git a/hosts.d/edephas.tyil.net b/hosts.d/edephas.tyil.net
index acef6fe..f86f044 100644
--- a/hosts.d/edephas.tyil.net
+++ b/hosts.d/edephas.tyil.net
@@ -1,34 +1,11 @@
 bashtard.backup.borg.remote_paths.rsync=borg1
 bashtard.backup.db.postgresql.user=postgres
-bashtard.backup.elements.1=database_postgres
+bashtard.backup.elements.1=database_postgresql
 bashtard.backup.fs.paths.1=/home/tyil
 bashtard.backup.fs.paths.2=/home/tyil/.local/git
 bashtard.backup.fs.paths.3=/var/www/*
 bashtard.backup.repositories.edephas=/var/media/backups/{fqdn}
 bashtard.backup.repositories.rsync=rsync.net:{fqdn}
-bashtard.ssh.host=10.57.100.7
-git.repos.bashtard.description=Configuration Management System in Bash
-git.repos.bashtard-playbooks/vpn-tinc.description=A Bashtard playbook for configuring tinc
-git.repos.bashtard-playbooks/www-static.description=A Bashtard playbook for generating static websites
-git.repos.blog.description=The source files to my blog, www.tyil.nl
-git.repos.dotfiles.description=My user-level configuration files, use with caution!
-git.repos.helm/invidious.description=Helm chart to deploy Invidious
-git.repos.helm/nitter.description=Helm chart to deploy Nitter
-git.repos.raku/config-parser-toml.description=TOML parser for Config
-git.repos.raku/config-parser-yaml.description=YAML parser for Config
-git.repos.raku/config.description=Extensible library for reading and writing configuration files in the Raku programming language
-git.repos.raku/hash-merge.description=Raku module for deep merging of Hashes
-git.repos.raku/io-path-xdg.description=Convenience functions for working with the XDG Base Directory Specification in the Raku programming language
-git.repos.raku/irc-client.description=Sources for the IRC::Client module for the Raku programming language
-git.repos.raku/irc-grammar.description=Grammar to parse IRC messages
-git.repos.raku/log-colored.description=A Log implementation with colored output
-git.repos.raku/log-json.description=A Log implementation with JSON formatted output
-git.repos.raku/log-simple.description=A simple implementation of the Log library for the Raku programming language
-git.repos.raku/log.description=An interface for logging mechanisms in the Raku programming language
-git.repos.raku/string-fold.description=Fold strings to a certain length
-git.repos.raku/url.description=A Raku library to handle URLs
-git.repos.rakudo-star.description=User-friendly distribution of the Raku programming language
-git.repos.tyilnet.description=Configuration for machines in my personal network
-git.repos.vim/camelcasemotion.description=A plugin for vim to make motions stop at camelCase or snake_case boundaries
 meta.provider=self
-vpn-tinc.ipv4=10.57.100.7
+vpn-tinc.ipv4=10.57.0.1
+vpn-tinc.ipv6=fd68:1057:1992:3381:0:0:3317:1
diff --git a/hosts.d/faiwoo.tyil.net b/hosts.d/faiwoo.tyil.net
index b8a7d1a..1efb888 100644
--- a/hosts.d/faiwoo.tyil.net
+++ b/hosts.d/faiwoo.tyil.net
@@ -1,7 +1,12 @@
+k3s-node.internal-ip=fd68:1057:1992:3381:0:1:1:2,10.57.1.4
 bashtard.backup.borg.remote_paths.1=borg1
 bashtard.backup.fs.paths.1=/home
 bashtard.backup.fs.paths.2=/var/www
+bashtard.backup.fs.paths.3=/etc
 bashtard.backup.repositories.1=rsync.net:{fqdn}
-bashtard.ssh.host=10.57.20.5
 meta.provider=hetzner
-vpn-tinc.ipv4=10.57.20.5
+vpn-tinc.ipv4=10.57.1.4
+vpn-tinc.ipv6=fd68:1057:1992:3381:0:1:1:2
+vpn-wireguard.endpoint=2a01:4f9:c010:e20c::1
+vpn-wireguard.ipv4=10.58.1.4
+vpn-wireguard.ipv6=fd68:1058:1992:3381:0:1:1:2
diff --git a/hosts.d/gaeru.tyil.net b/hosts.d/gaeru.tyil.net
index 07f931c..bc01b3a 100644
--- a/hosts.d/gaeru.tyil.net
+++ b/hosts.d/gaeru.tyil.net
@@ -1,3 +1,10 @@
-bashtard.ssh.host=10.57.20.6
-meta.provider=hetzner
-vpn-tinc.ipv4=10.57.20.6
+bashtard.backup.borg.remote_paths.1=borg1
+bashtard.backup.fs.paths.1=/etc
+bashtard.backup.fs.paths.2=/home
+bashtard.backup.repositories.1=rsync.net:{fqdn}
+meta.provider=leaseweb
+vpn-tinc.ipv4=10.57.1.2
+vpn-tinc.ipv6=fd68:1057:1992:3381:0:1:2:1
+vpn-wireguard.endpoint=37.48.120.26
+vpn-wireguard.ipv4=10.58.1.2
+vpn-wireguard.ipv6=fd68:1058:1992:3381:0:1:2:1
diff --git a/hosts.d/hurzak.tyil.net b/hosts.d/hurzak.tyil.net
deleted file mode 100644
index f5b0ec7..0000000
--- a/hosts.d/hurzak.tyil.net
+++ /dev/null
@@ -1,7 +0,0 @@
-bashtard.backup.borg.remote_paths.1=borg1
-bashtard.backup.fs.paths.1=/etc
-bashtard.backup.fs.paths.2=/home
-bashtard.backup.repositories.1=rsync.net:{fqdn}
-bashtard.ssh.host=10.57.20.7
-meta.provider=leaseweb
-vpn-tinc.ipv4=10.57.20.7
diff --git a/hosts.d/ivdea.tyil.net b/hosts.d/ivdea.tyil.net
deleted file mode 100644
index 2427d97..0000000
--- a/hosts.d/ivdea.tyil.net
+++ /dev/null
@@ -1,6 +0,0 @@
-bashtard.backup.borg.remote_paths.1=borg1
-bashtard.backup.fs.paths.1=/etc
-bashtard.backup.fs.paths.2=/home/tyil
-bashtard.ssh.host=10.57.100.8
-meta.provider=self
-vpn-tinc.ipv4=10.57.100.8
diff --git a/hosts.d/jaomox.tyil.net b/hosts.d/jaomox.tyil.net
index 10af86f..f9c9af9 100644
--- a/hosts.d/jaomox.tyil.net
+++ b/hosts.d/jaomox.tyil.net
@@ -1,6 +1,28 @@
 bashtard.backup.borg.remote_paths.1=borg1
 bashtard.backup.fs.paths.1=/etc
 bashtard.backup.fs.paths.2=/home/tyil
-bashtard.ssh.host=10.57.21.1
-meta.provider=self
-vpn-tinc.ipv4=10.57.21.1
+bashtard.backup.repositories.1=rsync.net:{fqdn}
+meta.provider=oneprovider
+nftables.input.rules.seaweedfs-filer.policy=accept
+nftables.input.rules.seaweedfs-filer.port=8888
+nftables.input.rules.seaweedfs-filer.proto=tcp
+nftables.input.rules.seaweedfs-master.policy=accept
+nftables.input.rules.seaweedfs-master.port=9333
+nftables.input.rules.seaweedfs-master.proto=tcp
+nftables.input.rules.seaweedfs-s3.policy=accept
+nftables.input.rules.seaweedfs-s3.port=8333
+nftables.input.rules.seaweedfs-s3.proto=tcp
+nftables.input.rules.seaweedfs-volume-0.policy=accept
+nftables.input.rules.seaweedfs-volume-0.port=8080
+nftables.input.rules.seaweedfs-volume-0.proto=tcp
+seaweedfs-filer.ip&=vpn-wireguard.ipv6
+seaweedfs-master.ip&=vpn-wireguard.ipv6
+seaweedfs-volume.ip&=vpn-wireguard.ipv6
+seaweedfs-volume.dc&=meta.provider
+seaweedfs-volume.rack=amsterdam
+seaweedfs-volume.volumes.0.port=8080
+vpn-tinc.ipv4=10.57.3.2
+vpn-tinc.ipv6=fd68:1057:1992:3381:0:3:3:1
+vpn-wireguard.endpoint=163.172.218.246
+vpn-wireguard.ipv4=10.58.3.2
+vpn-wireguard.ipv6=fd68:1058:1992:3381:0:3:3:1
diff --git a/hosts.d/krohxe.tyil.net b/hosts.d/krohxe.tyil.net
deleted file mode 100644
index 4388eee..0000000
--- a/hosts.d/krohxe.tyil.net
+++ /dev/null
@@ -1,2 +0,0 @@
-meta.provider=self
-vpn-tinc.ipv4=10.57.20.8
diff --git a/hosts.d/ludifah.tyil.net b/hosts.d/ludifah.tyil.net
index 5e4a628..214404b 100644
--- a/hosts.d/ludifah.tyil.net
+++ b/hosts.d/ludifah.tyil.net
@@ -1,3 +1,7 @@
-bashtard.ssh.host=10.57.100.9
+bashtard.backup.borg.remote_paths.1=borg1
+bashtard.backup.fs.paths.1=/etc
+bashtard.backup.fs.paths.2=/home/tyil
+bashtard.backup.repositories.1=rsync.net:{fqdn}
 meta.provider=self
-vpn.ipv4=10.57.100.9
+vpn-tinc.ipv4=10.57.0.2
+vpn-tinc.ipv6=fd68:1057:1992:3381:0:0:3317:2
diff --git a/hosts.d/mieshu.tyil.net b/hosts.d/mieshu.tyil.net
new file mode 100644
index 0000000..47b12ae
--- /dev/null
+++ b/hosts.d/mieshu.tyil.net
@@ -0,0 +1,46 @@
+git.repodir=/mnt/pool/git
+git.repos.bashtard.description=Configuration Management System in Bash
+git.repos.bashtard/k3s-master.description=A Bashtard playbook to set up k3s on a single-node
+git.repos.bashtard/vpn-tinc.description=A Bashtard playbook for configuring tinc
+git.repos.bashtard/www-static.description=A Bashtard playbook for generating static websites
+git.repos.blog.description=The source files to my blog, www.tyil.nl
+git.repos.dotfiles.description=My user-level configuration files, use with caution!
+git.repos.helm/invidious.description=Helm chart to deploy Invidious
+git.repos.helm/nitter.description=Helm chart to deploy Nitter
+git.repos.kubernetes/nfs-operator.description=An operator for Kubernetes to provision NFS mounts for PVC resources
+git.repos.raku/config-parser-toml.description=TOML parser for Config
+git.repos.raku/config-parser-yaml.description=YAML parser for Config
+git.repos.raku/config.description=Extensible library for reading and writing configuration files in the Raku programming language
+git.repos.raku/hash-merge.description=Raku module for deep merging of Hashes
+git.repos.raku/io-path-xdg.description=Convenience functions for working with the XDG Base Directory Specification in the Raku programming language
+git.repos.raku/irc-client.description=Sources for the IRC::Client module for the Raku programming language
+git.repos.raku/irc-grammar.description=Grammar to parse IRC messages
+git.repos.raku/log-colored.description=A Log implementation with colored output
+git.repos.raku/log-json.description=A Log implementation with JSON formatted output
+git.repos.raku/log-simple.description=A simple implementation of the Log library for the Raku programming language
+git.repos.raku/log.description=An interface for logging mechanisms in the Raku programming language
+git.repos.raku/string-fold.description=Fold strings to a certain length
+git.repos.raku/url.description=A Raku library to handle URLs
+git.repos.rakudo-star.description=User-friendly distribution of the Raku programming language
+git.repos.tyilnet.description=Configuration for machines in my personal network
+git.repos.vim/camelcasemotion.description=A plugin for vim to make motions stop at camelCase or snake_case boundaries
+k3s-node.role=server
+meta.provider=self
+nfs-server.exports./mnt/exports/invidious.fsid=97d3493c-1397-479f-bb8a-5c71833b9e17
+nfs-server.exports./mnt/exports/lldap.fsid=ee8ee25b-6f14-47f0-81b1-f6fe03a9761f
+nfs-server.exports./mnt/exports/prometheus.fsid=052f42b5-33c0-40b9-aa69-d05dc03a9fa1
+seaweedfs-volume.dc=schokkerstraat
+seaweedfs-volume.rack=main
+seaweedfs-volume.volumes.tyilstore0.port.grpc=17080
+seaweedfs-volume.volumes.tyilstore0.port.http=5080
+seaweedfs-volume.volumes.tyilstore1.port.grpc=17081
+seaweedfs-volume.volumes.tyilstore1.port.http=5081
+seaweedfs-volume.volumes.tyilstore2.port.grpc=17082
+seaweedfs-volume.volumes.tyilstore2.port.http=5082
+seaweedfs-volume.volumes.tyilstore3.port.grpc=17083
+seaweedfs-volume.volumes.tyilstore3.port.http=5083
+vpn-tinc.ipv4=10.57.3.1
+vpn-tinc.ipv6=fd68:1057:1992:3381:0:3:3317:1
+vpn-wireguard.endpoint=2a10:3781:2453:1:7aaf:8ff:fe7a:9ba8
+vpn-wireguard.ipv4=10.58.3.1
+vpn-wireguard.ipv6=fd68:1058:1992:3381:0:3:3317:1
diff --git a/hosts.d/nouki.tyil.net b/hosts.d/nouki.tyil.net
new file mode 100644
index 0000000..cefffc2
--- /dev/null
+++ b/hosts.d/nouki.tyil.net
@@ -0,0 +1,7 @@
+k3s-node.role=server
+meta.provider=self
+vpn-tinc.ipv4=10.57.2.1
+vpn-tinc.ipv6=fd68:1057:1992:3381:0:2:3317:1
+vpn-wireguard.endpoint=2a10:3781:2453:1:c8cb:d1a:bc0:dc38
+vpn-wireguard.ipv4=10.58.2.1
+vpn-wireguard.ipv6=fd68:1058:1992:3381:0:2:3317:1
diff --git a/hosts.d/oolah.tyil.net b/hosts.d/oolah.tyil.net
new file mode 100644
index 0000000..174cb84
--- /dev/null
+++ b/hosts.d/oolah.tyil.net
@@ -0,0 +1,7 @@
+k3s-node.internal-ip=fd68:1057:1992:3381:0:1:3317:1,10.57.1.1
+meta.provider=self
+vpn-tinc.ipv4=10.57.1.1
+vpn-tinc.ipv6=fd68:1057:1992:3381:0:1:3317:1
+vpn-wireguard.endpoint=2a10:3781:2453:1:7aaf:8ff:fe7a:9ba8
+vpn-wireguard.ipv4=10.58.1.1
+vpn-wireguard.ipv6=fd68:1058:1992:3381:0:1:3317:1
diff --git a/hosts.d/plarabe.tyil.net b/hosts.d/plarabe.tyil.net
new file mode 100644
index 0000000..4163491
--- /dev/null
+++ b/hosts.d/plarabe.tyil.net
@@ -0,0 +1,3 @@
+meta.provider=self
+vpn-tinc.ipv4=10.57.0.3
+vpn-tinc.ipv6=fd68:1057:1992:3381:0:0:3317:3
diff --git a/hosts.d/qohrei.tyil.net b/hosts.d/qohrei.tyil.net
new file mode 100644
index 0000000..f206068
--- /dev/null
+++ b/hosts.d/qohrei.tyil.net
@@ -0,0 +1,18 @@
+k3s-node.internal-ip=fd68:1058:1992:3381:0:1:1:1,10.58.1.1
+meta.provider=hetzner
+nftables.input.interfaces.cilium*.policy=accept
+nftables.input.interfaces.lxc*.policy=accept
+nftables.input.rules.etcd.policy=accept
+nftables.input.rules.etcd.port=2379-2381
+nftables.input.rules.etcd.proto=tcp
+nftables.input.rules.kubeapi.policy=accept
+nftables.input.rules.kubeapi.port=6443
+nftables.input.rules.kubeapi.proto=tcp
+nftables.input.rules.kubelet.policy=accept
+nftables.input.rules.kubelet.port=10250
+nftables.input.rules.kubelet.proto=tcp
+vpn-tinc.ipv4=10.57.1.6
+vpn-tinc.ipv6=fd68:1057:1992:3381:0:1:1:3
+vpn-wireguard.endpoint=2a01:4f9:c012:6273::1
+vpn-wireguard.ipv4=10.58.1.6
+vpn-wireguard.ipv6=fd68:1058:1992:3381:0:1:1:3
diff --git a/hosts.d/ricui.tyil.net b/hosts.d/ricui.tyil.net
new file mode 100644
index 0000000..9c4c8b5
--- /dev/null
+++ b/hosts.d/ricui.tyil.net
@@ -0,0 +1,12 @@
+k3s-node.internal-ip=fd68:1057:1992:3381:0:1:1:4,10.57.1.7
+meta.provider=hetzner
+nftables.input.interfaces.cilium*.policy=accept
+nftables.input.interfaces.lxc*.policy=accept
+nftables.input.rules.kubelet.policy=accept
+nftables.input.rules.kubelet.port=10250
+nftables.input.rules.kubelet.proto=tcp
+vpn-tinc.ipv4=10.57.1.7
+vpn-tinc.ipv6=fd68:1057:1992:3381:0:1:1:4
+vpn-wireguard.endpoint=2a01:4f8:1c1b:67d7::1
+vpn-wireguard.ipv4=10.58.1.7
+vpn-wireguard.ipv6=fd68:1058:1992:3381:0:1:1:4