Add mieshu to seaweedfs cluster

5 files changed, 29 insertions, 11 deletions

diff --git a/defaults b/defaults
index 5ad5abc..730bcc9 100644
--- a/defaults
+++ b/defaults
@@ -17,14 +17,14 @@ k3s-master.internal-ip&=k3s-node.internal-ip
 k3s-master.service-cidr=fd00:5::0/108,172.25.0.0/16
 k3s-master.service-node-port-min=1025
 k3s-node.bind-address&=vpn-wireguard.ipv6
+k3s-node.cluster-cidr&=k3s-master.cluster-cidr
+k3s-node.cluster-domain&=k3s-master.cluster-domain
 k3s-node.cluster-domain=k3s.tyil.nl
 k3s-node.entry.host=[fd68:1058:1992:3381:0:1:3317:1]
 k3s-node.external-ip&=k3s-node.internal-ip
 k3s-node.role=agent
-k3s-node.service-node-port-min&=k3s-master.service-node-port-min
-k3s-node.cluster-cidr&=k3s-master.cluster-cidr
 k3s-node.service-cidr&=k3s-master.service-cidr
-k3s-node.cluster-domain&=k3s-master.cluster-domain
+k3s-node.service-node-port-min&=k3s-master.service-node-port-min
 nftables.input.icmp.ipv4.policy=accept
 nftables.input.icmp.ipv4.rate=2/second
 nftables.input.icmp.ipv6.policy=accept
@@ -48,7 +48,9 @@ nftables.input.rules.wireguard.proto=udp
 nftables.input.state.established.policy=accept
 nftables.input.state.invalid.policy=drop
 nftables.input.state.related.policy=accept
+seaweedfs-filer.ip&=vpn-wireguard.ipv6
 seaweedfs-master.replication=100
+seaweedfs-volume.ip&=vpn-wireguard.ipv6
 vpn-tinc.name=tyilnet
 vpn-wireguard.interface=tyilnet1058
 vpn-wireguard.keepalive=10
diff --git a/hosts.d/mieshu.tyil.net b/hosts.d/mieshu.tyil.net
index 24eec1e..383048d 100644
--- a/hosts.d/mieshu.tyil.net
+++ b/hosts.d/mieshu.tyil.net
@@ -9,26 +9,37 @@ git.repos.dotfiles.description=My user-level configuration files, use with cauti
 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.description=Extensible library for reading and writing configuration files in the Raku programming language
 git.repos.raku/config-parser-toml.description=TOML parser for Config
 git.repos.raku/config-parser-yaml.description=YAML parser for Config
-git.repos.rakudo-star.description=User-friendly distribution of the Raku programming language
+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.description=An interface for logging mechanisms in the Raku programming language
 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.101.10
 vpn-tinc.ipv6=fd68:1057:1992:3381:0:3:3317:1
 vpn-wireguard.endpoint=2a10:3781:2453:1:7aaf:8ff:fe7a:9ba8
diff --git a/playbooks.d/seaweedfs-volume/playbook.bash b/playbooks.d/seaweedfs-volume/playbook.bash
index 8485ba0..875a2cd 100644
--- a/playbooks.d/seaweedfs-volume/playbook.bash
+++ b/playbooks.d/seaweedfs-volume/playbook.bash
@@ -69,13 +69,14 @@ playbook_sync() {
 		file_template "volume.conf" \
 			dc="$(config "$BASHTARD_PLAYBOOK.dc")" \
 			dir="/var/lib/seaweedfs/volume/$volume" \
-			disk="$(config "$BASHTARD_PLAYBOOK.volume.$volume.disk" "hdd")" \
-			max="$(config "$BASHTARD_PLAYBOOK.volume.$volume.max" "0")" \
-			free_space="$(config "$BASHTARD_PLAYBOOK.free-space" "10GiB")" \
+			disk="$(config "$BASHTARD_PLAYBOOK.volumes.$volume.disk" "hdd")" \
 			filesize_limit="$(config "$BASHTARD_PLAYBOOK.filesize-limit" "256")" \
+			free_space="$(config "$BASHTARD_PLAYBOOK.free-space" "10GiB")" \
 			ip="$(config "$BASHTARD_PLAYBOOK.ip")" \
+			max="$(config "$BASHTARD_PLAYBOOK.volumes.$volume.max" "0")" \
 			mserver="$(join_args "${peers[@]}")" \
-			port="$(config "$BASHTARD_PLAYBOOK.volume.$volume.port" "8080")" \
+			port_grpc="$(config "$BASHTARD_PLAYBOOK.volumes.$volume.port.grpc" "17080")" \
+			port_http="$(config "$BASHTARD_PLAYBOOK.volumes.$volume.port.http" "8080")" \
 			rack="$(config "$BASHTARD_PLAYBOOK.rack")" \
 			> "$buffer"
 
diff --git a/playbooks.d/seaweedfs-volume/share/volume.conf b/playbooks.d/seaweedfs-volume/share/volume.conf
index d659faa..e9310cb 100644
--- a/playbooks.d/seaweedfs-volume/share/volume.conf
+++ b/playbooks.d/seaweedfs-volume/share/volume.conf
@@ -1,5 +1,6 @@
 ip=[${ip}]
-port=${port}
+port=${port_http}
+port.grpc=${port_grpc}
 mserver=${mserver}
 
 dataCenter=${dc}
diff --git a/registry.d/mieshu.tyil.net b/registry.d/mieshu.tyil.net
index b1f38d8..8afac1f 100644
--- a/registry.d/mieshu.tyil.net
+++ b/registry.d/mieshu.tyil.net
@@ -2,6 +2,9 @@ etc-portage
 git-server
 k3s-node
 nfs-server
+seaweedfs
+seaweedfs-filer
+seaweedfs-volume
 ssh
 user-tyil
 vpn-tinc