diff --git a/nodes/carlene.toml b/nodes/carlene.toml index eb57bc3..6fc918b 100644 --- a/nodes/carlene.toml +++ b/nodes/carlene.toml @@ -4,10 +4,12 @@ groups = [ "webserver", ] bundles = [ + "element-web", "matrix-media-repo", "matrix-synapse", "mautrix-telegram", "mautrix-whatsapp", + "nodejs", "redis", "smartd", "check-mail-received", @@ -20,6 +22,16 @@ email = "franzi.kunsmann@t-online.de" imap_host = "secureimap.t-online.de" imap_pass = "!bwpass_attr:t-online.de/franzi.kunsmann@t-online.de:imap" +[metadata.element-web] +url = "chat.franzi.business" +version = "v1.11.36" +[metadata.element-web.config] +default_server_config.'m.homeserver'.base_url = "https://matrix.franzi.business" +default_server_config.'m.homeserver'.server_name = "franzi.business" +brand = "franzi.business" +defaultCountryCode = "DE" +jitsi.preferredDomain = "meet.ffmuc.net" + [metadata.interfaces.eno2] ips = [ "193.135.9.29/24", diff --git a/nodes/rx300.py b/nodes/rx300.py index 5a1272b..c7f7647 100644 --- a/nodes/rx300.py +++ b/nodes/rx300.py @@ -9,7 +9,7 @@ nodes['rx300'] = { 'bundles': { 'check-mail-received', 'dovecot', - 'element-web', + #'element-web', 'gitea', 'ipmitool', 'jenkins-ci', @@ -331,7 +331,7 @@ nodes['rx300'] = { 'Encryption': 'https://franzi.business/gpg_hi-kunsmann.eu.asc', }, 'vhosts': { - 'element-web': {'ssl': '_.franzi.business'}, + #'element-web': {'ssl': '_.franzi.business'}, 'forgejo': {'ssl': '_.franzi.business'}, 'jenkins-ci': {'ssl': '_.franzi.business'}, 'matrix-dimension': {'ssl': '_.franzi.business'}, @@ -355,6 +355,24 @@ nodes['rx300'] = { 'webroot': '/var/www/franzi.business/_site/', 'ssl': '_.franzi.business', 'extras': True, + "locations": { + "/.well-known/matrix/client": { + "additional_config": [ + "add_header Access-Control-Allow-Origin *", + "default_type application/json" + ], + "content": "{\"im.vector.riot.jitsi\": {\"preferredDomain\": \"meet.ffmuc.net\"}, \"m.homeserver\": {\"base_url\": \"https://matrix.franzi.business\"}, \"m.identity_server\": {\"base_url\": \"https://matrix.org\"}}", + "return": 200 + }, + "/.well-known/matrix/server": { + "additional_config": [ + "add_header Access-Control-Allow-Origin *", + "default_type application/json" + ], + "content": "{\"m.server\": \"matrix.franzi.business:443\"}", + "return": 200 + } + }, }, 'git.kunsmann.eu': { 'locations': {