From 44690638f987d01d9b768eb51c26550a4d1cc0bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Fri, 2 Jun 2023 08:36:00 +0200
Subject: [PATCH] synchronize with upstream

---
 conf/nginx.conf | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/conf/nginx.conf b/conf/nginx.conf
index c128273..c47c6d7 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -77,7 +77,7 @@ location ^~ __PATH__/ {
 
   # Rules borrowed from `.htaccess` to hide certain paths from clients
   location ~ ^__PATH__/(?:build|tests|config|lib|3rdparty|templates|data)(?:$|/)    { return 404; }
-  location ~ ^__PATH__/(?:\.|autotest|occ|issue|indie|db_|console)                { return 404; }
+  location ~ ^__PATH__/(?:\.|autotest|occ|issue|indie|db_|console)                  { return 404; }
 
   # Ensure this block, which passes PHP files to the PHP process, is above the blocks
   # which handle static assets (as seen below). If this block is not declared first,
@@ -88,14 +88,17 @@ location ^~ __PATH__/ {
     # https://github.com/nextcloud/documentation/pull/2197#issuecomment-721432337
     # This line fix the ldap admin page
     rewrite ^__PATH__/(?!index|remote|public|cron|core\/ajax\/update|status|ocs\/v[12]|updater\/.+|oc[ms]-provider\/.+|.+\/richdocumentscode\/proxy) __PATH__/index.php$request_uri;
+    
     fastcgi_split_path_info ^(.+?\.php)(/.*)$;
     set $path_info $fastcgi_path_info;
+    
     try_files $fastcgi_script_name =404;
+    
     include fastcgi_params;
-
     fastcgi_param SCRIPT_FILENAME $request_filename;
     fastcgi_param PATH_INFO $path_info;
     fastcgi_param HTTPS on;
+
     fastcgi_param modHeadersAvailable true;         # Avoid sending the security headers twice
     fastcgi_param front_controller_active true;     # Enable pretty urls
     fastcgi_param HTTP_ACCEPT_ENCODING "";          # Disable encoding of nextcloud response to inject ynh scripts
@@ -104,10 +107,14 @@ location ^~ __PATH__/ {
     fastcgi_request_buffering off;
   }
 
-  location ~ \.(?:css|js|svg|gif)$ {
+  location ~ \.(?:css|js|svg|gif|png|jpg|ico|wasm|tflite|map)$ {
     try_files $uri / __PATH__/index.php$request_uri;
-    expires 6M;         # Cache-Control policy borrowed from `.htaccess`
+    more_set_headers "Cache-Control: public, max-age=15778463, $asset_immutable";
+    #expires 6M;        # Cache-Control policy borrowed from `.htaccess`
     access_log off;     # Optional: Don't log access to assets
+
+    location ~ \.wasm$ {
+            default_type application/wasm;
   }
 
   location ~ \.woff2?$ {