Skip to content

Commit cbe24b9

Browse files
authored
Merge: nixos/nextcloud: sync nginx config with upstream (#420017)
2 parents 5d90dda + 0c7a8d5 commit cbe24b9

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1450,7 +1450,7 @@ in
14501450
priority = 500;
14511451
extraConfig = ''
14521452
# legacy support (i.e. static files and directories in cfg.package)
1453-
rewrite ^/(?!index|remote|public|cron|core\/ajax\/update|status|ocs\/v[12]|updater\/.+|ocs-provider\/.+|.+\/richdocumentscode\/proxy) /index.php$request_uri;
1453+
rewrite ^/(?!index|remote|public|cron|core\/ajax\/update|status|ocs\/v[12]|updater\/.+|ocs-provider\/.+|.+\/richdocumentscode(_arm64)?\/proxy) /index.php$request_uri;
14541454
include ${config.services.nginx.package}/conf/fastcgi.conf;
14551455
fastcgi_split_path_info ^(.+?\.php)(\\/.*)$;
14561456
set $path_info $fastcgi_path_info;
@@ -1466,7 +1466,7 @@ in
14661466
fastcgi_read_timeout ${builtins.toString cfg.fastcgiTimeout}s;
14671467
'';
14681468
};
1469-
"~ \\.(?:css|js|mjs|svg|gif|png|jpg|jpeg|ico|wasm|tflite|map|html|ttf|bcmap|mp4|webm|ogg|flac)$".extraConfig =
1469+
"~ \\.(?:css|js|mjs|svg|gif|ico|jpg|jpeg|png|webp|wasm|tflite|map|html|ttf|bcmap|mp4|webm|ogg|flac)$".extraConfig =
14701470
''
14711471
try_files $uri /index.php$request_uri;
14721472
expires 6M;
@@ -1501,7 +1501,6 @@ in
15011501
add_header X-Content-Type-Options nosniff;
15021502
add_header X-XSS-Protection "1; mode=block";
15031503
add_header X-Robots-Tag "noindex, nofollow";
1504-
add_header X-Download-Options noopen;
15051504
add_header X-Permitted-Cross-Domain-Policies none;
15061505
add_header X-Frame-Options sameorigin;
15071506
add_header Referrer-Policy no-referrer;
@@ -1517,7 +1516,7 @@ in
15171516
gzip_comp_level 4;
15181517
gzip_min_length 256;
15191518
gzip_proxied expired no-cache no-store private no_last_modified no_etag auth;
1520-
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;
1519+
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;
15211520
15221521
${optionalString cfg.webfinger ''
15231522
rewrite ^/.well-known/host-meta /public.php?service=host-meta last;

0 commit comments

Comments
 (0)