From bd77f8da936fb118a147c5fa0ff2a7990ebe7660 Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Fri, 9 Jul 2021 16:11:53 +0200 Subject: [PATCH] move franzi.business to rx300 --- .../powerdns/files/bind-zones/franzi.business | 5 +- nodes/htz/ex42-1048908.py | 62 +++++++++---------- nodes/rx300.py | 32 ++++++++++ 3 files changed, 66 insertions(+), 33 deletions(-) diff --git a/data/powerdns/files/bind-zones/franzi.business b/data/powerdns/files/bind-zones/franzi.business index dfcba6e..13c56cb 100644 --- a/data/powerdns/files/bind-zones/franzi.business +++ b/data/powerdns/files/bind-zones/franzi.business @@ -2,8 +2,9 @@ ${header} $ORIGIN franzi.business. -@ IN A 94.130.52.224 - IN AAAA 2a01:4f8:10b:2a5f::2 +; ends up on rx300.kunbox.net +@ IN A 31.47.232.106 + IN AAAA 2a00:f820:528::2 IN MX 10 mx0.kunbox.net. IN TXT "v=spf1 mx ~all" diff --git a/nodes/htz/ex42-1048908.py b/nodes/htz/ex42-1048908.py index 8744c04..91f18bb 100644 --- a/nodes/htz/ex42-1048908.py +++ b/nodes/htz/ex42-1048908.py @@ -295,37 +295,37 @@ nodes['htz.ex42-1048908'] = { }, }, }, - 'franzi.business': { - 'webroot': '/var/www/franzi.business/_site/', - 'locations': { - '/.well-known/matrix/client': { - 'return': json_dumps({ - 'm.homeserver': { - 'base_url': 'https://matrix.franzi.business', - }, - 'm.identity_server': { - 'base_url': 'https://matrix.org', - }, - 'im.vector.riot.jitsi': { - 'preferredDomain': 'meet.ffmuc.net', - }, - }, sort_keys=True), - 'additional_config': { - 'default_type application/json', - 'add_header Access-Control-Allow-Origin *', - }, - }, - '/.well-known/matrix/server': { - 'return': json_dumps({ - 'm.server': 'matrix.franzi.business:443', - }, sort_keys=True), - 'additional_config': { - 'default_type application/json', - 'add_header Access-Control-Allow-Origin *', - }, - }, - }, - }, +# 'franzi.business': { +# 'webroot': '/var/www/franzi.business/_site/', +# 'locations': { +# '/.well-known/matrix/client': { +# 'return': json_dumps({ +# 'm.homeserver': { +# 'base_url': 'https://matrix.franzi.business', +# }, +# 'm.identity_server': { +# 'base_url': 'https://matrix.org', +# }, +# 'im.vector.riot.jitsi': { +# 'preferredDomain': 'meet.ffmuc.net', +# }, +# }, sort_keys=True), +# 'additional_config': { +# 'default_type application/json', +# 'add_header Access-Control-Allow-Origin *', +# }, +# }, +# '/.well-known/matrix/server': { +# 'return': json_dumps({ +# 'm.server': 'matrix.franzi.business:443', +# }, sort_keys=True), +# 'additional_config': { +# 'default_type application/json', +# 'add_header Access-Control-Allow-Origin *', +# }, +# }, +# }, +# }, 'jenkins.kunsmann.eu': { 'locations': { '/': { diff --git a/nodes/rx300.py b/nodes/rx300.py index 97aec1d..cd17656 100644 --- a/nodes/rx300.py +++ b/nodes/rx300.py @@ -80,6 +80,38 @@ nodes['rx300'] = { 'vhosts': { 'gitea': {'ssl': '_.franzi.business'}, 'miniflux': {'ssl': '_.franzi.business'}, + 'franzi.business': { + 'webroot': '/var/www/franzi.business/_site/', + 'ssl': '_.franzi.business', + 'locations': { + '/.well-known/matrix/client': { + 'return': json_dumps({ + 'm.homeserver': { + 'base_url': 'https://matrix.franzi.business', + }, + 'm.identity_server': { + 'base_url': 'https://matrix.org', + }, + 'im.vector.riot.jitsi': { + 'preferredDomain': 'meet.ffmuc.net', + }, + }, sort_keys=True), + 'additional_config': { + 'default_type application/json', + 'add_header Access-Control-Allow-Origin *', + }, + }, + '/.well-known/matrix/server': { + 'return': json_dumps({ + 'm.server': 'matrix.franzi.business:443', + }, sort_keys=True), + 'additional_config': { + 'default_type application/json', + 'add_header Access-Control-Allow-Origin *', + }, + }, + }, + }, 'unicornsden': { 'domain': 'unicornsden.franzi.business', 'ssl': '_.franzi.business',