From 78727edd46ff39754824bcb5c70606054a2763c2 Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Sun, 17 Apr 2022 21:58:12 +0100 Subject: dns server now fully managed using rex --- openbsd/frontends/Rexfile | 42 +++++++++++++++--- openbsd/frontends/var/nsd/etc/nsd.conf.master.tpl | 48 ++------------------- openbsd/frontends/var/nsd/etc/nsd.conf.slave.tpl | 17 ++++++++ .../var/nsd/zones.master/buetow.org.zone.tpl | 38 ---------------- .../var/nsd/zones.master/dtail.dev.zone.tpl | 16 ------- .../var/nsd/zones.master/foo.surf.zone.tpl | 17 -------- .../var/nsd/zones.master/foo.zone.zone.tpl | 19 -------- .../var/nsd/zones.master/irregular.ninja.zone.tpl | 18 -------- .../var/nsd/zones.master/sidewalk.ninja.zone.tpl | 18 -------- .../var/nsd/zones.master/snonux.de.zone.tpl | 19 -------- .../var/nsd/zones.master/snonux.me.zone.tpl | 19 -------- .../var/nsd/zones/master/buetow.org.zone.tpl | 38 ++++++++++++++++ .../var/nsd/zones/master/dtail.dev.zone.tpl | 16 +++++++ .../var/nsd/zones/master/foo.surf.zone.tpl | 17 ++++++++ .../var/nsd/zones/master/foo.zone.zone.tpl | 19 ++++++++ .../var/nsd/zones/master/irregular.ninja.zone.tpl | 18 ++++++++ .../var/nsd/zones/master/sidewalk.ninja.zone.tpl | 18 ++++++++ .../var/nsd/zones/master/snonux.de.zone.tpl | 19 ++++++++ .../var/nsd/zones/master/snonux.me.zone.tpl | 19 ++++++++ .../frontends/var/nsd:blowfish/etc/key.conf.templ | 4 -- openbsd/frontends/var/nsd:twofish/etc/nsd.conf | 50 ---------------------- 21 files changed, 221 insertions(+), 268 deletions(-) create mode 100644 openbsd/frontends/var/nsd/etc/nsd.conf.slave.tpl delete mode 100644 openbsd/frontends/var/nsd/zones.master/buetow.org.zone.tpl delete mode 100644 openbsd/frontends/var/nsd/zones.master/dtail.dev.zone.tpl delete mode 100644 openbsd/frontends/var/nsd/zones.master/foo.surf.zone.tpl delete mode 100644 openbsd/frontends/var/nsd/zones.master/foo.zone.zone.tpl delete mode 100644 openbsd/frontends/var/nsd/zones.master/irregular.ninja.zone.tpl delete mode 100644 openbsd/frontends/var/nsd/zones.master/sidewalk.ninja.zone.tpl delete mode 100644 openbsd/frontends/var/nsd/zones.master/snonux.de.zone.tpl delete mode 100644 openbsd/frontends/var/nsd/zones.master/snonux.me.zone.tpl create mode 100644 openbsd/frontends/var/nsd/zones/master/buetow.org.zone.tpl create mode 100644 openbsd/frontends/var/nsd/zones/master/dtail.dev.zone.tpl create mode 100644 openbsd/frontends/var/nsd/zones/master/foo.surf.zone.tpl create mode 100644 openbsd/frontends/var/nsd/zones/master/foo.zone.zone.tpl create mode 100644 openbsd/frontends/var/nsd/zones/master/irregular.ninja.zone.tpl create mode 100644 openbsd/frontends/var/nsd/zones/master/sidewalk.ninja.zone.tpl create mode 100644 openbsd/frontends/var/nsd/zones/master/snonux.de.zone.tpl create mode 100644 openbsd/frontends/var/nsd/zones/master/snonux.me.zone.tpl delete mode 100644 openbsd/frontends/var/nsd:blowfish/etc/key.conf.templ delete mode 100644 openbsd/frontends/var/nsd:twofish/etc/nsd.conf (limited to 'openbsd') diff --git a/openbsd/frontends/Rexfile b/openbsd/frontends/Rexfile index 4985c47..be6eb24 100644 --- a/openbsd/frontends/Rexfile +++ b/openbsd/frontends/Rexfile @@ -20,6 +20,8 @@ our $ipv6address = sub { return '::1'; }; +our @dns_zones = qw/buetow.org dtail.dev foo.surf foo.zone irregular.ninja sidewalk.ninja snonux.de snonux.me/; + sub secret { my $secret = shift; read_file($ENV{HOME} . '/.rexsecrets/' . $secret); @@ -140,7 +142,8 @@ task 'dnsmaster', group => 'dnsmaster', }; file '/var/nsd/etc/nsd.conf', - content => template('./var/nsd/etc/nsd.conf.master.tpl'), + content => template('./var/nsd/etc/nsd.conf.master.tpl', + dns_zones => \@dns_zones), owner => 'root', group => '_nsd', mode => '640', @@ -148,11 +151,9 @@ task 'dnsmaster', group => 'dnsmaster', $restart = TRUE; }; - for my $tpl (<./var/nsd/zones/master/*.zone.tpl>) { - my $zone = $tpl; - $zone =~ s/\.tpl$//; - file $zone, - content => template($tpl), + for my $zone (@dns_zones) { + file "/var/nsd/zones/master/$zone.zone", + content => template("./var/nsd/zones/master/$zone.zone.tpl"), owner => 'root', group => 'wheel', mode => '644', @@ -165,6 +166,35 @@ task 'dnsmaster', group => 'dnsmaster', service 'nsd', ensure => 'started'; }; +desc 'Setup DNS slaves'; +task 'dnsslaves', group => 'dnsslaves', + sub { + my $restart = FALSE; + + file '/var/nsd/etc/key.conf', + content => template('./var/nsd/etc/key.conf.tpl', + nsd_secret => secret('nsd_secret')), + owner => 'root', + group => '_nsd', + mode => '640', + on_change => sub { + $restart = TRUE; + }; + + file '/var/nsd/etc/nsd.conf', + content => template('./var/nsd/etc/nsd.conf.slave.tpl', + dns_zones => \@dns_zones), + owner => 'root', + group => '_nsd', + mode => '640', + on_change => sub { + $restart = TRUE; + }; + + service 'nsd' => 'restart' if $restart; + service 'nsd', ensure => 'started'; + }; + desc 'Setup HA'; task 'ha', group => 'frontends', sub { diff --git a/openbsd/frontends/var/nsd/etc/nsd.conf.master.tpl b/openbsd/frontends/var/nsd/etc/nsd.conf.master.tpl index 535acea..310550a 100644 --- a/openbsd/frontends/var/nsd/etc/nsd.conf.master.tpl +++ b/openbsd/frontends/var/nsd/etc/nsd.conf.master.tpl @@ -10,50 +10,10 @@ remote-control: control-enable: yes control-interface: /var/run/nsd.sock +<% for my $zone (@$dns_zones) { %> zone: - name: "buetow.org" - zonefile: "master/buetow.org.zone" - notify: 108.160.134.135 blowfish.buetow.org - provide-xfr: 108.160.134.135 blowfish.buetow.org - -zone: - name: "dtail.dev" - zonefile: "master/dtail.dev.zone" - notify: 108.160.134.135 blowfish.buetow.org - provide-xfr: 108.160.134.135 blowfish.buetow.org - -zone: - name: "foo.zone" - zonefile: "master/foo.zone.zone" - notify: 108.160.134.135 blowfish.buetow.org - provide-xfr: 108.160.134.135 blowfish.buetow.org - -zone: - name: "foo.surf" - zonefile: "master/foo.surf.zone" - notify: 108.160.134.135 blowfish.buetow.org - provide-xfr: 108.160.134.135 blowfish.buetow.org - -zone: - name: "snonux.de" - zonefile: "master/snonux.de.zone" - notify: 108.160.134.135 blowfish.buetow.org - provide-xfr: 108.160.134.135 blowfish.buetow.org - -zone: - name: "irregular.ninja" - zonefile: "master/irregular.ninja.zone" - notify: 108.160.134.135 blowfish.buetow.org - provide-xfr: 108.160.134.135 blowfish.buetow.org - -zone: - name: "sidewalk.ninja" - zonefile: "master/sidewalk.ninja.zone" - notify: 108.160.134.135 blowfish.buetow.org - provide-xfr: 108.160.134.135 blowfish.buetow.org - -zone: - name: "snonux.me" - zonefile: "master/snonux.me.zone" + name: "<%= $zone %>" + zonefile: "master/<%= $zone %>.zone" notify: 108.160.134.135 blowfish.buetow.org provide-xfr: 108.160.134.135 blowfish.buetow.org +<% } %> diff --git a/openbsd/frontends/var/nsd/etc/nsd.conf.slave.tpl b/openbsd/frontends/var/nsd/etc/nsd.conf.slave.tpl new file mode 100644 index 0000000..d9d93fe --- /dev/null +++ b/openbsd/frontends/var/nsd/etc/nsd.conf.slave.tpl @@ -0,0 +1,17 @@ +include: "/var/nsd/etc/key.conf" + +server: + hide-version: yes + verbosity: 1 + database: "" # disable database + +remote-control: + control-enable: yes + control-interface: /var/run/nsd.sock + +<% for my $zone (@$dns_zones) { %> +zone: + name: "<%= $zone %>" + allow-notify: 23.88.35.144 blowfish.buetow.org + request-xfr: 23.88.35.144 blowfish.buetow.org +<% } %> diff --git a/openbsd/frontends/var/nsd/zones.master/buetow.org.zone.tpl b/openbsd/frontends/var/nsd/zones.master/buetow.org.zone.tpl deleted file mode 100644 index 42bff2d..0000000 --- a/openbsd/frontends/var/nsd/zones.master/buetow.org.zone.tpl +++ /dev/null @@ -1,38 +0,0 @@ -$ORIGIN buetow.org. -$TTL 4h -@ IN SOA blowfish.buetow.org. hostmaster.buetow.org. ( - <%= time() %> ; serial - 1h ; refresh - 30m ; retry - 7d ; expire - 1h ) ; negative - IN NS blowfish.buetow.org. - IN NS twofish.buetow.org. - - IN MX 10 buetow.org. - IN MX 20 www.buetow.org. - 86400 IN A 23.88.35.144 - 86400 IN AAAA 2a01:4f8:c17:20f1::42 - -* IN MX 10 buetow.org. -* IN MX 20 www.buetow.org. -* 86400 IN A 23.88.35.144 -* 86400 IN AAAA 2a01:4f8:c17:20f1::42 - -blowfish 86400 IN A 23.88.35.144 -blowfish 86400 IN AAAA 2a01:4f8:c17:20f1::42 -git1 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 - -vulcan 86400 IN A 95.216.174.192 -vulcan 86400 IN AAAA 2a01:4f9:c010:250e::1 -vu 86400 IN CNAME vulcan -wolke7 3600 IN CNAME vulcan -edge 3600 IN CNAME vulcan - -sofia 86400 IN CNAME 79-100-3-54.ip.btc-net.bg. -www2 3600 IN CNAME snonux.codeberg.page. diff --git a/openbsd/frontends/var/nsd/zones.master/dtail.dev.zone.tpl b/openbsd/frontends/var/nsd/zones.master/dtail.dev.zone.tpl deleted file mode 100644 index 0d67272..0000000 --- a/openbsd/frontends/var/nsd/zones.master/dtail.dev.zone.tpl +++ /dev/null @@ -1,16 +0,0 @@ -$ORIGIN dtail.dev. -$TTL 4h -@ IN SOA blowfish.buetow.org. hostmaster.buetow.org. ( - <%= time() %> ; serial - 1h ; refresh - 30m ; retry - 7d ; expire - 1h ) ; negative - IN NS blowfish.buetow.org. - IN NS twofish.buetow.org. - - 86400 IN A 23.88.35.144 - 86400 IN AAAA 2a01:4f8:c17:20f1::4 -* 86400 IN CNAME blowfish.buetow.org. -github 86400 IN CNAME mimecast.github.io. - diff --git a/openbsd/frontends/var/nsd/zones.master/foo.surf.zone.tpl b/openbsd/frontends/var/nsd/zones.master/foo.surf.zone.tpl deleted file mode 100644 index e92b881..0000000 --- a/openbsd/frontends/var/nsd/zones.master/foo.surf.zone.tpl +++ /dev/null @@ -1,17 +0,0 @@ -$ORIGIN foo.surf. -$TTL 4h -@ IN SOA blowfish.buetow.org. hostmaster.buetow.org. ( - <%= time() %> ; serial - 1h ; refresh - 30m ; retry - 7d ; expire - 1h ) ; negative - IN NS blowfish.buetow.org. - IN NS twofish.buetow.org. - - IN MX 20 buetow.org. - IN MX 10 www.buetow.org. - - 86400 IN A 108.160.134.135 - 86400 IN AAAA 2401:c080:1000:45af:5400:3ff:fec6:ca1d -www 86400 IN CNAME blowfish.buetow.org. diff --git a/openbsd/frontends/var/nsd/zones.master/foo.zone.zone.tpl b/openbsd/frontends/var/nsd/zones.master/foo.zone.zone.tpl deleted file mode 100644 index 4efbf3d..0000000 --- a/openbsd/frontends/var/nsd/zones.master/foo.zone.zone.tpl +++ /dev/null @@ -1,19 +0,0 @@ -$ORIGIN foo.zone. -$TTL 4h -@ IN SOA blowfish.buetow.org. hostmaster.buetow.org. ( - <%= time() %> ; serial - 1h ; refresh - 30m ; retry - 7d ; expire - 1h ) ; negative - IN NS blowfish.buetow.org. - IN NS twofish.buetow.org. - - IN MX 10 buetow.org. - IN MX 20 www.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. diff --git a/openbsd/frontends/var/nsd/zones.master/irregular.ninja.zone.tpl b/openbsd/frontends/var/nsd/zones.master/irregular.ninja.zone.tpl deleted file mode 100644 index d3c55e5..0000000 --- a/openbsd/frontends/var/nsd/zones.master/irregular.ninja.zone.tpl +++ /dev/null @@ -1,18 +0,0 @@ -$ORIGIN irregular.ninja. -$TTL 4h -@ IN SOA blowfish.buetow.org. hostmaster.buetow.org. ( - <%= time() %> ; serial - 1h ; refresh - 30m ; retry - 7d ; expire - 1h ) ; negative - IN NS blowfish.buetow.org. - IN NS twofish.buetow.org. - - IN MX 10 buetow.org. - IN MX 20 www.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. diff --git a/openbsd/frontends/var/nsd/zones.master/sidewalk.ninja.zone.tpl b/openbsd/frontends/var/nsd/zones.master/sidewalk.ninja.zone.tpl deleted file mode 100644 index 42b1db7..0000000 --- a/openbsd/frontends/var/nsd/zones.master/sidewalk.ninja.zone.tpl +++ /dev/null @@ -1,18 +0,0 @@ -$ORIGIN sidewalk.ninja. -$TTL 4h -@ IN SOA blowfish.buetow.org. hostmaster.buetow.org. ( - <%= time() %> ; serial - 1h ; refresh - 30m ; retry - 7d ; expire - 1h ) ; negative - IN NS blowfish.buetow.org. - IN NS twofish.buetow.org. - - IN MX 10 buetow.org. - IN MX 20 www.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. diff --git a/openbsd/frontends/var/nsd/zones.master/snonux.de.zone.tpl b/openbsd/frontends/var/nsd/zones.master/snonux.de.zone.tpl deleted file mode 100644 index cc530b6..0000000 --- a/openbsd/frontends/var/nsd/zones.master/snonux.de.zone.tpl +++ /dev/null @@ -1,19 +0,0 @@ -$ORIGIN snonux.de. -$TTL 4h -@ IN SOA blowfish.buetow.org. hostmaster.buetow.org. ( - <%= time() %> ; serial - 1h ; refresh - 30m ; retry - 7d ; expire - 1h ) ; negative - IN NS blowfish.buetow.org. - IN NS twofish.buetow.org. - - IN MX 10 buetow.org. - IN MX 20 www.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. diff --git a/openbsd/frontends/var/nsd/zones.master/snonux.me.zone.tpl b/openbsd/frontends/var/nsd/zones.master/snonux.me.zone.tpl deleted file mode 100644 index e756998..0000000 --- a/openbsd/frontends/var/nsd/zones.master/snonux.me.zone.tpl +++ /dev/null @@ -1,19 +0,0 @@ -$ORIGIN snonux.me. -$TTL 4h -@ IN SOA blowfish.buetow.org. hostmaster.buetow.org. ( - <%= time() %> ; serial - 1h ; refresh - 30m ; retry - 7d ; expire - 1h ) ; negative - IN NS blowfish.buetow.org. - IN NS twofish.buetow.org. - - IN MX 10 buetow.org. - IN MX 20 www.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. diff --git a/openbsd/frontends/var/nsd/zones/master/buetow.org.zone.tpl b/openbsd/frontends/var/nsd/zones/master/buetow.org.zone.tpl new file mode 100644 index 0000000..42bff2d --- /dev/null +++ b/openbsd/frontends/var/nsd/zones/master/buetow.org.zone.tpl @@ -0,0 +1,38 @@ +$ORIGIN buetow.org. +$TTL 4h +@ IN SOA blowfish.buetow.org. hostmaster.buetow.org. ( + <%= time() %> ; serial + 1h ; refresh + 30m ; retry + 7d ; expire + 1h ) ; negative + IN NS blowfish.buetow.org. + IN NS twofish.buetow.org. + + IN MX 10 buetow.org. + IN MX 20 www.buetow.org. + 86400 IN A 23.88.35.144 + 86400 IN AAAA 2a01:4f8:c17:20f1::42 + +* IN MX 10 buetow.org. +* IN MX 20 www.buetow.org. +* 86400 IN A 23.88.35.144 +* 86400 IN AAAA 2a01:4f8:c17:20f1::42 + +blowfish 86400 IN A 23.88.35.144 +blowfish 86400 IN AAAA 2a01:4f8:c17:20f1::42 +git1 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 + +vulcan 86400 IN A 95.216.174.192 +vulcan 86400 IN AAAA 2a01:4f9:c010:250e::1 +vu 86400 IN CNAME vulcan +wolke7 3600 IN CNAME vulcan +edge 3600 IN CNAME vulcan + +sofia 86400 IN CNAME 79-100-3-54.ip.btc-net.bg. +www2 3600 IN CNAME snonux.codeberg.page. diff --git a/openbsd/frontends/var/nsd/zones/master/dtail.dev.zone.tpl b/openbsd/frontends/var/nsd/zones/master/dtail.dev.zone.tpl new file mode 100644 index 0000000..0d67272 --- /dev/null +++ b/openbsd/frontends/var/nsd/zones/master/dtail.dev.zone.tpl @@ -0,0 +1,16 @@ +$ORIGIN dtail.dev. +$TTL 4h +@ IN SOA blowfish.buetow.org. hostmaster.buetow.org. ( + <%= time() %> ; serial + 1h ; refresh + 30m ; retry + 7d ; expire + 1h ) ; negative + IN NS blowfish.buetow.org. + IN NS twofish.buetow.org. + + 86400 IN A 23.88.35.144 + 86400 IN AAAA 2a01:4f8:c17:20f1::4 +* 86400 IN CNAME blowfish.buetow.org. +github 86400 IN CNAME mimecast.github.io. + diff --git a/openbsd/frontends/var/nsd/zones/master/foo.surf.zone.tpl b/openbsd/frontends/var/nsd/zones/master/foo.surf.zone.tpl new file mode 100644 index 0000000..e92b881 --- /dev/null +++ b/openbsd/frontends/var/nsd/zones/master/foo.surf.zone.tpl @@ -0,0 +1,17 @@ +$ORIGIN foo.surf. +$TTL 4h +@ IN SOA blowfish.buetow.org. hostmaster.buetow.org. ( + <%= time() %> ; serial + 1h ; refresh + 30m ; retry + 7d ; expire + 1h ) ; negative + IN NS blowfish.buetow.org. + IN NS twofish.buetow.org. + + IN MX 20 buetow.org. + IN MX 10 www.buetow.org. + + 86400 IN A 108.160.134.135 + 86400 IN AAAA 2401:c080:1000:45af:5400:3ff:fec6:ca1d +www 86400 IN CNAME blowfish.buetow.org. diff --git a/openbsd/frontends/var/nsd/zones/master/foo.zone.zone.tpl b/openbsd/frontends/var/nsd/zones/master/foo.zone.zone.tpl new file mode 100644 index 0000000..4efbf3d --- /dev/null +++ b/openbsd/frontends/var/nsd/zones/master/foo.zone.zone.tpl @@ -0,0 +1,19 @@ +$ORIGIN foo.zone. +$TTL 4h +@ IN SOA blowfish.buetow.org. hostmaster.buetow.org. ( + <%= time() %> ; serial + 1h ; refresh + 30m ; retry + 7d ; expire + 1h ) ; negative + IN NS blowfish.buetow.org. + IN NS twofish.buetow.org. + + IN MX 10 buetow.org. + IN MX 20 www.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. diff --git a/openbsd/frontends/var/nsd/zones/master/irregular.ninja.zone.tpl b/openbsd/frontends/var/nsd/zones/master/irregular.ninja.zone.tpl new file mode 100644 index 0000000..d3c55e5 --- /dev/null +++ b/openbsd/frontends/var/nsd/zones/master/irregular.ninja.zone.tpl @@ -0,0 +1,18 @@ +$ORIGIN irregular.ninja. +$TTL 4h +@ IN SOA blowfish.buetow.org. hostmaster.buetow.org. ( + <%= time() %> ; serial + 1h ; refresh + 30m ; retry + 7d ; expire + 1h ) ; negative + IN NS blowfish.buetow.org. + IN NS twofish.buetow.org. + + IN MX 10 buetow.org. + IN MX 20 www.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. diff --git a/openbsd/frontends/var/nsd/zones/master/sidewalk.ninja.zone.tpl b/openbsd/frontends/var/nsd/zones/master/sidewalk.ninja.zone.tpl new file mode 100644 index 0000000..42b1db7 --- /dev/null +++ b/openbsd/frontends/var/nsd/zones/master/sidewalk.ninja.zone.tpl @@ -0,0 +1,18 @@ +$ORIGIN sidewalk.ninja. +$TTL 4h +@ IN SOA blowfish.buetow.org. hostmaster.buetow.org. ( + <%= time() %> ; serial + 1h ; refresh + 30m ; retry + 7d ; expire + 1h ) ; negative + IN NS blowfish.buetow.org. + IN NS twofish.buetow.org. + + IN MX 10 buetow.org. + IN MX 20 www.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. diff --git a/openbsd/frontends/var/nsd/zones/master/snonux.de.zone.tpl b/openbsd/frontends/var/nsd/zones/master/snonux.de.zone.tpl new file mode 100644 index 0000000..cc530b6 --- /dev/null +++ b/openbsd/frontends/var/nsd/zones/master/snonux.de.zone.tpl @@ -0,0 +1,19 @@ +$ORIGIN snonux.de. +$TTL 4h +@ IN SOA blowfish.buetow.org. hostmaster.buetow.org. ( + <%= time() %> ; serial + 1h ; refresh + 30m ; retry + 7d ; expire + 1h ) ; negative + IN NS blowfish.buetow.org. + IN NS twofish.buetow.org. + + IN MX 10 buetow.org. + IN MX 20 www.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. diff --git a/openbsd/frontends/var/nsd/zones/master/snonux.me.zone.tpl b/openbsd/frontends/var/nsd/zones/master/snonux.me.zone.tpl new file mode 100644 index 0000000..e756998 --- /dev/null +++ b/openbsd/frontends/var/nsd/zones/master/snonux.me.zone.tpl @@ -0,0 +1,19 @@ +$ORIGIN snonux.me. +$TTL 4h +@ IN SOA blowfish.buetow.org. hostmaster.buetow.org. ( + <%= time() %> ; serial + 1h ; refresh + 30m ; retry + 7d ; expire + 1h ) ; negative + IN NS blowfish.buetow.org. + IN NS twofish.buetow.org. + + IN MX 10 buetow.org. + IN MX 20 www.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. diff --git a/openbsd/frontends/var/nsd:blowfish/etc/key.conf.templ b/openbsd/frontends/var/nsd:blowfish/etc/key.conf.templ deleted file mode 100644 index 36e855f..0000000 --- a/openbsd/frontends/var/nsd:blowfish/etc/key.conf.templ +++ /dev/null @@ -1,4 +0,0 @@ -key: - name: blowfish.buetow.org - algorithm: hmac-sha256 - secret: %%ADDSECRETHEREIN"MARKS%% diff --git a/openbsd/frontends/var/nsd:twofish/etc/nsd.conf b/openbsd/frontends/var/nsd:twofish/etc/nsd.conf deleted file mode 100644 index 0727d89..0000000 --- a/openbsd/frontends/var/nsd:twofish/etc/nsd.conf +++ /dev/null @@ -1,50 +0,0 @@ -include: "/var/nsd/etc/key.conf" - -server: - hide-version: yes - verbosity: 1 - database: "" # disable database - -remote-control: - control-enable: yes - control-interface: /var/run/nsd.sock - -zone: - name: "buetow.org" - allow-notify: 23.88.35.144 blowfish.buetow.org - request-xfr: 23.88.35.144 blowfish.buetow.org - -zone: - name: "dtail.dev" - allow-notify: 23.88.35.144 blowfish.buetow.org - request-xfr: 23.88.35.144 blowfish.buetow.org - -zone: - name: "foo.zone" - allow-notify: 23.88.35.144 blowfish.buetow.org - request-xfr: 23.88.35.144 blowfish.buetow.org - -zone: - name: "foo.surf" - allow-notify: 23.88.35.144 blowfish.buetow.org - request-xfr: 23.88.35.144 blowfish.buetow.org - -zone: - name: "snonux.de" - allow-notify: 23.88.35.144 blowfish.buetow.org - request-xfr: 23.88.35.144 blowfish.buetow.org - -zone: - name: "irregular.ninja" - allow-notify: 23.88.35.144 blowfish.buetow.org - request-xfr: 23.88.35.144 blowfish.buetow.org - -zone: - name: "sidewalk.ninja" - allow-notify: 23.88.35.144 blowfish.buetow.org - request-xfr: 23.88.35.144 blowfish.buetow.org - -zone: - name: "snonux.me" - allow-notify: 23.88.35.144 blowfish.buetow.org - request-xfr: 23.88.35.144 blowfish.buetow.org -- cgit v1.2.3