diff --git a/nixos/boxes/bolty/default.nix b/nixos/boxes/bolty/default.nix index c16e92f7..65eff201 100644 --- a/nixos/boxes/bolty/default.nix +++ b/nixos/boxes/bolty/default.nix @@ -21,7 +21,6 @@ ./real-hardware.nix ./restic-server.nix ./tailscale-cert.nix - ./videos.nix ./virtualisation.nix ./syncthing.nix ]; diff --git a/nixos/boxes/cupsnet/default.nix b/nixos/boxes/cupsnet/default.nix index dca5f010..1b5222c0 100644 --- a/nixos/boxes/cupsnet/default.nix +++ b/nixos/boxes/cupsnet/default.nix @@ -15,6 +15,7 @@ ./foundryvtt.nix ./gitea.nix ./ssh.nix + ./videos.nix ]; networking.hostName = "cupsnet"; diff --git a/nixos/boxes/bolty/videos.nix b/nixos/boxes/cupsnet/videos.nix similarity index 54% rename from nixos/boxes/bolty/videos.nix rename to nixos/boxes/cupsnet/videos.nix index bc8c6b06..ce441366 100644 --- a/nixos/boxes/bolty/videos.nix +++ b/nixos/boxes/cupsnet/videos.nix @@ -1,21 +1,23 @@ -{inputs, ...}: let +{ + inputs, + system, + ... +}: let domain = "vidyos.peninsula.industries"; port = 3876; in { - services.postgresql.port = 5444; + imports = [../nginx.nix]; services.invidious = { package = - inputs.nixpkgs-nixos-unstable.legacyPackages."x86_64-linux".invidious; - enable = false; + inputs.nixpkgs-nixos-unstable.legacyPackages."${system}".invidious; + enable = true; inherit domain; inherit port; database.createLocally = true; - database.port = 5444; - nginx.enable = false; + nginx.enable = true; settings = { - external_port = 443; https_only = true; - disable_proxy = false; + disable_proxy = true; registration_enabled = false; hmac_key = "hd5YPAk7XR3W7nEWRrP6"; }; diff --git a/nixos/boxes/vpsfree1/default.nix b/nixos/boxes/vpsfree1/default.nix index 00c23cb5..da609498 100644 --- a/nixos/boxes/vpsfree1/default.nix +++ b/nixos/boxes/vpsfree1/default.nix @@ -11,7 +11,6 @@ ./rss.nix ./ssh.nix ./syncthing-relay.nix - ./videos.nix ]; systemd.extraConfig = '' diff --git a/nixos/boxes/vpsfree1/videos.nix b/nixos/boxes/vpsfree1/videos.nix deleted file mode 100644 index 4cb4e5ef..00000000 --- a/nixos/boxes/vpsfree1/videos.nix +++ /dev/null @@ -1,18 +0,0 @@ -{...}: let - domain = "vidyos.peninsula.industries"; - port = 3876; -in { - imports = [../nginx.nix]; - services.nginx = { - virtualHosts = { - "${domain}" = { - forceSSL = true; - enableACME = true; - locations."/" = { - proxyPass = "http://bolty.raptor-carp.ts.net:" + toString port; - proxyWebsockets = true; - }; - }; - }; - }; -}