From 8d96a11cb794e286760556302ea4e908241f79dd Mon Sep 17 00:00:00 2001
From: Nico <nico@astolfo.org>
Date: Sat, 3 May 2025 16:16:03 +1000
Subject: [PATCH] Revert "caddy: use more topic-based subdomains for services"

breaks ssl with arr sites

This reverts commit 71d13e9b6cf97925af4cc631c1e7b67d79969ca3.
---
 modules/services/glance.nix    | 14 +++++++-------
 modules/services/karakeep.nix  |  2 +-
 modules/services/media/arr.nix | 12 ++++++------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/modules/services/glance.nix b/modules/services/glance.nix
index 92bb9b8..136402a 100644
--- a/modules/services/glance.nix
+++ b/modules/services/glance.nix
@@ -65,27 +65,27 @@
                         }
                         {
                           title = "Radarr";
-                          url = "https://movies.arr.${config.homelab.domain}";
+                          url = "https://radarr.${config.homelab.domain}";
                         }
                         {
                           title = "Sonarr";
-                          url = "https://shows.arr.${config.homelab.domain}";
+                          url = "https://sonarr.${config.homelab.domain}";
                         }
                         {
                           title = "Lidarr";
-                          url = "https://music.arr.${config.homelab.domain}";
+                          url = "https://lidarr.${config.homelab.domain}";
                         }
                         {
                           title = "Prowlarr";
-                          url = "https://index.arr.${config.homelab.domain}";
+                          url = "https://prowlarr.${config.homelab.domain}";
                         }
                         {
                           title = "Bazarr";
-                          url = "https://subtitles.arr.${config.homelab.domain}";
+                          url = "https://bazarr.${config.homelab.domain}";
                         }
                         {
                           title = "Deluge";
-                          url = "https://torrent.${config.homelab.domain}";
+                          url = "https://deluge.${config.homelab.domain}";
                         }
                       ];
                     }
@@ -99,7 +99,7 @@
                         }
                         {
                           title = "Karakeep";
-                          url = "https://save.${config.homelab.domain}";
+                          url = "https://karakeep.${config.homelab.domain}";
                         }
                       ];
                     }
diff --git a/modules/services/karakeep.nix b/modules/services/karakeep.nix
index 870e414..aefd116 100644
--- a/modules/services/karakeep.nix
+++ b/modules/services/karakeep.nix
@@ -26,7 +26,7 @@
     ];
   };
   
-  services.caddy.virtualHosts."save.${config.homelab.domain}" = {
+  services.caddy.virtualHosts."karakeep.${config.homelab.domain}" = {
     useACMEHost = config.homelab.domain;
     extraConfig = ''
       reverse_proxy http://localhost:8023
diff --git a/modules/services/media/arr.nix b/modules/services/media/arr.nix
index a53962a..027dab2 100644
--- a/modules/services/media/arr.nix
+++ b/modules/services/media/arr.nix
@@ -53,37 +53,37 @@
     package = pkgs.jellyseerr;
   };
 
-  services.caddy.virtualHosts."movies.arr.${config.homelab.domain}" = {
+  services.caddy.virtualHosts."radarr.${config.homelab.domain}" = {
     useACMEHost = config.homelab.domain;
     extraConfig = ''
       reverse_proxy http://localhost:7878
     '';
   };
-  services.caddy.virtualHosts."shows.arr.${config.homelab.domain}" = {
+  services.caddy.virtualHosts."sonarr.${config.homelab.domain}" = {
     useACMEHost = config.homelab.domain;
     extraConfig = ''
       reverse_proxy http://localhost:8989
     '';
   };
-  services.caddy.virtualHosts."music.arr.${config.homelab.domain}" = {
+  services.caddy.virtualHosts."lidarr.${config.homelab.domain}" = {
     useACMEHost = config.homelab.domain;
     extraConfig = ''
       reverse_proxy http://localhost:8686
     '';
   };
-  services.caddy.virtualHosts."index.arr.${config.homelab.domain}" = {
+  services.caddy.virtualHosts."prowlarr.${config.homelab.domain}" = {
     useACMEHost = config.homelab.domain;
     extraConfig = ''
       reverse_proxy http://localhost:9696
     '';
   };
-  services.caddy.virtualHosts."subtitles.arr.${config.homelab.domain}" = {
+  services.caddy.virtualHosts."bazarr.${config.homelab.domain}" = {
     useACMEHost = config.homelab.domain;
     extraConfig = ''
       reverse_proxy http://localhost:6767
     '';
   };
-  services.caddy.virtualHosts."torrent.${config.homelab.domain}" = {
+  services.caddy.virtualHosts."deluge.${config.homelab.domain}" = {
     useACMEHost = config.homelab.domain;
     extraConfig = ''
       reverse_proxy http://localhost:8112