diff --git a/data/nginx/files/extras/htz.ex42-1048908/paste.kunsmann.eu b/data/nginx/files/extras/rx300/paste.franzi.business similarity index 100% rename from data/nginx/files/extras/htz.ex42-1048908/paste.kunsmann.eu rename to data/nginx/files/extras/rx300/paste.franzi.business diff --git a/data/powerdns/files/bind-zones/die-brontosaurier-waren-es.org b/data/powerdns/files/bind-zones/die-brontosaurier-waren-es.org index edc2000..b2a06d9 100644 --- a/data/powerdns/files/bind-zones/die-brontosaurier-waren-es.org +++ b/data/powerdns/files/bind-zones/die-brontosaurier-waren-es.org @@ -2,7 +2,8 @@ ${header} $ORIGIN die-brontosaurier-waren-es.org. -@ 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/data/powerdns/files/bind-zones/franzi.business b/data/powerdns/files/bind-zones/franzi.business index da97226..6322690 100644 --- a/data/powerdns/files/bind-zones/franzi.business +++ b/data/powerdns/files/bind-zones/franzi.business @@ -26,6 +26,7 @@ sewfile IN CNAME sewfile.htz-cloud.kunbox.net. IN TXT "v=spf1 a mx ~all" rss IN CNAME rx300.kunbox.net. +paste IN CNAME rx300.kunbox.net. status IN CNAME icinga2.ovh.kunbox.net. travelynx IN CNAME rx300.kunbox.net. unicornsden IN CNAME rx300.kunbox.net. diff --git a/data/powerdns/files/bind-zones/kunsmann.eu b/data/powerdns/files/bind-zones/kunsmann.eu index fde641b..a51deaf 100644 --- a/data/powerdns/files/bind-zones/kunsmann.eu +++ b/data/powerdns/files/bind-zones/kunsmann.eu @@ -21,11 +21,9 @@ mta-sts IN AAAA 2a01:4f8:10b:2a5f::2 luther-ps IN CNAME luther.htz-cloud.kunbox.net. -paste IN A 94.130.52.224 -paste IN AAAA 2a01:4f8:10b:2a5f::2 - ; legacy, for redirect git IN CNAME ex42-1048908.htz.kunbox.net. +paste IN CNAME ex42-1048908.htz.kunbox.net. _dmarc IN TXT "v=DMARC1; p=quarantine; rua=mailto:postmaster@kunsmann.eu; ruf=mailto:postmaster@kunsmann.eu; fo=0:d:s; adkim=r; aspf=r" _mta-sts IN TXT "v=STSv1;id=20201111;" diff --git a/nodes/htz/ex42-1048908.py b/nodes/htz/ex42-1048908.py index 74794c3..8829d5f 100644 --- a/nodes/htz/ex42-1048908.py +++ b/nodes/htz/ex42-1048908.py @@ -228,15 +228,6 @@ nodes['htz.ex42-1048908'] = { } }, }, - 'daskritzelt-redirect': { - 'domain': 'die-brontosaurier-waren-es.org', - 'ssl': None, - 'locations': { - '/': { - 'redirect': 'https://twitter.com/daskritzelt/status/1259167444373028864', - }, - }, - }, 'dimension.franzi.business': { 'extras': True, 'do_not_set_content_security_headers': True, @@ -307,12 +298,11 @@ nodes['htz.ex42-1048908'] = { }, }, 'paste.kunsmann.eu': { - 'webroot_config': { - 'owner': 'kunsi', - 'group': 'kunsi', - 'mode': '0755', + 'locations': { + '/': { + 'redirect': 'https://paste.franzi.business$request_uri', + }, }, - 'extras': True, }, 'postfixadmin.mx0.kunbox.net': { 'webroot': '/opt/postfixadmin/public/', diff --git a/nodes/rx300.py b/nodes/rx300.py index dd778b1..6bf2d03 100644 --- a/nodes/rx300.py +++ b/nodes/rx300.py @@ -127,6 +127,15 @@ nodes['rx300'] = { 'jenkins-ci': {'ssl': '_.franzi.business'}, 'miniflux': {'ssl': '_.franzi.business'}, 'travelynx': {'ssl': '_.franzi.business'}, + 'daskritzelt-redirect': { + 'domain': 'die-brontosaurier-waren-es.org', + 'ssl': None, + 'locations': { + '/': { + 'redirect': 'https://twitter.com/daskritzelt/status/1259167444373028864', + }, + }, + }, 'franzi.business': { 'webroot': '/var/www/franzi.business/_site/', 'ssl': '_.franzi.business', @@ -174,6 +183,11 @@ nodes['rx300'] = { }, }, }, + 'paste.franzi.business': { + 'webroot': '/home/kunsi/public_html', + 'ssl': '_.franzi.business', + 'extras': True, + }, 'unicornsden-redirect': { 'domain': 'unicornsden.franzi.business', 'ssl': '_.franzi.business', @@ -266,6 +280,9 @@ nodes['rx300'] = { 'mountpoint': '/var/lib/libvirt', 'compression': 'on', }, + 'tank/home-kunsi': { + 'mountpoint': '/home/kunsi', + }, }, }, 'vm': {