diff --git a/flake.lock b/flake.lock index 4f39f40..f7a8c8b 100644 --- a/flake.lock +++ b/flake.lock @@ -252,17 +252,17 @@ ] }, "locked": { - "lastModified": 1705595425, - "narHash": "sha256-oNlCsosFl+ZsStSrEXk5SmirJCjc3H+Jr7Ro0C8EQ5U=", + "lastModified": 1707988981, + "narHash": "sha256-8qsm0OGAwKtGwMm3g4jUxhOLH9v9YS7iTi+JoMtvMc0=", "owner": "juanfont", "repo": "headscale", - "rev": "1e22f17f36f8c13185dff269e6a00424b49b9568", + "rev": "c42f25bd72e8b8d740af6c7cc4410507fc686b7e", "type": "github" }, "original": { "owner": "juanfont", "repo": "headscale", - "rev": "1e22f17f36f8c13185dff269e6a00424b49b9568", + "rev": "c42f25bd72e8b8d740af6c7cc4410507fc686b7e", "type": "github" } }, diff --git a/flake.nix b/flake.nix index 873e8f4..f3567a9 100644 --- a/flake.nix +++ b/flake.nix @@ -20,7 +20,7 @@ }; headscale = { # url = "github:kradalby/headscale/bbb4c357268998fd02780b7f8f2013f76e3ab80a"; - url = "github:juanfont/headscale/1e22f17f36f8c13185dff269e6a00424b49b9568"; + url = "github:juanfont/headscale/c42f25bd72e8b8d740af6c7cc4410507fc686b7e"; # url = "github:juanfont/headscale"; # Real repo inputs."flake-utils".follows = "utils"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/hosts/Alaska/modules/dns.nix b/hosts/Alaska/modules/dns.nix index 0fa4f24..1707cd1 100644 --- a/hosts/Alaska/modules/dns.nix +++ b/hosts/Alaska/modules/dns.nix @@ -2,26 +2,26 @@ { name = "vaultwarden.nickiel.net"; type = "A"; - value = "100.64.0.1/31"; + value = "100.64.0.1"; } { name = "git.nickiel.net"; type = "A"; - value = "100.64.0.1/31"; + value = "100.64.0.1"; } { name = "files.nickiel.net"; type = "A"; - value = "100.64.0.1/31"; + value = "100.64.0.1"; } { name = "iot.nickiel.net"; type = "A"; - value = "100.64.0.1/31"; + value = "100.64.0.1"; } { name = "atuin.nickiel.net"; type = "A"; - value = "100.64.0.1/31"; + value = "100.64.0.1"; } ] diff --git a/hosts/Alaska/modules/headscale.nix b/hosts/Alaska/modules/headscale.nix index c5b925d..4e4383e 100644 --- a/hosts/Alaska/modules/headscale.nix +++ b/hosts/Alaska/modules/headscale.nix @@ -21,8 +21,15 @@ in { address = "0.0.0.0"; port = 8082; settings = { + prefixes = { + v6 = "fd7a:115c:a1e0::/48"; + v4 = "100.64.0.0/10"; + }; server_url = "https://${domain}"; - # database.type = "sqlite"; + database = { + type = "sqlite3"; + sqlite.path = "/var/lib/headscale/db.sqlite"; + }; dns_config = { base_domain = baseDomain; extra_records = tailscale_dns_entries;