diff --git a/newinfra/nix/hive.nix b/newinfra/nix/hive.nix index 3eb637a..663cc33 100644 --- a/newinfra/nix/hive.nix +++ b/newinfra/nix/hive.nix @@ -127,7 +127,7 @@ networking.hostName = name; deployment.targetHost = "vps1.nilstrieb.dev"; - deployment.tags = [ "ingress" "eu" ]; + deployment.tags = [ "ingress" "eu" "apps" ]; system.stateVersion = "23.11"; diff --git a/newinfra/nix/modules/dns/nilstrieb.dev.nix b/newinfra/nix/modules/dns/nilstrieb.dev.nix index 34cc39d..9288161 100644 --- a/newinfra/nix/modules/dns/nilstrieb.dev.nix +++ b/newinfra/nix/modules/dns/nilstrieb.dev.nix @@ -11,7 +11,7 @@ let in { SOA = { - nameServer = "ns1.noratrieb.dev"; + nameServer = "ns1.nilstrieb.dev"; adminEmail = "void@noratrieb.dev"; serial = 2024072601; }; @@ -22,8 +22,8 @@ let ]; NS = [ - "ns1.noratrieb.dev" - "ns2.noratrieb.dev" + "ns1.nilstrieb.dev" + "ns2.nilstrieb.dev" ]; A = [ @@ -83,6 +83,6 @@ let }; in pkgs.writeTextFile { - name = "noratrieb.dev.zone"; - text = pkgs.nix-dns.lib.toString "noratrieb.dev" data; + name = "nilstrieb.dev.zone"; + text = pkgs.nix-dns.lib.toString "nilstrieb.dev" data; } diff --git a/newinfra/nix/modules/dns/noratrieb.dev.nix b/newinfra/nix/modules/dns/noratrieb.dev.nix index 4d628db..40d4b06 100644 --- a/newinfra/nix/modules/dns/noratrieb.dev.nix +++ b/newinfra/nix/modules/dns/noratrieb.dev.nix @@ -5,6 +5,9 @@ let let dns1 = host "154.38.163.74" null; dns2 = host "128.140.3.7" "2a01:4f8:c2c:d616::"; + + vps1 = host "161.97.165.1" null; + in { SOA = { @@ -27,11 +30,13 @@ let "she/her" ]; + localhost.A = [ (a "127.0.0.1") ]; newtest.TXT = [ "uwu it works" ]; infra.subdomains = { inherit dns1; inherit dns2; + inherit vps1; }; }; };