summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--frontends/Rexfile6
-rw-r--r--frontends/etc/rsyncd.conf.tpl2
-rw-r--r--frontends/var/nsd/zones/master/buetow.org.zone.tpl25
-rw-r--r--frontends/var/nsd/zones/master/dtail.dev.zone.tpl4
-rw-r--r--frontends/var/nsd/zones/master/foo.surf.zone.tpl4
-rw-r--r--frontends/var/nsd/zones/master/foo.zone.zone.tpl6
-rw-r--r--frontends/var/nsd/zones/master/irregular.ninja.zone.tpl6
-rw-r--r--frontends/var/nsd/zones/master/sidewalk.ninja.zone.tpl6
-rw-r--r--frontends/var/nsd/zones/master/snonux.de.zone.tpl6
-rw-r--r--frontends/var/nsd/zones/master/snonux.land.zone.tpl6
-rw-r--r--frontends/var/nsd/zones/master/snonux.me.zone.tpl6
11 files changed, 32 insertions, 45 deletions
diff --git a/frontends/Rexfile b/frontends/Rexfile
index b8113d0..d91268f 100644
--- a/frontends/Rexfile
+++ b/frontends/Rexfile
@@ -14,9 +14,9 @@ use File::Slurp;
# REX CONFIG SECTION
-group frontends => 'blowfish.buetow.org', 'fishfinger.buetow.org', 'twofish.buetow.org';
+group frontends => 'blowfish.buetow.org', 'fishfinger.buetow.org';
group dnsmaster => 'blowfish.buetow.org';
-group dnsslaves => 'fishfinger.buetow.org', 'twofish.buetow.org';
+group dnsslaves => 'fishfinger.buetow.org';
user 'rex';
sudo TRUE;
@@ -31,7 +31,6 @@ parallelism 5;
our $ipv6address = sub {
my $hostname = shift;
return '2a01:4f8:c17:20f1::42' if $hostname eq 'blowfish';
- return '2401:c080:1000:45af:5400:3ff:fec6:ca1d' if $hostname eq 'twofish';
return '2a03:6000:6f67:624::99' if $hostname eq 'fishfinger';
Rex::Logger::info("Unable to determine IPv6 address for $hostname", 'error');
return '::1';
@@ -42,7 +41,6 @@ our $ipv6address = sub {
our $fqdns = sub {
my $ipv4 = shift;
return 'blowfish.buetow.org' if $ipv4 eq '23.88.35.144';
- return 'twofish.buetow.org' if $ipv4 eq '108.160.134.135';
return 'fishfinger.buetow.org' if $ipv4 eq '46.23.94.99';
Rex::Logger::info("Unable to determine hostname for $ipv4", 'error');
return 'HOSTNAME-UNKNOWN.buetow.org';
diff --git a/frontends/etc/rsyncd.conf.tpl b/frontends/etc/rsyncd.conf.tpl
index 86e6b0c..693d6c5 100644
--- a/frontends/etc/rsyncd.conf.tpl
+++ b/frontends/etc/rsyncd.conf.tpl
@@ -1,4 +1,4 @@
-<% my $allow = '108.160.134.135,2401:c080:1000:45af:5400:3ff:fec6:ca1d,*.buetow.org,localhost'; %>
+<% my $allow = '*.buetow.org,localhost'; %>
max connections = 5
timeout = 300
diff --git a/frontends/var/nsd/zones/master/buetow.org.zone.tpl b/frontends/var/nsd/zones/master/buetow.org.zone.tpl
index 811cc8d..89ff90e 100644
--- a/frontends/var/nsd/zones/master/buetow.org.zone.tpl
+++ b/frontends/var/nsd/zones/master/buetow.org.zone.tpl
@@ -7,18 +7,15 @@ $TTL 4h
7d ; expire
1h ) ; negative
IN NS blowfish.buetow.org.
- IN NS twofish.buetow.org.
IN NS fishfinger.buetow.org.
IN MX 10 blowfish.buetow.org.
- IN MX 20 twofish.buetow.org.
- IN MX 30 fishfinger.buetow.org.
+ IN MX 20 fishfinger.buetow.org.
86400 IN A 23.88.35.144
86400 IN AAAA 2a01:4f8:c17:20f1::42
* IN MX 10 blowfish.buetow.org.
-* IN MX 20 twofish.buetow.org.
-* IN MX 30 fishfinger.buetow.org.
+* IN MX 20 fishfinger.buetow.org.
* 86400 IN A 23.88.35.144
* 86400 IN AAAA 2a01:4f8:c17:20f1::42
@@ -29,21 +26,13 @@ paul 3600 IN CNAME blowfish
tmp 3600 IN CNAME blowfish
dory 3600 IN CNAME blowfish
-twofish 86400 IN A 108.160.134.135
-twofish 86400 IN AAAA 2401:c080:1000:45af:5400:3ff:fec6:ca1d
-git2 3600 IN CNAME twofish
-www 3600 IN CNAME twofish
-www.paul 3600 IN CNAME twofish
-www.tmp 3600 IN CNAME twofish
-www.dory 3600 IN CNAME twofish
-
fishfinger 86400 IN A 46.23.94.99
fishfinger 86400 IN AAAA 2a03:6000:6f67:624::99
-git3 3600 IN CNAME fishfinger
-ww3 3600 IN CNAME fishfinger
-ww3.paul 3600 IN CNAME fishfinger
-ww3.tmp 3600 IN CNAME fishfinger
-ww3.dory 3600 IN CNAME fishfinger
+git2 3600 IN CNAME fishfinger
+www 3600 IN CNAME fishfinger
+www.paul 3600 IN CNAME fishfinger
+www.tmp 3600 IN CNAME fishfinger
+www.dory 3600 IN CNAME fishfinger
vulcan 86400 IN A 95.216.174.192
vulcan 86400 IN AAAA 2a01:4f9:c010:250e::1
diff --git a/frontends/var/nsd/zones/master/dtail.dev.zone.tpl b/frontends/var/nsd/zones/master/dtail.dev.zone.tpl
index 72e531b..cc7bf66 100644
--- a/frontends/var/nsd/zones/master/dtail.dev.zone.tpl
+++ b/frontends/var/nsd/zones/master/dtail.dev.zone.tpl
@@ -7,11 +7,11 @@ $TTL 4h
7d ; expire
1h ) ; negative
IN NS blowfish.buetow.org.
- IN NS twofish.buetow.org.
+ IN NS fishfinger.buetow.org.
86400 IN A 23.88.35.144
86400 IN AAAA 2a01:4f8:c17:20f1::4
* 86400 IN CNAME blowfish.buetow.org.
-www 86400 IN CNAME twofish.buetow.org.
+www 86400 IN CNAME fishfinger.buetow.org.
github 86400 IN CNAME mimecast.github.io.
diff --git a/frontends/var/nsd/zones/master/foo.surf.zone.tpl b/frontends/var/nsd/zones/master/foo.surf.zone.tpl
index 54c3bce..c8539d6 100644
--- a/frontends/var/nsd/zones/master/foo.surf.zone.tpl
+++ b/frontends/var/nsd/zones/master/foo.surf.zone.tpl
@@ -7,10 +7,10 @@ $TTL 4h
7d ; expire
1h ) ; negative
IN NS blowfish.buetow.org.
- IN NS twofish.buetow.org.
+ IN NS fishfinger.buetow.org.
IN MX 20 blowfish.buetow.org.
- IN MX 10 twofish.buetow.org.
+ IN MX 10 fishfinger.buetow.org.
86400 IN A 108.160.134.135
86400 IN AAAA 2401:c080:1000:45af:5400:3ff:fec6:ca1d
diff --git a/frontends/var/nsd/zones/master/foo.zone.zone.tpl b/frontends/var/nsd/zones/master/foo.zone.zone.tpl
index 0974333..0e9c0c1 100644
--- a/frontends/var/nsd/zones/master/foo.zone.zone.tpl
+++ b/frontends/var/nsd/zones/master/foo.zone.zone.tpl
@@ -7,13 +7,13 @@ $TTL 4h
7d ; expire
1h ) ; negative
IN NS blowfish.buetow.org.
- IN NS twofish.buetow.org.
+ IN NS fishfinger.buetow.org.
IN MX 10 blowfish.buetow.org.
- IN MX 20 twofish.buetow.org.
+ IN MX 20 fishfinger.buetow.org.
300 IN A 23.88.35.144
300 IN AAAA 2a01:4f8:c17:20f1::42
* 300 IN CNAME blowfish.buetow.org.
-www 300 IN CNAME twofish.buetow.org.
+www 300 IN CNAME fishfinger.buetow.org.
codeberg 3600 IN CNAME snonux.codeberg.page.
diff --git a/frontends/var/nsd/zones/master/irregular.ninja.zone.tpl b/frontends/var/nsd/zones/master/irregular.ninja.zone.tpl
index 413d7ec..f75d922 100644
--- a/frontends/var/nsd/zones/master/irregular.ninja.zone.tpl
+++ b/frontends/var/nsd/zones/master/irregular.ninja.zone.tpl
@@ -7,12 +7,12 @@ $TTL 4h
7d ; expire
1h ) ; negative
IN NS blowfish.buetow.org.
- IN NS twofish.buetow.org.
+ IN NS fishfinger.buetow.org.
IN MX 10 blowfish.buetow.org.
- IN MX 20 twofish.buetow.org.
+ IN MX 20 fishfinger.buetow.org.
86400 IN A 23.88.35.144
86400 IN AAAA 2a01:4f8:c17:20f1::42
* 86400 IN CNAME blowfish.buetow.org.
-www 86400 IN CNAME twofish.buetow.org.
+www 86400 IN CNAME fishfinger.buetow.org.
diff --git a/frontends/var/nsd/zones/master/sidewalk.ninja.zone.tpl b/frontends/var/nsd/zones/master/sidewalk.ninja.zone.tpl
index 7b8b126..70644d8 100644
--- a/frontends/var/nsd/zones/master/sidewalk.ninja.zone.tpl
+++ b/frontends/var/nsd/zones/master/sidewalk.ninja.zone.tpl
@@ -7,12 +7,12 @@ $TTL 4h
7d ; expire
1h ) ; negative
IN NS blowfish.buetow.org.
- IN NS twofish.buetow.org.
+ IN NS fishfinger.buetow.org.
IN MX 10 blowfish.buetow.org.
- IN MX 20 twofish.buetow.org.
+ IN MX 20 fishfinger.buetow.org.
86400 IN A 23.88.35.144
86400 IN AAAA 2a01:4f8:c17:20f1::42
* 86400 IN CNAME blowfish.buetow.org.
-www 86400 IN CNAME twofish.buetow.org.
+www 86400 IN CNAME fishfinger.buetow.org.
diff --git a/frontends/var/nsd/zones/master/snonux.de.zone.tpl b/frontends/var/nsd/zones/master/snonux.de.zone.tpl
index 04f08c1..2215b02 100644
--- a/frontends/var/nsd/zones/master/snonux.de.zone.tpl
+++ b/frontends/var/nsd/zones/master/snonux.de.zone.tpl
@@ -7,12 +7,12 @@ $TTL 4h
7d ; expire
1h ) ; negative
IN NS blowfish.buetow.org.
- IN NS twofish.buetow.org.
+ IN NS fishfinger.buetow.org.
IN MX 10 blowfish.buetow.org.
- IN MX 20 twofish.buetow.org.
+ IN MX 20 fishfinger.buetow.org.
86400 IN A 23.88.35.144
86400 IN AAAA 2a01:4f8:c17:20f1::42
* 86400 IN CNAME blowfish.buetow.org.
-www 86400 IN CNAME twofish.buetow.org.
+www 86400 IN CNAME fishfinger.buetow.org.
diff --git a/frontends/var/nsd/zones/master/snonux.land.zone.tpl b/frontends/var/nsd/zones/master/snonux.land.zone.tpl
index 845ca65..bac1b57 100644
--- a/frontends/var/nsd/zones/master/snonux.land.zone.tpl
+++ b/frontends/var/nsd/zones/master/snonux.land.zone.tpl
@@ -7,12 +7,12 @@ $TTL 4h
7d ; expire
1h ) ; negative
IN NS blowfish.buetow.org.
- IN NS twofish.buetow.org.
+ IN NS fishfinger.buetow.org.
IN MX 10 blowfish.buetow.org.
- IN MX 20 twofish.buetow.org.
+ IN MX 20 fishfinger.buetow.org.
86400 IN A 23.88.35.144
86400 IN AAAA 2a01:4f8:c17:20f1::42
* 86400 IN CNAME blowfish.buetow.org.
-www 86400 IN CNAME twofish.buetow.org.
+www 86400 IN CNAME fishfinger.buetow.org.
diff --git a/frontends/var/nsd/zones/master/snonux.me.zone.tpl b/frontends/var/nsd/zones/master/snonux.me.zone.tpl
index 6d2bdad..6aced8e 100644
--- a/frontends/var/nsd/zones/master/snonux.me.zone.tpl
+++ b/frontends/var/nsd/zones/master/snonux.me.zone.tpl
@@ -7,12 +7,12 @@ $TTL 4h
7d ; expire
1h ) ; negative
IN NS blowfish.buetow.org.
- IN NS twofish.buetow.org.
+ IN NS fishfinger.buetow.org.
IN MX 10 blowfish.buetow.org.
- IN MX 20 twofish.buetow.org.
+ IN MX 20 fishfinger.buetow.org.
86400 IN A 23.88.35.144
86400 IN AAAA 2a01:4f8:c17:20f1::42
* 86400 IN CNAME blowfish.buetow.org.
-www 86400 IN CNAME twofish.buetow.org.
+www 86400 IN CNAME fishfinger.buetow.org.
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-08 14:49:37 +0000