Move tailnet internal sites to their own rnrd.fyi subdomains

Signed-off-by: Mel <mel@rnrd.eu>

4 files changed, 29 insertions, 37 deletions

diff --git a/services/irc/gamja.nix b/services/irc/gamja.nix
index 1c7c7f7..d2d5f08 100644
--- a/services/irc/gamja.nix
+++ b/services/irc/gamja.nix
@@ -7,13 +7,13 @@ let
     let
       gamjaConfig = {
         server = {
-          url = "wss://${me.tailscale.domain}/gamja/socket";
+          url = "wss://gamja.rnrd.fyi/socket";
           auth = "mandatory";
           nick = "mel";
         };
       };
 
-      faviconHtml = ''<link rel="shortcut icon" href="/gamja/favicon.png">'';
+      faviconHtml = ''<link rel="shortcut icon" href="/favicon.png">'';
       gamja-override = pkgs.gamja.overrideAttrs {
         pname = "gamja-override";
 
@@ -27,19 +27,19 @@ let
 
 in
 {
-  # gamja is tailnet interal
-  services.nginx.virtualHosts.tailnet.locations = {
-    "/gamja" = {
-      return = "301 $scheme://$host$request_uri/";
-    };
-    "/gamja/" = {
-      alias = "${gamja}/";
-    };
+  services.nginx.virtualHosts."gamja.rnrd.fyi" = {
+    useACMEHost = "rnrd.fyi";
+    forceSSL = true;
+    locations = {
+      "/" = {
+        root = gamja;
+      };
 
-    "/gamja/socket" = {
-      proxyPass = "http://${me.tailscale.ip}:${socketPort}";
-      proxyWebsockets = true;
-      recommendedProxySettings = true;
+      "/socket" = {
+        proxyPass = "http://${me.tailscale.ip}:${socketPort}";
+        proxyWebsockets = true;
+        recommendedProxySettings = true;
+      };
     };
   };
 }
diff --git a/services/miniflux.nix b/services/miniflux.nix
index c2f864b..3d2245b 100644
--- a/services/miniflux.nix
+++ b/services/miniflux.nix
@@ -24,7 +24,7 @@ in
 
       environment = {
         PORT = toString minifluxLocalPort;
-        BASE_URL = "https://${me.tailscale.domain}/miniflux/";
+        BASE_URL = "https://miniflux.rnrd.fyi/";
 
         CREATE_ADMIN = "1";
         ADMIN_USERNAME = "mel";
@@ -51,13 +51,11 @@ in
     };
   };
 
-  services.nginx.virtualHosts.tailnet.locations = {
-    "/miniflux" = {
-      return = "301 $scheme://$host$request_uri/";
-    };
-
-    "/miniflux/" = {
-      proxyPass = "http://127.0.0.1:${toString minifluxLocalPort}/miniflux/";
+  services.nginx.virtualHosts."miniflux.rnrd.fyi" = {
+    useACMEHost = "rnrd.fyi";
+    forceSSL = true;
+    locations."/" = {
+      proxyPass = "http://127.0.0.1:${toString minifluxLocalPort}/";
       recommendedProxySettings = true;
     };
   };
diff --git a/services/monitoring/default.nix b/services/monitoring/default.nix
index 09bda40..419c977 100644
--- a/services/monitoring/default.nix
+++ b/services/monitoring/default.nix
@@ -75,14 +75,11 @@ in
     };
   };
 
-  services.nginx.virtualHosts.tailnet.locations = {
-    "/grafana" = {
-      return = "301 $scheme://$host$request_uri/";
-    };
-
-    "/grafana/" = {
-      proxyPass = "http://127.0.0.1:${toString grafanaLocalPort}/grafana/";
-      recommendedProxySettings = true;
+  services.nginx.virtualHosts."grafana.rnrd.fyi" = {
+    useACMEHost = "rnrd.fyi";
+    forceSSL = true;
+    locations."/" = {
+      proxyPass = "http://127.0.0.1:${toString grafanaLocalPort}/";
       proxyWebsockets = true;
     };
   };
diff --git a/services/shiori.nix b/services/shiori.nix
index cddefca..c580577 100644
--- a/services/shiori.nix
+++ b/services/shiori.nix
@@ -39,7 +39,6 @@ in
     ];
 
     environment = {
-      SHIORI_HTTP_ROOT_PATH = "/shiori/";
       SHIORI_DIR = "/shiori";
     };
 
@@ -47,12 +46,10 @@ in
     cmd = [ "server" ];
   };
 
-  services.nginx.virtualHosts.tailnet.locations = {
-    "/shiori" = {
-      return = "301 $scheme://$host$request_uri/";
-    };
-
-    "/shiori/" = {
+  services.nginx.virtualHosts."shiori.rnrd.fyi" = {
+    useACMEHost = "rnrd.fyi";
+    forceSSL = true;
+    locations."/" = {
       proxyPass = "http://127.0.0.1:${toString shioriLocalPort}/";
     };
   };