diff options
| -rw-r--r-- | defaults | 8 | ||||
| -rw-r--r-- | hosts.d/mieshu.tyil.net | 1 | ||||
| -rw-r--r-- | playbooks.d/seaweedfs-filer/playbook.bash | 21 | ||||
| -rw-r--r-- | playbooks.d/seaweedfs-filer/share/filer-leveldb3.toml (renamed from playbooks.d/seaweedfs-filer/share/filer.toml) | 2 | ||||
| -rw-r--r-- | playbooks.d/seaweedfs-filer/share/filer-postgres2.toml | 24 | ||||
| -rw-r--r-- | playbooks.d/seaweedfs/playbook.bash | 2 | ||||
| -rw-r--r-- | registry.d/jaomox.tyil.net | 4 | ||||
| -rw-r--r-- | registry.d/mieshu.tyil.net | 1 |
8 files changed, 52 insertions, 11 deletions
@@ -50,9 +50,11 @@ 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 +seaweedfs-filer.db.type=postgres2 +seaweedfs-filer.db.host=10.57.2.1 +seaweedfs-filer.ip&=vpn-tinc.ipv4 +seaweedfs-master.replication=001 +seaweedfs-volume.ip&=vpn-tinc.ipv4 vpn-tinc.name=tyilnet1057 vpn-tinc.peers.caeghi=caeghi_tyil_net vpn-tinc.peers.faiwoo=faiwoo_tyil_net diff --git a/hosts.d/mieshu.tyil.net b/hosts.d/mieshu.tyil.net index 4fe5bba..27e53e9 100644 --- a/hosts.d/mieshu.tyil.net +++ b/hosts.d/mieshu.tyil.net @@ -30,6 +30,7 @@ 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-master.ip&=vpn-tinc.ipv4 seaweedfs-volume.dc=schokkerstraat seaweedfs-volume.rack=main seaweedfs-volume.volumes.tyilstore0.port.grpc=17080 diff --git a/playbooks.d/seaweedfs-filer/playbook.bash b/playbooks.d/seaweedfs-filer/playbook.bash index 1a71f07..7ae23b2 100644 --- a/playbooks.d/seaweedfs-filer/playbook.bash +++ b/playbooks.d/seaweedfs-filer/playbook.bash @@ -66,8 +66,25 @@ playbook_sync() { s3_port="$(config "$BASHTARD_PLAYBOOK.s3.port" "8333")" \ > "$buffer" - file_template "filer.toml" \ - > "$(config "fs.etcdir")/seaweedfs/filer.toml" + case "$(config "$BASHTARD_PLAYBOOK.db.type" "leveldb3")" in + leveldb3) + file_template "filer-leveldb3.toml" \ + path="$(config "$BASHTARD_PLAYBOOK.db.path" "./filerldb3")" \ + > "$(config "fs.etcdir")/seaweedfs/filer.toml" + ;; + postgres2) + file_template "filer-postgres2.toml" \ + host="$(config "$BASHTARD_PLAYBOOK.db.host" "localhost")" \ + port="$(config "$BASHTARD_PLAYBOOK.db.port" "5432")" \ + name="$(config "$BASHTARD_PLAYBOOK.db.name" "seaweedfs")" \ + user="$(config "$BASHTARD_PLAYBOOK.db.user" "seaweedfs")" \ + pass="$(config "$BASHTARD_PLAYBOOK.db.password" "")" \ + > "$(config "fs.etcdir")/seaweedfs/filer.toml" + ;; + *) + alert "$BASHTARD_PLAYBOOK/sync" "No valid '$BASHTARD_PLAYBOOK.db.type' set" + return 1 + esac [[ "$(file_hash "$buffer")" == "$hash" ]] && return diff --git a/playbooks.d/seaweedfs-filer/share/filer.toml b/playbooks.d/seaweedfs-filer/share/filer-leveldb3.toml index 8d40cb9..da7324f 100644 --- a/playbooks.d/seaweedfs-filer/share/filer.toml +++ b/playbooks.d/seaweedfs-filer/share/filer-leveldb3.toml @@ -1,3 +1,3 @@ [leveldb3] enabled = true -dir = "./filerldb3" +dir = "${path}" diff --git a/playbooks.d/seaweedfs-filer/share/filer-postgres2.toml b/playbooks.d/seaweedfs-filer/share/filer-postgres2.toml new file mode 100644 index 0000000..d802703 --- /dev/null +++ b/playbooks.d/seaweedfs-filer/share/filer-postgres2.toml @@ -0,0 +1,24 @@ +[postgres2] +enabled = true +createTable = """ + CREATE TABLE IF NOT EXISTS "%s" ( + dirhash BIGINT, + name VARCHAR(65535), + directory VARCHAR(65535), + meta bytea, + PRIMARY KEY (dirhash, name) + ); +""" +hostname = "${host}" +port = ${port} +username = "${user}" +password = "${pass}" +database = "${name}" +schema = "" +sslmode = "disable" +connection_max_idle = 100 +connection_max_open = 100 +connection_max_lifetime_seconds = 0 +# if insert/upsert failing, you can disable upsert or update query syntax to match your RDBMS syntax: +enableUpsert = true +upsertQuery = """UPSERT INTO "%[1]s" (dirhash,name,directory,meta) VALUES($1,$2,$3,$4)""" diff --git a/playbooks.d/seaweedfs/playbook.bash b/playbooks.d/seaweedfs/playbook.bash index e6c0c4c..fabc958 100644 --- a/playbooks.d/seaweedfs/playbook.bash +++ b/playbooks.d/seaweedfs/playbook.bash @@ -14,7 +14,7 @@ playbook_add() { dl_baseurl="https://github.com/seaweedfs/seaweedfs/releases/download" dl_binary="$(printf "%s_%s.tar.gz" "${BASHTARD_PLATFORM[os]}" "$dl_arch")" - dl_version="$(config "$BASHTARD_PLAYBOOK.version" "3.63")" + dl_version="$(config "$BASHTARD_PLAYBOOK.version" "3.65")" buffer="$(tmpdir)" diff --git a/registry.d/jaomox.tyil.net b/registry.d/jaomox.tyil.net index cec0024..7d1718a 100644 --- a/registry.d/jaomox.tyil.net +++ b/registry.d/jaomox.tyil.net @@ -1,8 +1,4 @@ nftables -seaweedfs -seaweedfs-filer -seaweedfs-master -seaweedfs-volume ssh user-tyil vpn-tinc diff --git a/registry.d/mieshu.tyil.net b/registry.d/mieshu.tyil.net index 8afac1f..7247785 100644 --- a/registry.d/mieshu.tyil.net +++ b/registry.d/mieshu.tyil.net @@ -4,6 +4,7 @@ k3s-node nfs-server seaweedfs seaweedfs-filer +seaweedfs-master seaweedfs-volume ssh user-tyil |