From f3d741de417cbf0b68fdfaf67b50c67ef522ad0f Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Wed, 16 Nov 2022 19:19:56 +0100 Subject: [PATCH] remove paste.kunsmann.eu vhost and redirect --- data/powerdns/files/bind-zones/kunsmann.eu | 11 +++-------- nodes/rx300.py | 23 +++++++--------------- 2 files changed, 10 insertions(+), 24 deletions(-) diff --git a/data/powerdns/files/bind-zones/kunsmann.eu b/data/powerdns/files/bind-zones/kunsmann.eu index 09e964f..ed4ff73 100644 --- a/data/powerdns/files/bind-zones/kunsmann.eu +++ b/data/powerdns/files/bind-zones/kunsmann.eu @@ -8,18 +8,13 @@ $ORIGIN kunsmann.eu. IN MX 10 rx300.kunbox.net. IN TXT "v=spf1 mx ~all" +git IN CNAME rx300.kunbox.net. grafana IN CNAME influxdb.htz-cloud.kunbox.net. icinga IN CNAME icinga2.ovh.kunbox.net. influxdb IN CNAME influxdb.htz-cloud.kunbox.net. -statusmonitor.icinga IN CNAME icinga2.ovh.kunbox.net. - -mta-sts IN CNAME rx300.kunbox.net. - luther-ps IN CNAME luther.htz-cloud.kunbox.net. - -; legacy, for redirect -git IN CNAME rx300.kunbox.net. -paste IN CNAME rx300.kunbox.net. +mta-sts IN CNAME rx300.kunbox.net. +statusmonitor.icinga IN CNAME icinga2.ovh.kunbox.net. _dmarc IN TXT "v=DMARC1; p=quarantine; rua=mailto:hostmaster@kunbox.net; 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/rx300.py b/nodes/rx300.py index 79455c6..91c1840 100644 --- a/nodes/rx300.py +++ b/nodes/rx300.py @@ -350,6 +350,13 @@ nodes['rx300'] = { 'ssl': '_.franzi.business', 'extras': True, }, + 'git.kunsmann.eu': { + 'locations': { + '/': { + 'redirect': 'https://git.franzi.business$request_uri', + }, + }, + }, 'kunbox.net': {}, 'kunsmann.eu': { 'locations': { @@ -421,22 +428,6 @@ nodes['rx300'] = { 'website_check_path': '/start?do=login', 'website_check_string': 'Username', }, - - # legacy domains - 'git.kunsmann.eu': { - 'locations': { - '/': { - 'redirect': 'https://git.franzi.business$request_uri', - }, - }, - }, - 'paste.kunsmann.eu': { - 'locations': { - '/': { - 'redirect': 'https://paste.franzi.business$request_uri', - }, - }, - }, }, 'worker_processes': 8, },