From bfd306b9d2e7431af0a9755059818f0cebcece7d Mon Sep 17 00:00:00 2001 From: Erwin Boskma Date: Wed, 3 Jul 2024 15:17:43 +0200 Subject: [PATCH] valkyrie(coredns): Stop using coredns-tailscale due to issues --- machines/valkyrie/coredns/default.nix | 14 +++----------- machines/valkyrie/coredns/tailscale.zone | 19 +++++++++++++++++++ overlays/default.nix | 1 - 3 files changed, 22 insertions(+), 12 deletions(-) create mode 100644 machines/valkyrie/coredns/tailscale.zone diff --git a/machines/valkyrie/coredns/default.nix b/machines/valkyrie/coredns/default.nix index e2c64f5..9d6c76a 100644 --- a/machines/valkyrie/coredns/default.nix +++ b/machines/valkyrie/coredns/default.nix @@ -4,20 +4,12 @@ enable = true; config = '' - datarift.nl:5454 { - bind lo - reload 5s - tailscale datarift.nl { - authkey {$TS_AUTHKEY} - fallthrough - } - log - debug - errors - } .:5454 { bind lo reload 5s + file ${./tailscale.zone} datarift.nl { + reload 10s + } forward . 127.0.0.1:5335 log debug diff --git a/machines/valkyrie/coredns/tailscale.zone b/machines/valkyrie/coredns/tailscale.zone new file mode 100644 index 0000000..44902b0 --- /dev/null +++ b/machines/valkyrie/coredns/tailscale.zone @@ -0,0 +1,19 @@ +$TTL 3600 +@ IN SOA gabe.ns.cloudflare.com. dns.cloudflare.com. 10 3600 900 86400 1800 + +home.datarift.nl. IN CNAME proxy.barn-beaver.ts.net. +frigate.datarift.nl. IN CNAME frigate.barn-beaver.ts.net. +git.datarift.nl. IN CNAME gitea.barn-beaver.ts.net. +loki.datarift.nl. IN CNAME loki.barn-beaver.ts.net. +minio.datarift.nl. IN CNAME minio.barn-beaver.ts.net. +minio-admin.datarift.nl. IN CNAME minio.barn-beaver.ts.net. +mqtt.datarift.nl. IN CNAME homeassistant.barn-beaver.ts.net. +nix-cache.datarift.nl. IN CNAME nix-cache.barn-beaver.ts.net. +saga.datarift.nl. IN CNAME saga.barn-beaver.ts.net. +vidz.datarift.nl. IN CNAME vidz.barn-beaver.ts.net. +heimdall.datarift.nl. IN CNAME heimdall.barn-beaver.ts.net. +meili.datarift.nl. IN CNAME meili.barn-beaver.ts.net. +odin.datarift.nl. IN CNAME odin.barn-beaver.ts.net. +id.datarift.nl. IN CNAME heimdall.barn-beaver.ts.net. +garfield.datarift.nl. IN CNAME heimdall.barn-beaver.ns.net. + diff --git a/overlays/default.nix b/overlays/default.nix index b375777..33f2363 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -47,5 +47,4 @@ _final: prev: { gitu = prev.pkgs.callPackage ../pkgs/gitu { }; zed = prev.pkgs.callPackage ../pkgs/zed { }; git-repo-go = prev.pkgs.callPackage ../pkgs/git-repo-go { }; - coredns = prev.pkgs.callPackage ../pkgs/coredns { }; }