diff --git a/dragonwell/services/foundry.nix b/dragonwell/services/foundry.nix index ddbae2dae9389d45ec02ce3de735e78a02f19502..b2c24d8bf71851d9e4d1231d2809985a5c972d93 100644 --- a/dragonwell/services/foundry.nix +++ b/dragonwell/services/foundry.nix @@ -20,9 +20,7 @@ minifyStaticFiles = true; proxyPort = 443; proxySSL = true; upnp = false; - package = inputs.foundry.packages.${pkgs.stdenv.hostPlatform.system}.foundryvtt_14.overrideAttrs { - build = "367"; - }; + package = inputs.foundry.packages.${pkgs.stdenv.hostPlatform.system}.foundryvtt_14; }; caddy.virtualHosts."${host}".extraConfig = '' reverse_proxy localhost:${builtins.toString port} diff --git a/dragonwell/services/git-bug.nix b/dragonwell/services/git-bug.nix index c85e45e3a1effd31cd643e74de941853be48e7e9..233629f6110537a4014d64910b9c7b5b9d3a9a84 100644 --- a/dragonwell/services/git-bug.nix +++ b/dragonwell/services/git-bug.nix @@ -16,11 +16,9 @@ inherit port; }; tailproxy.bugs = { enable = true; - settings = { - hostname = "bugs"; - inherit port; - auth-key = ""; # One-time key - }; + hostname = "bugs"; + inherit port; + authKey = ""; # One-time key }; }; } diff --git a/dragonwell/services/miniserve.nix b/dragonwell/services/miniserve.nix index 43a867ddf37551c43698fec0292f37684f72cd69..3b9d28fd12071bc0d25f9825334a8e751a5fcbe2 100644 --- a/dragonwell/services/miniserve.nix +++ b/dragonwell/services/miniserve.nix @@ -23,11 +23,9 @@ readme = true; }; tailproxy.miniserve = { enable = true; - settings = { - hostname = "files"; - inherit port; - auth-key = "tskey-auth-kNNZJXfSDb11CNTRL-DsdZPygdA7Lrye5WJjnr6LGNffgzo3PUH"; # One-time key - }; + hostname = "files"; + inherit port; + authKey = "tskey-auth-kNNZJXfSDb11CNTRL-DsdZPygdA7Lrye5WJjnr6LGNffgzo3PUH"; # One-time key }; }; } diff --git a/dragonwell/services/pubserve.nix b/dragonwell/services/pubserve.nix index ffe9023f6c5844a030957f2d4065bf9a3251fcdf..41cd7eddaa4780f2a592bae7401df7e5cdcbb3ad 100644 --- a/dragonwell/services/pubserve.nix +++ b/dragonwell/services/pubserve.nix @@ -56,20 +56,16 @@ }; services.tailproxy = { pubserve = { enable = true; - settings = { - hostname = "pubserve"; - funnel = true; - port = pubPort; - auth-key = "tskey-auth-kJrnknpMsL11CNTRL-ot1kkasErR2cLZZmfuKYR2b9za7fCzVR"; # One-time key - }; + hostname = "pubserve"; + funnel = true; + port = pubPort; + authKey = "tskey-auth-kJrnknpMsL11CNTRL-ot1kkasErR2cLZZmfuKYR2b9za7fCzVR"; # One-time key }; privserve = { enable = true; - settings = { - hostname = "privserve"; - port = privPort; - auth-key = "tskey-auth-kKFv865ykk11CNTRL-dfmxUREHP5evuuMsfPy55ehXECXrLF1N7"; # One-time key - }; + hostname = "privserve"; + port = privPort; + authKey = "tskey-auth-kKFv865ykk11CNTRL-dfmxUREHP5evuuMsfPy55ehXECXrLF1N7"; # One-time key }; }; } diff --git a/dragonwell/services/ugit.nix b/dragonwell/services/ugit.nix index c63903bc0ca7aab33e94e239a13583308f9f0095..f2b452edc30b85011aaffe2c0eb66bf6a19cf1ba 100644 --- a/dragonwell/services/ugit.nix +++ b/dragonwell/services/ugit.nix @@ -60,11 +60,9 @@ }; }; tailproxy.ugit = { enable = true; - settings = { - hostname = "git"; - port = privPort; - auth-key = "tskey-auth-kyuvaLt8pb11CNTRL-admMYrs6UWb5XaCcdWJAWbriZ6JMo7ksK"; # One-time key - }; + hostname = "git"; + port = privPort; + authKey = "tskey-auth-kyuvaLt8pb11CNTRL-admMYrs6UWb5XaCcdWJAWbriZ6JMo7ksK"; # One-time key }; caddy.virtualHosts."${host}".extraConfig = '' reverse_proxy localhost:${builtins.toString pubPort} diff --git a/dragonwell/services/woodpecker.nix b/dragonwell/services/woodpecker.nix index b7a27e89dbb66630353e7f6ffa79a3972b04a35b..549f05111a3007243f773ab2bc58485c6eed3cf1 100644 --- a/dragonwell/services/woodpecker.nix +++ b/dragonwell/services/woodpecker.nix @@ -51,11 +51,9 @@ environmentFile = [ config.age.secrets.woodpecker.path ]; }; tailproxy.woodpecker = { enable = true; - settings = { - hostname = "cicd"; - inherit port; - auth-key = "tskey-auth-kgrGNGArZw11CNTRL-rA3rdahB1dEobvWZraPhcEpHp2BVBcYh"; # One-time key - }; + hostname = "cicd"; + inherit port; + authKey = "tskey-auth-kgrGNGArZw11CNTRL-rA3rdahB1dEobvWZraPhcEpHp2BVBcYh"; # One-time key }; }; systemd.services.woodpecker-server.serviceConfig.SupplementaryGroups = [ "ugit" ]; diff --git a/dragonwell/services/zoekt.nix b/dragonwell/services/zoekt.nix index 7025b4602ec47c3a4dbd1bd702e75fdf73d9c8d5..45597776ca1b81ba3ac8d37aa6cd88374859e8fe 100644 --- a/dragonwell/services/zoekt.nix +++ b/dragonwell/services/zoekt.nix @@ -9,11 +9,9 @@ in lib.mkIf enable { services.tailproxy.zoekt = { enable = true; - settings = { - hostname = "zoekt"; - inherit port; - auth-key = "tskey-auth-k4SpytYDoS11CNTRL-Aeeu3nNJZVChryEPXr8sVCpYykMtUfZh"; # One-time key - }; + hostname = "zoekt"; + inherit port; + authKey = "tskey-auth-k4SpytYDoS11CNTRL-Aeeu3nNJZVChryEPXr8sVCpYykMtUfZh"; # One-time key }; systemd = { services = { diff --git a/flake.lock b/flake.lock index 21e726c7274a3da09ebaaadf794c19ef0083b7e4..5a5cb4e37a7a0395be195e1135b3bda9d92e9f59 100644 --- a/flake.lock +++ b/flake.lock @@ -2,16 +2,19 @@ { "nodes": { "agenix": { "inputs": { + "darwin": [], + "home-manager": [], "nixpkgs": [ "nixpkgs" - ] + ], + "systems": "systems" }, "locked": { - "lastModified": 1792507013, - "narHash": "sha256-8tKjSQajD3mUND1GaAuaWTcuyUpgcGsh5V+l4ibzC7U=", + "lastModified": 1770165109, + "narHash": "sha256-9VnK6Oqai65puVJ4WYtCTvlJeXxMzAp/69HhQuTdl/I=", "owner": "ryantm", "repo": "agenix", - "rev": "5e5b88a0c8e56f291a108c2fe9934054d9745b2e", + "rev": "b027ee29d959fda4b60b57566d64c98a202e0feb", "type": "github" }, "original": { @@ -117,11 +120,11 @@ "inputs": { "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1794172055, - "narHash": "sha256-B3jjBr6nPjyiiQpVjQN0opU9XH8HMEG39obNFlsuFG0=", + "lastModified": 1787480085, + "narHash": "sha256-5+tysEBBKJ4BD37yDdjlMX60MLoE9giHezdLcWSlhpw=", "owner": "reckenrode", "repo": "nix-foundryvtt", - "rev": "f20f57bb17e9b98e54cffa1f63f1dacc018d5eda", + "rev": "2f1ce6e4dfd2b4379179a118c70ebd6931d22e61", "type": "github" }, "original": { @@ -177,11 +180,11 @@ "inputs": { "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1791394568, - "narHash": "sha256-hs2x0NJMR7Ab22SEXxu4W23QuvwRhq2pus6JUCfIuaM=", + "lastModified": 1784733284, + "narHash": "sha256-8eZKDmdsja84P7of4Rw0HkfQw8arAvdWV+9shhdcUiA=", "ref": "refs/heads/main", - "rev": "551ed52edc36612da8a63e65cf776afd2d730f53", - "revCount": 6, + "rev": "fbb13e18040c034192845f688a78176b5152b661", + "revCount": 5, "type": "git", "url": "https://git.jolheiser.com/gitpecker.git" }, @@ -193,14 +196,14 @@ }, "golink": { "inputs": { "nixpkgs": "nixpkgs_8", - "systems": "systems" + "systems": "systems_2" }, "locked": { - "lastModified": 1794326209, - "narHash": "sha256-X5fYBAIoROVXgWy44zvESG9FX2S9stXqfc04BncyQUY=", + "lastModified": 1787241322, + "narHash": "sha256-RUS9EtnG0VwRzOV0a0f8vC1nxpjSRONSHdLaQ2Z5aUE=", "owner": "tailscale", "repo": "golink", - "rev": "d4c752ba2a71793dd8035a5b23746f2c97831c89", + "rev": "3f9300f2b03f29f1a2eb704ff419d849f47aabf4", "type": "github" }, "original": { @@ -232,11 +235,11 @@ "inputs": { "nixpkgs": "nixpkgs_10" }, "locked": { - "lastModified": 1790175771, - "narHash": "sha256-GwyELHI8kLTWTd1jFJuT9TWlRNqXe3kpngp+lvx7H8U=", + "lastModified": 1778508921, + "narHash": "sha256-Tqxo8ei60iU8fF2CqpDO4h4Kte8Krs0FpMxPMk6JriM=", "owner": "jolheiser", "repo": "mazanoke-nix", - "rev": "c54676dceef639d59b075a344d2783e519ebadee", + "rev": "c707b6094ae0ce529f4fd9b0783e3913fc797e67", "type": "github" }, "original": { @@ -328,11 +331,11 @@ } }, "nixpkgs_12": { "locked": { - "lastModified": 1794890597, - "narHash": "sha256-lME2lHoDHAaSHP3/okgiVoJ0icVEvsQH8LeU3We7tcc=", + "lastModified": 1788752844, + "narHash": "sha256-VaWGJ6+cIYN2erfSecbRV+4ljI185Ty2wUrXyvQbgOw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "04906337b6d53e8bb0eaf0470ae9f070a4d4eb55", + "rev": "dc5d91f840324650bac8c379428c7037a416959a", "type": "github" }, "original": { @@ -375,11 +378,11 @@ } }, "nixpkgs_15": { "locked": { - "lastModified": 1794840529, - "narHash": "sha256-ySrWnmZB5UsZTYGHHnBjllT05O5iFjElCRS+mabtfP0=", + "lastModified": 1788922888, + "narHash": "sha256-QMX3uerxnW2R5dHcWpIQILHDltOZnon3x3Spq7EzBFI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e21fec321d73511849707a7585e4ea155ee4bf40", + "rev": "a391f95d4557d685fd8e5dc0d4b1f9271aa2f342", "type": "github" }, "original": { @@ -391,11 +394,11 @@ } }, "nixpkgs_16": { "locked": { - "lastModified": 1792502884, - "narHash": "sha256-ij8QUxzTOHovLrNOxVRx+RAhGQFOMsJbji0veiatH5k=", - "rev": "02c087f3fe673c9e317f206a627cb6b910336dbe", + "lastModified": 1786599213, + "narHash": "sha256-yjGG65gA1jORt0hWxjzrnw3AYkIn8EWolp8vezwXZ3I=", + "rev": "0e251e24a4f24e036a084b6b4b2d2491af4167f4", "type": "tarball", - "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1097682.02c087f3fe67/nixexprs.tar.zst" + "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1053317.0e251e24a4f2/nixexprs.tar.xz" }, "original": { "id": "nixpkgs", @@ -565,16 +568,16 @@ } }, "nixpkgs_8": { "locked": { - "lastModified": 1792502884, - "narHash": "sha256-IoNisKcGbUjdd45qCqywGMCYmZ5EnkxezvLII0FWwNA=", + "lastModified": 1787101114, + "narHash": "sha256-gwrPcFf/rDjHPaVflbDZ040ZDmBTRj/7+s8ZmE2SaIM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "02c087f3fe673c9e317f206a627cb6b910336dbe", + "rev": "b18a4b905f8d028dc4476412e6d6891728695379", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixos-26.05", "repo": "nixpkgs", "type": "github" } @@ -657,11 +660,11 @@ } }, "systems": { "locked": { - "lastModified": 1791244623, - "narHash": "sha256-uuanbkFk8a313Zfrxdcz8Us/yQtaxNnKJtX8v0ZPpd8=", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "owner": "nix-systems", "repo": "default", - "rev": "d36eeed142f88b5a636f2e3856a53c61654cf29b", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { @@ -685,16 +688,31 @@ "repo": "default", "type": "github" } }, + "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "tailproxy": { "inputs": { "nixpkgs": "nixpkgs_15" }, "locked": { - "lastModified": 1795039117, - "narHash": "sha256-ZzFcYWqhEIWSulQplC9qQ/h+zX9z5NqocKo6BDsU940=", + "lastModified": 1788990254, + "narHash": "sha256-ej3xb8RXdvKc7sSZHDgmW9qQ0lJ1OFBydcHH9F4+v3k=", "ref": "refs/heads/main", - "rev": "94680dfaae2286d62f9da4e1b491c11a3cbad85d", - "revCount": 11, + "rev": "30dd218b0c64383cc437557066f916d4b9e9fdfe", + "revCount": 9, "type": "git", "url": "https://git.jolheiser.com/tailroute.git" }, @@ -787,11 +805,11 @@ "nixpkgs": "nixpkgs_16", "utils": "utils" }, "locked": { - "lastModified": 1792588702, - "narHash": "sha256-sNtJnP3LAhSVktVJKcHC0brF95DNbn3n+lEgtMsQt1Q=", + "lastModified": 1786713929, + "narHash": "sha256-ZKysiy4mJm3/VkEWCkZWuJuATdYkAiURmf1yVVwfKdQ=", "owner": "tailscale-dev", "repo": "tclip", - "rev": "bfe0827247ecb99105753f8fb8a903abf11d0a27", + "rev": "da4dd37bb76afc594b20e329484cd8cfe58f7cd4", "type": "github" }, "original": { @@ -822,14 +840,14 @@ } }, "utils": { "inputs": { - "systems": "systems_2" + "systems": "systems_3" }, "locked": { - "lastModified": 1791914995, - "narHash": "sha256-Zf/xfQEAasnwnmEfHqW/4hjDE/s44yn2hD4RuVIZRjA=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "b7a79d3fea1e214f6d668d521cecec0c01e26544", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -840,11 +858,11 @@ } }, "vpn-confinement": { "locked": { - "lastModified": 1794523109, - "narHash": "sha256-AwEm7+NWkEgyZsKLlR3a0qU/V0uIirwCuxSLpmAiufA=", + "lastModified": 1788035501, + "narHash": "sha256-3Xs9lCMwjvFURU7/fPEGDR5kCKvcdX2l5Fah1nZoaGQ=", "owner": "Maroka-chan", "repo": "VPN-Confinement", - "rev": "eeab5446fdbba273905da915805db665524abda6", + "rev": "ce8949125b698406810ea71a8bd7b567d9a0b09f", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index d23939a6bc0f212288d34959ec56dd757138be6b..d6857e274ab6e3df388467de5bd21ea648d0208d 100644 --- a/flake.nix +++ b/flake.nix @@ -5,7 +5,11 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; agenix = { url = "github:ryantm/agenix"; - inputs.nixpkgs.follows = "nixpkgs"; + inputs = { + nixpkgs.follows = "nixpkgs"; + darwin.follows = ""; + home-manager.follows = ""; + }; }; website.url = "git+https://git.jolheiser.com/jolheiser.com.git"; resume.url = "git+https://git.jolheiser.com/resume.git"; diff --git a/gunpowder/services/bazarr.nix b/gunpowder/services/bazarr.nix index 422e49f5885d078524ac1a5d76ec41d6c9a9e3c5..9a1ea19bd78afc4f5576f652b8939a5f9cc360fe 100644 --- a/gunpowder/services/bazarr.nix +++ b/gunpowder/services/bazarr.nix @@ -10,11 +10,9 @@ openFirewall = true; }; tailproxy.bazarr = { enable = true; - settings = { - hostname = "bazarr"; - port = 6767; - auth-key = "tskey-auth-kydeAt7KDA21CNTRL-bLfZMG4ip4i4a91DX1b85ipjnZi9KgoN9"; # One-time key - }; + hostname = "bazarr"; + port = 6767; + authKey = "tskey-auth-kydeAt7KDA21CNTRL-bLfZMG4ip4i4a91DX1b85ipjnZi9KgoN9"; # One-time key }; }; } diff --git a/gunpowder/services/jellyfin.nix b/gunpowder/services/jellyfin.nix index 78b0f68d51ee6e4aa2df653cb60c72bfbecbc271..2f8374d7eefd66c06e0c231a4aec3caee7007bde 100644 --- a/gunpowder/services/jellyfin.nix +++ b/gunpowder/services/jellyfin.nix @@ -10,11 +10,9 @@ openFirewall = true; }; tailproxy.jellyfin = { enable = true; - settings = { - hostname = "jellyfin"; - port = 8096; - auth-key = "tskey-auth-khZwt3ASDX11CNTRL-jYDAVuX7VVLCebLUGdvnVLLoUkeEevXEV"; # One-time key - }; + hostname = "jellyfin"; + port = 8096; + authKey = "tskey-auth-khZwt3ASDX11CNTRL-jYDAVuX7VVLCebLUGdvnVLLoUkeEevXEV"; # One-time key }; }; users.groups.media.members = [ "jellyfin" ]; diff --git a/gunpowder/services/prowlarr.nix b/gunpowder/services/prowlarr.nix index 79b04c1d8fbca51619f6fe65afac918ee955aecb..d3dc752b8e133ca10dcd9e01dd9ae0ca99179811 100644 --- a/gunpowder/services/prowlarr.nix +++ b/gunpowder/services/prowlarr.nix @@ -10,11 +10,9 @@ openFirewall = true; }; tailproxy.prowlarr = { enable = true; - settings = { - hostname = "prowlarr"; - port = 9696; - auth-key = "tskey-auth-koCbGEVEvh11CNTRL-7pxqVBdP4v5xNvsPP5mMv5oW8PrgVQmb"; # One-time key - }; + hostname = "prowlarr"; + port = 9696; + authKey = "tskey-auth-koCbGEVEvh11CNTRL-7pxqVBdP4v5xNvsPP5mMv5oW8PrgVQmb"; # One-time key }; }; } diff --git a/gunpowder/services/qbittorrent.nix b/gunpowder/services/qbittorrent.nix index eebd1c346f51e4213a8746e2087f51a81e97a2d7..cb1d8a6b7486ca54ba1abadd56654c3bb00b8399 100644 --- a/gunpowder/services/qbittorrent.nix +++ b/gunpowder/services/qbittorrent.nix @@ -30,12 +30,10 @@ webuiPort = port; }; tailproxy.qbittorrent = { enable = true; - settings = { - hostname = "qbittorrent"; - host = config.vpnNamespaces.mullvad.namespaceAddress; - inherit port; - auth-key = "tskey-auth-kV7j5FHHHh11CNTRL-wPSNdNQqza8kXxzpnZXha8B7JCvdwCAy"; # One-time key - }; + hostname = "qbittorrent"; + host = config.vpnNamespaces.mullvad.namespaceAddress; + inherit port; + authKey = "tskey-auth-kV7j5FHHHh11CNTRL-wPSNdNQqza8kXxzpnZXha8B7JCvdwCAy"; # One-time key }; }; } diff --git a/gunpowder/services/radarr.nix b/gunpowder/services/radarr.nix index d4075690a4cf0d9872b8f2d87bfdb703c3c12eef..14afd26fb07ff5782d5fc1569f403ab03cd997c3 100644 --- a/gunpowder/services/radarr.nix +++ b/gunpowder/services/radarr.nix @@ -10,11 +10,9 @@ openFirewall = true; }; tailproxy.radarr = { enable = true; - settings = { - hostname = "radarr"; - port = 7878; - auth-key = "tskey-auth-kjuWphWmFp11CNTRL-dcpVCTbdPTAAiqQHaKVhTA27uNQeHxmq5"; # One-time key - }; + hostname = "radarr"; + port = 7878; + authKey = "tskey-auth-kjuWphWmFp11CNTRL-dcpVCTbdPTAAiqQHaKVhTA27uNQeHxmq5"; # One-time key }; }; users.groups.media.members = [ "radarr" ]; diff --git a/gunpowder/services/sonarr.nix b/gunpowder/services/sonarr.nix index 93edbdc5fecd8f5bf947ea55f7f4fe376ae3d948..7ff6f9354eec58dac82b181cb6458a26736e993d 100644 --- a/gunpowder/services/sonarr.nix +++ b/gunpowder/services/sonarr.nix @@ -10,11 +10,9 @@ openFirewall = true; }; tailproxy.sonarr = { enable = true; - settings = { - hostname = "sonarr"; - port = 8989; - auth-key = "tskey-auth-k1mZ4587A511CNTRL-uxq54KBAvb6YuhvZbxscb6rf7x8UwNiP"; # One-time key - }; + hostname = "sonarr"; + port = 8989; + authKey = "tskey-auth-k1mZ4587A511CNTRL-uxq54KBAvb6YuhvZbxscb6rf7x8UwNiP"; # One-time key }; }; users.groups.media.members = [ "sonarr" ]; diff --git a/shincha/services/beszel.nix b/shincha/services/beszel.nix index b73b0388c32f9c96adbfb3c3775c96c18d600d7b..2dabfc532355111581407a80a8daabbdff161fa2 100644 --- a/shincha/services/beszel.nix +++ b/shincha/services/beszel.nix @@ -22,11 +22,9 @@ }; }; tailproxy.beszel = { enable = true; - settings = { - hostname = host; - auth-key = "tskey-auth-krRJB4JVL321CNTRL-Vfaa8HZwsVXzTU4MUAnBWXsZMCcFbrLVe"; # One-time key - port = 8090; - }; + hostname = host; + authKey = "tskey-auth-krRJB4JVL321CNTRL-Vfaa8HZwsVXzTU4MUAnBWXsZMCcFbrLVe"; # One-time key + port = 8090; }; }; } diff --git a/shincha/services/mazanoke.nix b/shincha/services/mazanoke.nix index 9c729d815075be510b7cdf2b358002e600c2df0c..7c89e1e3e984d0208d48941605bc6b4555d91b56 100644 --- a/shincha/services/mazanoke.nix +++ b/shincha/services/mazanoke.nix @@ -7,12 +7,10 @@ services = { mazanoke.enable = true; tailproxy.mazanoke = { enable = true; - settings = { - hostname = "img"; - auth-key = "tskey-auth-kN76twaVyw11CNTRL-aUgvGLQsBSjuJ94BgsDVSjRhTGCmXAmi"; # One-time key - funnel = true; - port = 6292; - }; + hostname = "img"; + authKey = "tskey-auth-kN76twaVyw11CNTRL-aUgvGLQsBSjuJ94BgsDVSjRhTGCmXAmi"; # One-time key + funnel = true; + port = 6292; }; }; } diff --git a/shincha/services/oidc.nix b/shincha/services/oidc.nix index 36e8eec437da15ab67d3008d03eb5ca971822158..0f8712e74e2bf5b630e96e9132cbe939fb609bd1 100644 --- a/shincha/services/oidc.nix +++ b/shincha/services/oidc.nix @@ -11,11 +11,9 @@ origin = "https://${host}"; }; tailproxy.oidc-playground = { enable = true; - settings = { - hostname = host; - auth-key = "tskey-auth-kkFJ2NFkCX11CNTRL-Doq9XTGfm9Vxn8nb6QQU9VjmAh6ZFgih"; # One-time key - port = 6432; - }; + hostname = host; + authKey = "tskey-auth-kkFJ2NFkCX11CNTRL-Doq9XTGfm9Vxn8nb6QQU9VjmAh6ZFgih"; # One-time key + port = 6432; }; }; }