Merge pull request #27 from flownative/persistent-resource-cache

TASK: Enable persistent resources caching

Author: kitsunet

root-files/build.sh

@@ -8,7 +8,8 @@ useradd --home-dir "${NGINX_BASE_PATH}" --no-create-home --no-user-group --uid 1
 groupadd --gid 1000 nginx
 
 mkdir -p \
-    "${NGINX_BASE_PATH}/cache" \
+    "${NGINX_BASE_PATH}/cache/application" \
+    "${NGINX_BASE_PATH}/cache/resources" \
     "${NGINX_BASE_PATH}/etc" \
     "${NGINX_BASE_PATH}/modules" \
     "${NGINX_BASE_PATH}/sbin" \

root-files/opt/flownative/lib/nginx-legacy.sh

@@ -243,6 +243,10 @@ EOM
         ${addHeaderStrictTransportSecurity}
         proxy_pass ${BEACH_ASSET_PROXY_ENDPOINT}/\$1\$is_args\$args?reqid=\$request_id;
         expires ${NGINX_STATIC_FILES_LIFETIME};
+        proxy_cache persistent_res;
+        # we care only about the resource hash as it's the only thing passed on, host is irrelevant
+        proxy_cache_key \$1;
+        add_header X-Nginx-Cache-Resources \$upstream_cache_status;
     }
 EOM
     elif [ -n "${BEACH_GOOGLE_CLOUD_STORAGE_PUBLIC_BUCKET}" ]; then
@@ -260,6 +264,10 @@ EOM
         ${addHeaderStrictTransportSecurity}
         proxy_pass https://storage.googleapis.com/${BEACH_GOOGLE_CLOUD_STORAGE_PUBLIC_BUCKET}/\$1\$is_args\$args?reqid=\$request_id;
         expires ${NGINX_STATIC_FILES_LIFETIME};
+        proxy_cache persistent_res;
+        # we care only about the resource hash as it's the only thing passed on, host is irrelevant
+        proxy_cache_key \$1;
+        add_header X-Nginx-Cache-Resources \$upstream_cache_status;
     }
 EOM
     elif [ -n "${BEACH_PERSISTENT_RESOURCES_FALLBACK_BASE_URI}" ]; then

root-files/opt/flownative/lib/nginx.sh

@@ -30,7 +30,7 @@ export NGINX_ACCESS_LOG_MODE="${NGINX_ACCESS_LOG_MODE:-dynamic}"
 export NGINX_ACCESS_LOG_FORMAT="${NGINX_ACCESS_LOG_FORMAT:-default}"
 export NGINX_ACCESS_LOG_IGNORED_STATUS_CODES_REGEX="${NGINX_ACCESS_LOG_IGNORED_STATUS_CODES_REGEX:-^[13]}"
 
-export NGINX_CACHE_PATH="${NGINX_CACHE_PATH:-${NGINX_BASE_PATH}/cache}"
+export NGINX_CACHE_PATH="${NGINX_CACHE_PATH:-${NGINX_BASE_PATH}/cache/application}"
 export NGINX_CACHE_ENABLE="${NGINX_CACHE_ENABLE:-no}"
 export NGINX_CACHE_NAME="${NGINX_CACHE_NAME:-application}"
 export NGINX_CACHE_DEFAULT_LIFETIME="${NGINX_CACHE_DEFAULT_LIFETIME:-5s}"
@@ -39,6 +39,8 @@ export NGINX_CACHE_INACTIVE="${NGINX_CACHE_INACTIVE:-1h}"
 export NGINX_CACHE_USE_STALE_OPTIONS="${NGINX_CACHE_USE_STALE_OPTIONS:-updating error timeout invalid_header}"
 export NGINX_CACHE_BACKGROUND_UPDATE="${NGINX_CACHE_BACKGROUND_UPDATE:-off}"
 
+export NGINX_CACHE_RESOURCES_PATH="${NGINX_CACHE_PATH:-${NGINX_BASE_PATH}/cache/resources}"
+
 export NGINX_CUSTOM_ERROR_PAGE_CODES="${NGINX_CUSTOM_ERROR_PAGE_CODES:-500 501 502 503}"
 export NGINX_CUSTOM_ERROR_PAGE_TARGET="${NGINX_CUSTOM_ERROR_PAGE_TARGET:-}"
 

root-files/opt/flownative/nginx/etc/nginx.conf.template

@@ -19,6 +19,7 @@ http {
     scgi_temp_path "${NGINX_TMP_PATH}/scgi" 1 2;
     uwsgi_temp_path "${NGINX_TMP_PATH}/uwsgi" 1 2;
     fastcgi_cache_path "${NGINX_CACHE_PATH}" levels=1:2 keys_zone=application:10m max_size=${NGINX_CACHE_MAX_SIZE};
+    proxy_cache_path "${NGINX_CACHE_RESOURCES_PATH}" levels=1:2 keys_zone=persistent_res:2m max_size=2g inactive=336h use_temp_path=off;
 
     include ${NGINX_CONF_PATH}/mime.types;
     default_type application/octet-stream;