Unverified Commit cbe24b9c authored by Maximilian Bosch's avatar Maximilian Bosch Committed by GitHub
Browse files

Merge: nixos/nextcloud: sync nginx config with upstream (#420017)

parents 5d90dda8 0c7a8d52

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

+3 −4
Original line number Diff line number Diff line
@@ -1450,7 +1450,7 @@ in 
            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\/.+|ocs-provider\/.+|.+\/richdocumentscode\/proxy) /index.php$request_uri;

              rewrite ^/(?!index|remote|public|cron|core\/ajax\/update|status|ocs\/v[12]|updater\/.+|ocs-provider\/.+|.+\/richdocumentscode(_arm64)?\/proxy) /index.php$request_uri;

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

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

              set $path_info $fastcgi_path_info;
@@ -1466,7 +1466,7 @@ in 
              fastcgi_read_timeout ${builtins.toString cfg.fastcgiTimeout}s;

            '';

          };

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

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

            ''

              try_files $uri /index.php$request_uri;

              expires 6M;
@@ -1501,7 +1501,6 @@ in 
            add_header X-Content-Type-Options nosniff;

            add_header X-XSS-Protection "1; mode=block";

            add_header X-Robots-Tag "noindex, nofollow";

            add_header X-Download-Options noopen;

            add_header X-Permitted-Cross-Domain-Policies none;

            add_header X-Frame-Options sameorigin;

            add_header Referrer-Policy no-referrer;
@@ -1517,7 +1516,7 @@ in 
          gzip_comp_level 4;

          gzip_min_length 256;

          gzip_proxied expired no-cache no-store private no_last_modified no_etag auth;

          gzip_types application/atom+xml application/javascript application/json application/ld+json application/manifest+json application/rss+xml application/vnd.geo+json application/vnd.ms-fontobject application/x-font-ttf application/x-web-app-manifest+json application/xhtml+xml application/xml font/opentype image/bmp image/svg+xml image/x-icon text/cache-manifest text/css text/plain text/vcard text/vnd.rim.location.xloc text/vtt text/x-component text/x-cross-domain-policy;

          gzip_types application/atom+xml text/javascript application/javascript application/json application/ld+json application/manifest+json application/rss+xml application/vnd.geo+json application/vnd.ms-fontobject application/wasm application/x-font-ttf application/x-web-app-manifest+json application/xhtml+xml application/xml font/opentype image/bmp image/svg+xml image/x-icon text/cache-manifest text/css text/plain text/vcard text/vnd.rim.location.xloc text/vtt text/x-component text/x-cross-domain-policy;



          ${optionalString cfg.webfinger ''

            rewrite ^/.well-known/host-meta /public.php?service=host-meta last;