From 8f2e51ad0a8555f62cc5458ee977e4850f448599 Mon Sep 17 00:00:00 2001 From: Jimbo Date: Mon, 26 Aug 2024 14:29:23 -0400 Subject: [PATCH] Start prep for move to icecast --- home-manager/style/gtk.nix | 5 ++--- nixos/server/docker.nix | 14 +++++++++++++- nixos/server/nginx.nix | 14 ++------------ 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/home-manager/style/gtk.nix b/home-manager/style/gtk.nix index 1eba478..778f420 100644 --- a/home-manager/style/gtk.nix +++ b/home-manager/style/gtk.nix @@ -34,6 +34,7 @@ "file:///home/jimbo/Documents" "file:///home/jimbo/Videos" "file:///home/jimbo/Pictures/Screenshots" + "file:///home/jimbo/VMs" # Remote "file:///home/jimbo/JimboNFS/Downloads" @@ -43,11 +44,9 @@ "file:///home/jimbo/JimboNFS/Videos" "file:///home/jimbo/JimboNFS/Projects" - # Links and mounts - "file:///home/jimbo/VMs" - # More important stuff "file:///home/jimbo/JimboNFS/School" + "file:///etc/nixos" ]; # Disable shadows diff --git a/nixos/server/docker.nix b/nixos/server/docker.nix index bb4c735..9eb21a7 100644 --- a/nixos/server/docker.nix +++ b/nixos/server/docker.nix @@ -1,6 +1,18 @@ -{ +let + secrets = import ../modules/secrets.nix; +in { virtualisation.docker = { enable = true; daemon.settings.log-driver = "json-file"; }; + + # Azuracast Nginx: TODO, get a better solution than docker lmao + services.nginx.virtualHosts."radio.${secrets.jimDomain}" = { + enableACME = true; + forceSSL = true; + locations."/" = { + proxyPass = "http://127.0.0.1:255"; + proxyWebsockets = true; + }; + }; } diff --git a/nixos/server/nginx.nix b/nixos/server/nginx.nix index e934fbd..eadb6dc 100644 --- a/nixos/server/nginx.nix +++ b/nixos/server/nginx.nix @@ -11,7 +11,7 @@ recommendedGzipSettings = true; recommendedProxySettings = true; virtualHosts = { - # Homepage redirect + # Landing page "${secrets.jimDomain}" = { enableACME = true; addSSL = true; @@ -43,7 +43,7 @@ }; }; - # Bluemap Proxy + # Bluemap Proxy, TODO, move this into the nix-minecraft flake configs "bluemap.${secrets.jimDomain}" = { enableACME = true; forceSSL = true; @@ -52,16 +52,6 @@ proxyWebsockets = true; }; }; - - # Radio Proxy - "radio.${secrets.jimDomain}" = { - enableACME = true; - forceSSL = true; - locations."/" = { - proxyPass = "http://127.0.0.1:255"; - proxyWebsockets = true; - }; - }; }; appendConfig = '' rtmp {