From 208a928cdc45c5f959d47fb5948ac403c64fe464 Mon Sep 17 00:00:00 2001
From: Robert Lemke <robert@flownative.com>
Date: Thu, 5 May 2022 19:01:34 +0200
Subject: [PATCH] Remove debug code

---
 Dockerfile                                    | 1 -
 root-files/opt/flownative/lib/nginx-legacy.sh | 7 +------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 045438b..5d54918 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -27,7 +27,6 @@ RUN install_packages \
     libnginx-mod-http-headers-more-filter \
     ca-certificates \
     procps \
-    netcat vim less curl locales locales-all \
     && rm /etc/nginx/sites-available/default \
     && rm /etc/nginx/sites-enabled/default
 
diff --git a/root-files/opt/flownative/lib/nginx-legacy.sh b/root-files/opt/flownative/lib/nginx-legacy.sh
index a4f4af9..fbc075e 100644
--- a/root-files/opt/flownative/lib/nginx-legacy.sh
+++ b/root-files/opt/flownative/lib/nginx-legacy.sh
@@ -194,12 +194,7 @@ EOM
         add_header Via 'Beach Asset Proxy';
         ${addHeaderStrictTransportSecurity}
         proxy_pass https://storage.googleapis.com/${BEACH_GOOGLE_CLOUD_STORAGE_PUBLIC_BUCKET}/\$1\$is_args\$args;
-
-        # See: https://github.com/openresty/headers-more-nginx-module#more_set_headers
-        # and https://nginx-extras.getpagespeed.com/modules/headers-more/#more_set_headers
-        more_set_headers -s '200 203 206 304' 'Cache-Control: max-age=15552000';
-        more_set_headers 'X-Test-Cache-Control: max-age=15552000';
-        more_clear_headers 'x-goog-storage-class';
+        expires ${NGINX_STATIC_FILES_LIFETIME};
     }
 EOM
     elif [ -n "${BEACH_PERSISTENT_RESOURCES_FALLBACK_BASE_URI}" ]; then