Merge branch 'v3'

# Conflicts: # .github/workflows/docker.build.yaml
flownative · Mar 2, 2022 · a440584 · a440584
2 parents d22b081 + d8c86f2
commit a440584
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/root-files/opt/flownative/lib/nginx-legacy.sh b/root-files/opt/flownative/lib/nginx-legacy.sh
@@ -176,16 +176,17 @@ EOM
         cat >>"${NGINX_CONF_PATH}/sites-enabled/site.conf" <<-EOM
     location ~* ^${BEACH_PERSISTENT_RESOURCES_BASE_PATH}([a-f0-9]+)/ {
         resolver 8.8.8.8;
-        expires max;
+        expires 3600;
         proxy_set_header Authorization "";
+        add_header Via 'Beach Asset Proxy';
         proxy_pass http://storage.googleapis.com/${BEACH_GOOGLE_CLOUD_STORAGE_PUBLIC_BUCKET}/\$1\$is_args\$args;
     }
 EOM
     elif [ -n "${BEACH_PERSISTENT_RESOURCES_FALLBACK_BASE_URI}" ]; then
         cat >>"${NGINX_CONF_PATH}/sites-enabled/site.conf" <<-EOM
     location ~* ^/_Resources/Persistent/(.*)$ {
         access_log off;
-        expires max;
+        expires 3600;
         try_files \$uri @fallback;
     }
 
@@ -208,7 +209,7 @@ EOM
     # for all static resources
     location ~ ^/_Resources/Static/ {
         access_log off;
-        expires max;
+        expires 3600;
     }
 }
 EOM