From 3ab8eb88bd67fd7e9252f4e8cf20ccb361924f8b Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Sat, 15 Jul 2023 07:01:00 +0200 Subject: [PATCH] move matrix from rx300 to carlene --- nodes/carlene.toml | 56 +++++++++++++++++++++++++++++++++++++++++++++- nodes/rx300.py | 12 +++++----- 2 files changed, 61 insertions(+), 7 deletions(-) diff --git a/nodes/carlene.toml b/nodes/carlene.toml index f05f64f..685bd02 100644 --- a/nodes/carlene.toml +++ b/nodes/carlene.toml @@ -1,10 +1,17 @@ hostname = "193.135.9.29" groups = [ "debian-bookworm", + "webserver", ] bundles = [ + "matrix-media-repo", + "matrix-synapse", + "mautrix-telegram", + "mautrix-whatsapp", + "redis", "smartd", "check-mail-received", + "postgresql", "zfs", ] @@ -16,9 +23,53 @@ imap_pass = "!bwpass_attr:t-online.de/franzi.kunsmann@t-online.de:imap" [metadata.interfaces.eno1] ips = [ "193.135.9.29/24", + "2a0a:51c0:0:225::2/64", ] gateway4 = "193.135.9.1" -#gateway6 = "" +gateway6 = "2a0a:51c0:0:225::1" + +[metadata.matrix-media-repo] +admins = ["@kunsi:franzi.business"] +sha1 = "0915bdf7c461368859180419d1f66717969cbe32" +upload_max_mb = 500 +version = "v1.2.13" +[metadata.matrix-media-repo.homeservers.'franzi.business'] +api = "synapse" +domain = "http://[::1]:20080/" + +[metadata.matrix-synapse] +admin_contact = "mailto:hostmaster@kunbox.net" +baseurl = "matrix.franzi.business" +server_name = "franzi.business" +trusted_key_servers = ["matrix.org", "finallycoffee.eu"] +additional_client_config.'im.vector.riot.jitsi'.preferredDomain = "meet.ffmuc.net" +# wellknown_also_on_vhosts = ["franzi.business"] + +[metadata.mautrix-telegram] +version = "v0.14.1" +homeserver.domain = "franzi.business" +homeserver.url = "https://matrix.franzi.business" +telegram.api_id = "!decrypt:encrypt$gAAAAABfVK5SmDDru-UQxitkE5VhPArnUBhaRbAqQPvAW2Fh3fd1XDrWxa3Qn4BSnJAPNWglH5wil_SXUMcIm95FMhPe8dVeMQ==" +telegram.api_token = "!decrypt:encrypt$gAAAAABfVK5jHuUly1xr9Iku362k7oF4ZYRhLGzNJh3aJpiNrLfAy_DJpTwucx4FV_g45dyQF5boqG2rgdDfwsJN_Ab95es6T4SPGiXIxJOBlvIln1Torwh16pXKchhUTn_PQ077Ll1W" +# same as for matrix-dimension +telegram.bot_token = "!decrypt:encrypt$gAAAAABfVK51ErJ6gfsOOkbRxSHDnVYmf7EihAQf7Uwj9og3TlAw64WRsA6ZVEgTSvOdLB3SMKZ-cTEhwkCOpbymq-_WLhes-hZALhN-H_oXHaxTQErJ0lARynKmjM-4ZhoGlUWlfh4Q" +provisioning.enabled = true +provisioning.shared_secret = "!decrypt:encrypt$gAAAAABfVKflEMAi07C_QGP8cy97hF-4gGPym0oF6p4WSMdAveTpx-hFsZd2s7v9ubw99yIsyKx0dHOJI0UND7hV1rKZdvjy4Qa642abZ2wwW7SWTqvuP_qVtrf6-klc2QKTzeD9c_LVsyZ2dqz_JxRPq3MRXgkubZuWOZ6FmFlAlteTffoGfWE=" +[metadata.mautrix-telegram.permissions] +"'*'" = "relaybot" +'franzi.business' = "full" +"'@kunsi:franzi.business'" = "admin" + +[metadata.mautrix-whatsapp] +version = "v0.8.6" +sha1 = "aa3c25aa2f8d2ddd241e2f73eea473ecdbaf295d" +permissions."'@kunsi:franzi.business'" = "admin" +[metadata.mautrix-whatsapp.homeserver] +domain = "franzi.business" +url = "https://matrix.franzi.business" + +[metadata.postgresql] +version = 15 [metadata.smartd] disks = [ @@ -33,6 +84,9 @@ devices = [ ] type = "mirror" +[metadata.zfs.datasets.tank] +primarycache = "metadata" + [metadata.vm] cpu = 24 ram = 64 diff --git a/nodes/rx300.py b/nodes/rx300.py index 9d71ea9..5a1272b 100644 --- a/nodes/rx300.py +++ b/nodes/rx300.py @@ -16,13 +16,13 @@ nodes['rx300'] = { 'jugendhackt_tools', 'lm-sensors', 'matrix-dimension', - 'matrix-media-repo', - 'matrix-synapse', - 'mautrix-telegram', - 'mautrix-whatsapp', + #'matrix-media-repo', + #'matrix-synapse', + #'mautrix-telegram', + #'mautrix-whatsapp', 'miniflux', 'minecraft', - 'mx-puppet-discord', + #'mx-puppet-discord', 'netbox', 'nodejs', 'ntfy', @@ -335,7 +335,7 @@ nodes['rx300'] = { 'forgejo': {'ssl': '_.franzi.business'}, 'jenkins-ci': {'ssl': '_.franzi.business'}, 'matrix-dimension': {'ssl': '_.franzi.business'}, - 'matrix-synapse': {'ssl': '_.franzi.business'}, + #'matrix-synapse': {'ssl': '_.franzi.business'}, 'miniflux': {'ssl': '_.franzi.business'}, 'netbox': {'ssl': '_.franzi.business'}, 'ntfy': {'ssl': '_.franzi.business'},