Unverified Commit ad57ad1f authored by Maximilian Bosch's avatar Maximilian Bosch
Browse files

nixos/nextcloud: update / clean up the nginx configuration 

First of all, a few cleanups were made to make it more readable:

* Reordered the sections by their priority so what you're reading in Nix
  is also what you get in the final nginx.conf.
* Unified media/asset locations

Most notably, this fixes the

    Your web server is not properly set up to resolve "/ocm-provider/".

warning since 27.1.2 where `ocm-provider` was moved from a static
directory in the source tarball to a dynamic HTTP route[1].

Additionally, the following things were fixed:

* The 404 checks for build/tests/etc. are now guaranteed to be before
  the `.php` location match and it's not implicitly relied upon Nix's
  internal attribute sorting anymore.

* `.wasm` files are supported properly and a correct `Content-Type` is
  set.

* For "legacy" routes (e.g. `ocs-provider`/`cron`/etc) a `rewrite` rule
  inside the location for fastcgi is used as recommended by upstream[2].
  This also makes it easier to understand the purpose of the location
  itself (i.e. use fastcgi for PHP code).

[1] https://github.com/nextcloud/documentation/pull/11179
[2] https://docs.nextcloud.com/server/27/admin_manual/installation/nginx.html
parent 8702ae01

nixos/modules/services/web-apps/nextcloud.nix

+35 −17
Original line number Diff line number Diff line
@@ -60,6 +60,9 @@ let 
  mysqlLocal = cfg.database.createLocally && cfg.config.dbtype == "mysql";

  pgsqlLocal = cfg.database.createLocally && cfg.config.dbtype == "pgsql";



  # https://github.com/nextcloud/documentation/pull/11179

  ocmProviderIsNotAStaticDirAnymore = versionAtLeast cfg.package.version "27.1.2";



in {



  imports = [
@@ -1080,10 +1083,6 @@ in { 
              }

            '';

          };

          "/" = {

            priority = 900;

            extraConfig = "rewrite ^ /index.php;";

          };

          "~ ^/store-apps" = {

            priority = 201;

            extraConfig = "root ${cfg.home};";
@@ -1108,15 +1107,23 @@ in { 
              try_files $uri $uri/ =404;

            '';

          };

          "~ ^/(?:build|tests|config|lib|3rdparty|templates|data)(?:$|/)".extraConfig = ''

          "~ ^/(?:build|tests|config|lib|3rdparty|templates|data)(?:$|/)" = {

            priority = 450;

            extraConfig = ''

              return 404;

            '';

          "~ ^/(?:\\.(?!well-known)|autotest|occ|issue|indie|db_|console)".extraConfig = ''

          };

          "~ ^/(?:\\.|autotest|occ|issue|indie|db_|console)" = {

            priority = 450;

            extraConfig = ''

              return 404;

            '';

          "~ ^\\/(?:index|remote|public|cron|core\\/ajax\\/update|status|ocs\\/v[12]|updater\\/.+|oc[ms]-provider\\/.+|.+\\/richdocumentscode\\/proxy)\\.php(?:$|\\/)" = {

          };

          "~ \\.php(?:$|/)" = {

            priority = 500;

            extraConfig = ''

              # legacy support (i.e. static files and directories in cfg.package)

              rewrite ^/(?!index|remote|public|cron|core\/ajax\/update|status|ocs\/v[12]|updater\/.+|oc[s${optionalString (!ocmProviderIsNotAStaticDirAnymore) "m"}]-provider\/.+|.+\/richdocumentscode\/proxy) /index.php$request_uri;

              include ${config.services.nginx.package}/conf/fastcgi.conf;

              fastcgi_split_path_info ^(.+?\.php)(\\/.*)$;

              set $path_info $fastcgi_path_info;
@@ -1132,20 +1139,31 @@ in { 
              fastcgi_read_timeout ${builtins.toString cfg.fastcgiTimeout}s;

            '';

          };

          "~ \\.(?:css|js|woff2?|svg|gif|map)$".extraConfig = ''

          "~ \\.(?:css|js|mjs|svg|gif|png|jpg|jpeg|ico|wasm|tflite|map|html|ttf|bcmap|mp4|webm)$".extraConfig = ''

            try_files $uri /index.php$request_uri;

            expires 6M;

            access_log off;

            location ~ \.wasm$ {

              default_type application/wasm;

            }

          '';

          "~ ^\\/(?:updater|ocs-provider|ocm-provider)(?:$|\\/)".extraConfig = ''

          "~ ^\\/(?:updater|ocs-provider${optionalString (!ocmProviderIsNotAStaticDirAnymore) "|ocm-provider"})(?:$|\\/)".extraConfig = ''

            try_files $uri/ =404;

            index index.php;

          '';

          "~ \\.(?:png|html|ttf|ico|jpg|jpeg|bcmap|mp4|webm)$".extraConfig = ''

            try_files $uri /index.php$request_uri;

            access_log off;

          "/remote" = {

            priority = 1500;

            extraConfig = ''

              return 301 /remote.php$request_uri;

            '';

          };

          "/" = {

            priority = 1600;

            extraConfig = ''

              try_files $uri $uri/ /index.php$request_uri;

            '';

          };

        };

        extraConfig = ''

          index index.php index.html /index.php$request_uri;

          ${optionalString (cfg.nginx.recommendedHttpHeaders) ''