From cd31340c3419afffee01843c28b06ecebe127ffc Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Mon, 6 Sep 2021 16:06:23 +0200 Subject: [PATCH] remove htz.ex42-1048908 --- .../dimension.franzi.business | 1 - .../htz.ex42-1048908/wiki.franzi.business | 12 --- data/powerdns/files/bind-zones/kunbox.net | 7 -- data/powerdns/files/bind-zones/kunsmann.eu | 7 +- .../powerdns/files/bind-zones/trans-agenda.eu | 3 - nodes/htz/README | 1 - nodes/htz/ex42-1048908.py | 80 ------------------- nodes/rx300.py | 17 +++- 8 files changed, 18 insertions(+), 110 deletions(-) delete mode 100644 data/nginx/files/extras/htz.ex42-1048908/dimension.franzi.business delete mode 100644 data/nginx/files/extras/htz.ex42-1048908/wiki.franzi.business delete mode 100644 nodes/htz/README delete mode 100644 nodes/htz/ex42-1048908.py diff --git a/data/nginx/files/extras/htz.ex42-1048908/dimension.franzi.business b/data/nginx/files/extras/htz.ex42-1048908/dimension.franzi.business deleted file mode 100644 index d8a3ff9..0000000 --- a/data/nginx/files/extras/htz.ex42-1048908/dimension.franzi.business +++ /dev/null @@ -1 +0,0 @@ - add_header Content-Security-Policy "frame-ancestors 'self' chat.franzi.business"; diff --git a/data/nginx/files/extras/htz.ex42-1048908/wiki.franzi.business b/data/nginx/files/extras/htz.ex42-1048908/wiki.franzi.business deleted file mode 100644 index cc1fc01..0000000 --- a/data/nginx/files/extras/htz.ex42-1048908/wiki.franzi.business +++ /dev/null @@ -1,12 +0,0 @@ - location ~ /(data|conf|bin|inc|vendor)/ { - deny all; - } - - location / { try_files $uri $uri/ @dokuwiki; } - - location @dokuwiki { - rewrite ^/_media/(.*) /lib/exe/fetch.php?media=$1 last; - rewrite ^/_detail/(.*) /lib/exe/detail.php?media=$1 last; - rewrite ^/_export/([^/]+)/(.*) /doku.php?do=export_$1&id=$2 last; - rewrite ^/(.*) /doku.php?id=$1&$args last; - } diff --git a/data/powerdns/files/bind-zones/kunbox.net b/data/powerdns/files/bind-zones/kunbox.net index 99af2fa..afe8891 100644 --- a/data/powerdns/files/bind-zones/kunbox.net +++ b/data/powerdns/files/bind-zones/kunbox.net @@ -11,14 +11,7 @@ $ORIGIN kunbox.net. IN TXT "v=spf1 mx ~all" ; Mail servers -mx0 IN A 94.130.52.224 - IN AAAA 2a01:4f8:10b:2a5f::2 - IN AAAA 2a01:4f8:10b:2a5f::1337 mta-sts IN CNAME rx300 -mta-sts.mx0 IN CNAME rx300 -postfixadmin.mx0 IN CNAME mx0 -rspamd.mx0 IN CNAME mx0 -webmail.mx0 IN CNAME mx0 ; Nameservers ns-1 IN A 34.89.208.78 diff --git a/data/powerdns/files/bind-zones/kunsmann.eu b/data/powerdns/files/bind-zones/kunsmann.eu index 7d6f2e7..7bdf0aa 100644 --- a/data/powerdns/files/bind-zones/kunsmann.eu +++ b/data/powerdns/files/bind-zones/kunsmann.eu @@ -8,9 +8,6 @@ $ORIGIN kunsmann.eu. IN MX 10 rx300.kunbox.net. IN TXT "v=spf1 mx ~all" -dav IN A 94.130.52.224 -dav IN AAAA 2a01:4f8:10b:2a5f::2 - grafana IN CNAME influxdb.htz-cloud.kunbox.net. icinga IN CNAME icinga2.ovh.kunbox.net. influxdb IN CNAME influxdb.htz-cloud.kunbox.net. @@ -21,8 +18,8 @@ mta-sts IN CNAME rx300.kunbox.net. luther-ps IN CNAME luther.htz-cloud.kunbox.net. ; legacy, for redirect -git IN CNAME ex42-1048908.htz.kunbox.net. -paste IN CNAME ex42-1048908.htz.kunbox.net. +git IN CNAME rx300.kunbox.net. +paste IN CNAME rx300.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/data/powerdns/files/bind-zones/trans-agenda.eu b/data/powerdns/files/bind-zones/trans-agenda.eu index 92eb0d6..46688df 100644 --- a/data/powerdns/files/bind-zones/trans-agenda.eu +++ b/data/powerdns/files/bind-zones/trans-agenda.eu @@ -7,9 +7,6 @@ $ORIGIN trans-agenda.eu. mta-sts IN CNAME rx300.kunbox.net. -part.of.the IN A 94.130.52.224 -part.of.the IN AAAA 2a01:4f8:10b:2a5f::1337 - _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;" _smtp._tls IN TXT "v=TLSRPTv1;rua=mailto:hostmaster@kunbox.net" diff --git a/nodes/htz/README b/nodes/htz/README deleted file mode 100644 index f1251cb..0000000 --- a/nodes/htz/README +++ /dev/null @@ -1 +0,0 @@ -Hetzner Hardware Servers diff --git a/nodes/htz/ex42-1048908.py b/nodes/htz/ex42-1048908.py deleted file mode 100644 index da2c131..0000000 --- a/nodes/htz/ex42-1048908.py +++ /dev/null @@ -1,80 +0,0 @@ -nodes['htz.ex42-1048908'] = { - 'bundles': { - 'check-mail-received', - 'lm-sensors', - 'smartd', - }, - 'groups': { - 'debian-buster', - 'webserver', - }, - 'metadata': { - 'interfaces': { - 'enp0s31f6': { - 'ips': { - '94.130.52.224/26', - '2a01:4f8:10b:2a5f::02/64', - '2a01:4f8:10b:2a5f::1337/64', - }, - 'gateway4': '94.130.52.193', - 'gateway6': 'fe80::1', - }, - }, - 'check-mail-received': { - 't-online': { - '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'), - }, - }, - 'icinga_options': { - 'pretty_name': 'kunsmann.eu', - }, - 'locale': { - 'installed': { - # legacy - 'en_DK.UTF-8', - }, - }, - 'nginx': { - 'security.txt': { - 'contact': 'mailto:security@kunsmann.eu', - 'Encryption': 'https://franzi.business/gpg_hi-kunsmann.eu.asc', - }, - 'vhosts': { - 'dav.kunsmann.eu': { - 'locations': { - '/': { - 'redirect': 'https://radicale.franzi.business$request_uri', - }, - }, - }, - 'git.kunsmann.eu': { - 'locations': { - '/': { - 'redirect': 'https://git.franzi.business$request_uri', - }, - }, - }, - 'paste.kunsmann.eu': { - 'locations': { - '/': { - 'redirect': 'https://paste.franzi.business$request_uri', - }, - }, - }, - }, - 'worker_processes': 4, - }, - 'smartd': { - 'disks': { - '/dev/nvme0', - '/dev/nvme1', - }, - }, - 'vm': { - 'cpu': 8, - 'ram': 64, - }, - }, -} diff --git a/nodes/rx300.py b/nodes/rx300.py index 033ee9d..f7d72c7 100644 --- a/nodes/rx300.py +++ b/nodes/rx300.py @@ -332,7 +332,6 @@ nodes['rx300'] = { 'domain': 'mta-sts.kunbox.net', 'domain_aliases': { 'mta-sts.franzi.business', - 'mta-sts.mx0.kunbox.net', 'mta-sts.kunsmann.eu', 'mta-sts.trans-agenda.eu', }, @@ -379,6 +378,22 @@ 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, },