modules/nixos/services/aria/default.nix

@@ -65,7 +65,9 @@ in
       aria-rpc = {
         port = cfg.rpcPort;
         # Proxy websockets for RPC
-        websocketsLocations = [ "/" ];
+        extraConfig = {
+          locations."/".proxyWebsockets = true;
+        };
       };
     };
 

modules/nixos/services/audiobookshelf/default.nix

@@ -30,7 +30,9 @@ in
       audiobookshelf = {
         inherit (cfg) port;
         # Proxy websockets for RPC
-        websocketsLocations = [ "/" ];
+        extraConfig = {
+          locations."/".proxyWebsockets = true;
+        };
       };
     };
 

modules/nixos/services/jellyfin/default.nix

@@ -27,13 +27,17 @@ in
     my.services.nginx.virtualHosts = {
       jellyfin = {
         port = 8096;
-        websocketsLocations = [ "/socket" ];
         extraConfig = {
           locations."/" = {
             extraConfig = ''
               proxy_buffering off;
             '';
           };
+          # Too bad for the repetition...
+          locations."/socket" = {
+            proxyPass = "http://127.0.0.1:8096/";
+            proxyWebsockets = true;
+          };
         };
       };
     };

modules/nixos/services/nextcloud/collabora.nix

@@ -40,10 +40,18 @@ in
     my.services.nginx.virtualHosts = {
       collabora = {
         inherit (cfg) port;
-        websocketsLocations = [
+
-          "~ ^/cool/(.*)/ws$"
+        extraConfig = {
-          "^~ /cool/adminws"
+          # Too bad for the repetition...
-        ];
+          locations."~ ^/cool/(.*)/ws$" = {
+            proxyPass = "http://127.0.0.1:${builtins.toString cfg.port}";
+            proxyWebsockets = true;
+          };
+          locations."^~ /cool/adminws" = {
+            proxyPass = "http://127.0.0.1:${builtins.toString cfg.port}";
+            proxyWebsockets = true;
+          };
+        };
       };
     };
   };

modules/nixos/services/nginx/default.nix

@@ -17,16 +17,6 @@ let
         '';
       };
 
-      websocketsLocations = mkOption {
-        type = with types; listOf str;
-        default = [ ];
-        example = [ "/socket" ];
-        description = ''
-          Which locations on this virtual host should be configured for
-          websockets.
-        '';
-      };
-
       port = mkOption {
         type = with types; nullOr port;
         default = null;
@@ -70,13 +60,10 @@ let
       extraConfig = mkOption {
         type = types.attrs; # FIXME: forward type of virtualHosts
         example = {
-          extraConfig = ''
+          locations."/socket" = {
-            add_header X-Clacks-Overhead "GNU Terry Pratchett";
+            proxyPass = "http://127.0.0.1:8096/";
-          '';
+            proxyWebsockets = true;
-
+          };
-          locations."/".extraConfig = ''
-            client_max_body_size 1G;
-          '';
         };
         default = { };
         description = ''
@@ -121,7 +108,12 @@ in
         };
         jellyfin = {
           port = 8096;
-          websocketsLocations = [ "/socket" ];
+          extraConfig = {
+            locations."/socket" = {
+              proxyPass = "http://127.0.0.1:8096/";
+              proxyWebsockets = true;
+            };
+          };
         };
       };
       description = ''
@@ -203,19 +195,6 @@ in
           } configured.
         '';
       }))
-      ++ (lib.flip lib.mapAttrsToList cfg.virtualHosts (_: { subdomain, ... } @ args:
-      let
-        proxyPass = [ "port" "socket" ];
-        proxyPassUsed = lib.any (v: args.${v} != null) proxyPass;
-      in
-      {
-        assertion = args.websocketsLocations != [ ] -> proxyPassUsed;
-        message = ''
-          Subdomain '${subdomain}' can only use 'websocketsLocations' with one of ${
-            lib.concatStringsSep ", " (builtins.map (v: "'${v}'") proxyPass)
-          }.
-        '';
-      }))
       ++ (
       let
         ports = lib.my.mapFilter
@@ -262,14 +241,6 @@ in
       virtualHosts =
         let
           domain = config.networking.domain;
-          mkProxyPass = { websocketsLocations, ... }: proxyPass:
-            let
-              websockets = lib.genAttrs websocketsLocations (_: {
-                inherit proxyPass;
-                proxyWebsockets = true;
-              });
-            in
-            { "/" = { inherit proxyPass; }; } // websockets;
           mkVHost = ({ subdomain, ... } @ args: lib.nameValuePair
             "${subdomain}.${domain}"
             (lib.my.recursiveMerge [
@@ -280,7 +251,8 @@ in
               }
               # Proxy to port
               (lib.optionalAttrs (args.port != null) {
-                locations = mkProxyPass args "http://127.0.0.1:${toString args.port}";
+                locations."/".proxyPass =
+                  "http://127.0.0.1:${toString args.port}";
               })
               # Serve filesystem content
               (lib.optionalAttrs (args.root != null) {
@@ -288,7 +260,8 @@ in
               })
               # Serve to UNIX socket
               (lib.optionalAttrs (args.socket != null) {
-                locations = mkProxyPass args "http://unix:${args.socket}";
+                locations."/".proxyPass =
+                  "http://unix:${args.socket}";
               })
               # Redirect to a different domain
               (lib.optionalAttrs (args.redirect != null) {

modules/nixos/services/paperless/default.nix

@@ -152,7 +152,11 @@ in
         sso = {
           enable = true;
         };
-        websocketsLocations = [ "/" ];
+
+        # Enable websockets on root
+        extraConfig = {
+          locations."/".proxyWebsockets = true;
+        };
       };
     };