diff --git a/modules/services/backup/default.nix b/modules/services/backup/default.nix index 8b78db5..b5c5461 100644 --- a/modules/services/backup/default.nix +++ b/modules/services/backup/default.nix @@ -128,11 +128,7 @@ in "/home/*/todo" ] ++ cfg.exclude; - extraCreateArgs = [ - "--exclude-caches" - "--keep-exclude-tags" - "--stats" - ]; + extraCreateArgs = "--exclude-caches --keep-exclude-tags --stats"; encryption = { mode = "repokey-blake2"; diff --git a/modules/services/nextcloud/default.nix b/modules/services/nextcloud/default.nix index 0c333c8..bd37689 100644 --- a/modules/services/nextcloud/default.nix +++ b/modules/services/nextcloud/default.nix @@ -164,10 +164,12 @@ in X-Permitted-Cross-Domain-Policies "none" } - root * ${config.services.nextcloud.finalPackage} + # TODO: `config.services.nextcloud.package` does not contain additional apps. in nixpkgs there is "nextcloud-with-apps". + # for now we use the path passed to nginx. Can be improved in 25.05 via: `config.services.nextcloud.finalPackage` + root * ${config.services.nginx.virtualHosts."cloud.${domain}".root} file_server php_fastcgi unix/${config.services.phpfpm.pools."nextcloud".socket} { - root ${config.services.nextcloud.finalPackage} + root ${config.services.nginx.virtualHosts."cloud.${domain}".root} env front_controller_active true env modHeadersAvailable true } diff --git a/modules/services/rss-bridge/default.nix b/modules/services/rss-bridge/default.nix index 30a0ac7..5196f44 100644 --- a/modules/services/rss-bridge/default.nix +++ b/modules/services/rss-bridge/default.nix @@ -18,9 +18,24 @@ in services.rss-bridge = { enable = true; config.system.enabled_bridges = [ "*" ]; # Whitelist all - virtualHost = domain; - webserver = "caddy"; + virtualHost = null; + user = "caddy"; + group = "caddy"; + # TODO: with 25.05 this can be simplified via + # webserver = "caddy"; }; + my.services.webserver.virtualHosts = [ + { + subdomain = "rss-bridge"; + extraConfig = '' + root * ${pkgs.rss-bridge} + php_fastcgi unix/${config.services.phpfpm.pools."rss-bridge".socket} { + env RSSBRIDGE_fileCache_path ${config.services.rss-bridge.dataDir}/cache/ + } + file_server + ''; + } + ]; webapps.apps.rss-bridge = { dashboard = {