From c06a1e9d79c1f20f5e6365de26e206110c9ffe2d Mon Sep 17 00:00:00 2001 From: arcnmx Date: Sun, 18 Feb 2024 20:18:36 -0800 Subject: [PATCH] feat(invidious): tail access --- nixos/access/invidious.nix | 6 ++++++ systems/hakurei/nixos.nix | 9 +++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/nixos/access/invidious.nix b/nixos/access/invidious.nix index 2a17d1b3..41ed95ff 100644 --- a/nixos/access/invidious.nix +++ b/nixos/access/invidious.nix @@ -6,6 +6,7 @@ inherit (lib.options) mkOption; inherit (lib.modules) mkIf mkDefault mkOptionDefault; inherit (config.services.nginx) virtualHosts; + inherit (config.services) tailscale; cfg = config.services.invidious; access = config.services.nginx.access.invidious; in { @@ -21,6 +22,10 @@ in { type = str; default = "yt.local.${config.networking.domain}"; }; + tailDomain = mkOption { + type = str; + default = "yt.tail.${config.networking.domain}"; + }; }; config.services.nginx = { access.invidious = mkIf cfg.enable { @@ -46,6 +51,7 @@ in { inherit extraConfig; }; ${access.localDomain} = { config, ... }: { + serverAliases = mkIf tailscale.enable [ access.tailDomain ]; local.enable = true; locations."/" = location; useACMEHost = mkDefault virtualHosts.${access.domain}.useACMEHost; diff --git a/systems/hakurei/nixos.nix b/systems/hakurei/nixos.nix index b065b21c..e752a15b 100644 --- a/systems/hakurei/nixos.nix +++ b/systems/hakurei/nixos.nix @@ -115,8 +115,13 @@ in { }; ${access.invidious.domain} = { inherit (nginx) group; - extraDomainNames = [ - access.invidious.localDomain + extraDomainNames = mkMerge [ + [ + access.invidious.localDomain + ] + (mkIf tailscale.enable [ + access.invidious.tailDomain + ]) ]; }; };