From 2e57e85e87943ff51ef132db2f6b1930759e7bab Mon Sep 17 00:00:00 2001 From: Alex Denes Date: Sat, 19 Jun 2021 10:57:56 +0000 Subject: [PATCH] Set SOA to pkgver and shorten/generalize bindzones --- data/bindzone/APKBUILD | 22 ++++++---- data/bindzone/crxn | 4 +- data/bindzone/internal | 61 +++++++++++++------------- data/bindzone/redxen.eu | 94 ++++++++++++++++++++--------------------- 4 files changed, 92 insertions(+), 89 deletions(-) diff --git a/data/bindzone/APKBUILD b/data/bindzone/APKBUILD index 7beea9a..43903c8 100644 --- a/data/bindzone/APKBUILD +++ b/data/bindzone/APKBUILD @@ -3,7 +3,7 @@ . ../APKBUILD-data.template -pkgver=2021.06.02.05 +pkgver=2021.06.19.02 pkgrel=0 checkdepends="bind-tools" makedepends=" @@ -11,13 +11,13 @@ makedepends=" redxen-secret-opendkim-dns~2021.05.31.01 redxen-secret-dnssec~2021.05.31.01 " -subpackages="$pkgname-redxen $pkgname-crxn $pkgname-internal" +subpackages="$pkgname-redxen $pkgname-internal" options="" source=" redxen.eu - crxn internal " +# crxn # NOTE: Outdated prepare() { default_prepare @@ -36,6 +36,11 @@ check() { } build() { + # Set SOA to pkgver + for i in $source; do + rx_replace "CURRENTSOA" "$(echo $pkgver | sed 's/\.//g')" "$i"-mod + done + # Add OpenDKIM to redxen.eu cat /etc/redxen/opendkim/dns-record >> redxen.eu-mod @@ -55,16 +60,15 @@ redxen() { rx_install "redxen.eu-mod" "redxen.eu" } -crxn() { - rx_install "crxn-mod" "crxn" -} +#crxn() { +# rx_install "crxn-mod" "crxn" +#} internal() { rx_install "internal-mod" "internal" } sha512sums=" -57609ce0e886987f6ee26ab94eb50c767ce68e4a2fc1d0e8129744e0b100358902ab836054ea56fbd09d9361754696b502735e698ce59dcb4a2f0d196264d005 redxen.eu -7a487f4f350310c2f1d3f7bf422352264b8ebe3dec1b5892685c59912aed8542711e253638d30f87e2b9b97144a12222de10ebe23ce6bb54a958ec7e5b35743d crxn -fa666d183c762ac026389bd5bb9a95a816ea8a4739a4f1817527f4c50abda73668423c8574902bd944ad21b3a57f6dd44d336b9262f8795b7f61be16953ef209 internal +7a98eaed632f276286d9dee0ebd2cecb7e045c2e32e8fbcd82bffa23d3bb57a8572a094fcdcbd19ff862145ae28426dcc32ef67bd4ece8d568f32bec636834cf redxen.eu +f6e43a72d91106319151c614f12d2f3a498a0378870901d9e7e2ecacf62b40060c4f314a6e6cdd1683ec56067e014182e4389f1c9387c58e381bad64349bda15 internal " diff --git a/data/bindzone/crxn b/data/bindzone/crxn index d85b71e..e8a9d25 100644 --- a/data/bindzone/crxn +++ b/data/bindzone/crxn @@ -1,8 +1,8 @@ ; -; .crxn zonefile +; .crxn zonefile (outdated) ; -@ IN SOA 9804624.nbg1-dc3.hetzner.redxen admin.redxen.eu. 2021021701 ( 1800 120 604800 3600 ) +@ IN SOA 9804624.nbg1-dc3.hetzner.redxen admin.redxen.eu. CURRENTSOA ( 1800 120 604800 3600 ) ; ; RedXen diff --git a/data/bindzone/internal b/data/bindzone/internal index 71128ed..6c139d7 100644 --- a/data/bindzone/internal +++ b/data/bindzone/internal @@ -2,41 +2,40 @@ ; .internal zonefile for internal RedXen usage ; -@ IN SOA 12180625.nbg1-dc3.hetzner admin.redxen.eu. 2021060101 ( 1800 120 604800 3600 ) +$TTL 120 + +@ 86400 IN SOA 12180625.nbg1-dc3.hetzner admin.redxen.eu. CURRENTSOA ( 86400 + 7200 + 3600000 + 3600 ) ; NS records -@ IN NS @ -@ 86400 IN A 127.0.0.1 -@ 86400 IN AAAA ::1 +@ 86400 NS @ + +@ 86400 A 127.0.0.1 + 86400 AAAA ::1 ; Machines -12180623.nbg1-dc3.hetzner 86400 IN A 10.10.0.2 -12180621.nbg1-dc3.hetzner 86400 IN A 10.10.0.3 -12180625.nbg1-dc3.hetzner 86400 IN A 10.10.0.4 -12180710.fsn1-dc14.hetzner 86400 IN A 10.10.0.5 -12180711.fsn1-dc14.hetzner 86400 IN A 10.10.0.6 - -; Familiar names -chisa.nurnberg.hetzner 86400 IN CNAME 12180623.nbg1-dc3.hetzner -karu.nurnberg.hetzner 86400 IN CNAME 12180621.nbg1-dc3.hetzner -rein.nurnberg.hetzner 86400 IN CNAME 12180625.nbg1-dc3.hetzner -masami.falkenstein.hetzner 86400 IN CNAME 12180710.fsn1-dc14.hetzner -lin.falkenstein.hetzner 86400 IN CNAME 12180711.fsn1-dc14.hetzner +12180623.nbg1-dc3.hetzner 86400 A 10.10.0.2 +12180621.nbg1-dc3.hetzner 86400 A 10.10.0.3 +12180625.nbg1-dc3.hetzner 86400 A 10.10.0.4 +12180710.fsn1-dc14.hetzner 86400 A 10.10.0.5 +12180711.fsn1-dc14.hetzner 86400 A 10.10.0.6 ; Services -_grafana._tcp.routinginfo 60 IN SRV 0 5 7577 12180710.fsn1-dc14.hetzner -_gitea._tcp.routinginfo 60 IN SRV 0 5 7570 12180710.fsn1-dc14.hetzner -_gitssh._tcp.routinginfo 60 IN SRV 0 5 7571 12180710.fsn1-dc14.hetzner -_transmission._tcp.routinginfo 60 IN SRV 0 5 7572 12180710.fsn1-dc14.hetzner -_root._tcp.routinginfo 60 IN SRV 0 5 7575 12180710.fsn1-dc14.hetzner -_packages._tcp.routinginfo 60 IN SRV 0 5 7574 12180710.fsn1-dc14.hetzner -_seedown._tcp.routinginfo 60 IN SRV 0 5 7576 12180710.fsn1-dc14.hetzner +_grafana._tcp.routinginfo SRV 0 5 7577 12180710.fsn1-dc14.hetzner +_gitea._tcp.routinginfo SRV 0 5 7570 12180710.fsn1-dc14.hetzner +_gitssh._tcp.routinginfo SRV 0 5 7571 12180710.fsn1-dc14.hetzner +_transmission._tcp.routinginfo SRV 0 5 7572 12180710.fsn1-dc14.hetzner +_root._tcp.routinginfo SRV 0 5 7575 12180710.fsn1-dc14.hetzner +_packages._tcp.routinginfo SRV 0 5 7574 12180710.fsn1-dc14.hetzner +_seedown._tcp.routinginfo SRV 0 5 7576 12180710.fsn1-dc14.hetzner -postgresql.routinginfo 86400 IN CNAME 12180625.nbg1-dc3.hetzner -redis.routinginfo 86400 IN CNAME 12180625.nbg1-dc3.hetzner -influxdb.routinginfo 86400 IN CNAME 12180625.nbg1-dc3.hetzner -rspamd.routinginfo 86400 IN CNAME 12180623.nbg1-dc3.hetzner -opendkim.routinginfo 86400 IN CNAME 12180623.nbg1-dc3.hetzner -dovecot.routinginfo 86400 IN CNAME 12180623.nbg1-dc3.hetzner -postfix.routinginfo 86400 IN CNAME 12180623.nbg1-dc3.hetzner -murmur.routinginfo 86400 IN CNAME 12180623.nbg1-dc3.hetzner +postgresql.routinginfo CNAME 12180625.nbg1-dc3.hetzner +redis.routinginfo CNAME 12180625.nbg1-dc3.hetzner +influxdb.routinginfo CNAME 12180625.nbg1-dc3.hetzner +rspamd.routinginfo CNAME 12180623.nbg1-dc3.hetzner +opendkim.routinginfo CNAME 12180623.nbg1-dc3.hetzner +dovecot.routinginfo CNAME 12180623.nbg1-dc3.hetzner +postfix.routinginfo CNAME 12180623.nbg1-dc3.hetzner +murmur.routinginfo CNAME 12180623.nbg1-dc3.hetzner diff --git a/data/bindzone/redxen.eu b/data/bindzone/redxen.eu index 6373150..e6b41c6 100644 --- a/data/bindzone/redxen.eu +++ b/data/bindzone/redxen.eu @@ -2,95 +2,95 @@ ; redxen.eu zonefile ; -@ 86400 IN SOA 12180711.nbg1-dc3.hetzner admin 2021060101 ( 1800 - 120 - 604800 - 3600 ) +$TTL 21600 + +@ 86400 IN SOA 12180621.nbg1-dc3.hetzner admin CURRENTSOA ( 86400 + 7200 + 3600000 + 3600 ) ; ; Nameservers (NS) ; -@ 10800 IN NS 12180621.nbg1-dc3.hetzner -@ 10800 IN NS 12180711.fsn1-dc14.hetzner +@ NS 12180621.nbg1-dc3.hetzner + NS 12180711.fsn1-dc14.hetzner ; ; Machines (A/AAAA) ; Only unique identifiers here! ; -12180623.nbg1-dc3.hetzner 86400 IN A 157.90.22.104 -12180623.nbg1-dc3.hetzner 86400 IN AAAA 2a01:4f8:c2c:b2fc::1 -12180621.nbg1-dc3.hetzner 86400 IN A 157.90.160.106 -12180621.nbg1-dc3.hetzner 86400 IN AAAA 2a01:4f8:c2c:8d34::1 -12180625.nbg1-dc3.hetzner 86400 IN A 162.55.191.184 -12180625.nbg1-dc3.hetzner 86400 IN AAAA 2a01:4f8:1c1c:c412::1 -12180710.fsn1-dc14.hetzner 86400 IN A 162.55.167.227 -12180710.fsn1-dc14.hetzner 86400 IN AAAA 2a01:4f8:c010:91ff::1 -12180711.fsn1-dc14.hetzner 86400 IN A 162.55.167.240 -12180711.fsn1-dc14.hetzner 86400 IN AAAA 2a01:4f8:c010:920a::1 +12180623.nbg1-dc3.hetzner 86400 A 157.90.22.104 + 86400 AAAA 2a01:4f8:c2c:b2fc::1 +12180621.nbg1-dc3.hetzner 86400 A 157.90.160.106 + 86400 AAAA 2a01:4f8:c2c:8d34::1 +12180625.nbg1-dc3.hetzner 86400 A 162.55.191.184 + 86400 AAAA 2a01:4f8:1c1c:c412::1 +12180710.fsn1-dc14.hetzner 86400 A 162.55.167.227 + 86400 AAAA 2a01:4f8:c010:91ff::1 +12180711.fsn1-dc14.hetzner 86400 A 162.55.167.240 + 86400 AAAA 2a01:4f8:c010:920a::1 ; ; Familiar records (CNAME) ; These can be duplicates if they somehow collide. ; -chisa.nurnberg.hetzner 86400 IN CNAME 12180623.nbg1-dc3.hetzner -karu.nurnberg.hetzner 86400 IN CNAME 12180621.nbg1-dc3.hetzner -rein.nurnberg.hetzner 86400 IN CNAME 12180625.nbg1-dc3.hetzner -masami.falkenstein.hetzner 86400 IN CNAME 12180710.fsn1-dc14.hetzner -lin.falkenstein.hetzner 86400 IN CNAME 12180711.fsn1-dc14.hetzner +chisa.nurnberg.hetzner CNAME 12180623.nbg1-dc3.hetzner +karu.nurnberg.hetzner CNAME 12180621.nbg1-dc3.hetzner +rein.nurnberg.hetzner CNAME 12180625.nbg1-dc3.hetzner +masami.falkenstein.hetzner CNAME 12180710.fsn1-dc14.hetzner +lin.falkenstein.hetzner CNAME 12180711.fsn1-dc14.hetzner ; ; Servers ; ; Frontend -@ 10800 IN A 157.90.160.106 -@ 10800 IN AAAA 2a01:4f8:c2c:8d34::1 -@ 10800 IN A 162.55.167.240 -@ 10800 IN AAAA 2a01:4f8:c010:920a::1 +@ A 157.90.160.106 + AAAA 2a01:4f8:c2c:8d34::1 +@ A 162.55.167.240 + AAAA 2a01:4f8:c010:920a::1 ; ; Services ; ; Frontend -; social 10800 IN CNAME @ ; on HOLD -; monerod 10800 IN CNAME @ ; on HOLD -git 10800 IN CNAME @ -stats 10800 IN CNAME @ -sd 10800 IN CNAME @ -packages 10800 IN CNAME @ -seed 10800 IN CNAME @ +; social CNAME @ ; on HOLD +; monerod CNAME @ ; on HOLD +git CNAME @ +stats CNAME @ +sd CNAME @ +packages CNAME @ +seed CNAME @ ; Wireguard -wireguard 10800 IN CNAME 12180621.nbg1-dc3.hetzner +wireguard CNAME 12180621.nbg1-dc3.hetzner ; Mumble -mumble 10800 IN CNAME 12180623.nbg1-dc3.hetzner +mumble CNAME 12180623.nbg1-dc3.hetzner ; Xonotic -; xonotic 10800 IN CNAME 9804624.nbg1-dc3.hetzner +; xonotic CNAME 9804624.nbg1-dc3.hetzner ; Minetest -; minetest 10800 IN CNAME 9804624.nbg1-dc3.hetzner +; minetest CNAME 9804624.nbg1-dc3.hetzner ; Mail -@ 10800 IN MX 10 mail +@ MX 10 12180623.nbg1-dc3.hetzner ; MX mustn't be a alias -mail 10800 IN A 157.90.22.104 -mail 10800 IN AAAA 2a01:4f8:c2c:b2fc::1 +mail CNAME 12180623.nbg1-dc3.hetzner +smtp CNAME 12180623.nbg1-dc3.hetzner +imap CNAME 12180623.nbg1-dc3.hetzner -smtp 10800 IN CNAME 12180623.nbg1-dc3.hetzner -imap 10800 IN CNAME 12180623.nbg1-dc3.hetzner - -@ 10800 IN TXT "v=spf1 mx -all" -_DMARC 10800 IN TXT "v=DMARC1; p=quarantine; rua=mailto:postmaster@redxen.eu; ruf=mailto:postmaster@redxen.eu; fo=1; pct=100" +@ TXT "v=spf1 mx -all" +_DMARC TXT "v=DMARC1; p=quarantine; rua=mailto:postmaster@redxen.eu; ruf=mailto:postmaster@redxen.eu; fo=1; pct=100" ; Mumble -_mumble._tcp 10800 IN SRV 0 5 64738 12180623.nbg1-dc3.hetzner +_mumble._tcp SRV 0 5 64738 12180623.nbg1-dc3.hetzner ; ACME -; _acme-challenge 300 IN TXT "---" -; _acme-challenge 300 IN TXT "---" +; _acme-challenge 300 TXT "---" +; 300 TXT "---" ; Build-time records and custom ones