From a57752f9dd798c77b2f698107a384e48ef6488a3 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Fri, 23 May 2025 23:30:21 +0200
Subject: [PATCH] service.freshrss: migrate to new caddy config

---
 modules/services/freshrss/default.nix | 23 ++---------------------
 1 file changed, 2 insertions(+), 21 deletions(-)

diff --git a/modules/services/freshrss/default.nix b/modules/services/freshrss/default.nix
index 380fd2e..4a0ce59 100644
--- a/modules/services/freshrss/default.nix
+++ b/modules/services/freshrss/default.nix
@@ -45,29 +45,10 @@ in
       enable = true;
       baseUrl = "https://news.${domain}";
       inherit (cfg) language passwordFile defaultUser;
-      virtualHost = null;
-      # TODO 25.05: Add support for custom virtualHost
-      # webserver = "caddy";
+      virtualHost = "news.${domain}";
+      webserver = "caddy";
     };
 
-    services.phpfpm.pools.freshrss.settings = {
-      "listen.owner" = lib.mkForce config.services.caddy.user;
-      "listen.group" = lib.mkForce config.services.caddy.group;
-    };
-
-    my.services.webserver.virtualHosts = [
-      {
-        subdomain = "news";
-        extraConfig = ''
-          root * ${config.services.freshrss.package}/p
-          php_fastcgi unix/${config.services.phpfpm.pools.freshrss.socket} {
-              env FRESHRSS_DATA_PATH ${config.services.freshrss.dataDir}
-          }
-          file_server
-        '';
-      }
-    ];
-
     webapps.apps.freshrss = {
       dashboard = {
         name = "News";