[GOVCMSD8-363] Tweaks to nginx helpers (#44)

* Add numeric prefix to helpers inline with Amazee base image. * Add include directives to expires location to allow additional config to be loaded.
govCMS · May 14, 2019 · 5af6601 · 5af6601
1 parent 740ef8a
commit 5af6601
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 0 deletions.
diff --git a/.docker/images/nginx/helpers/blocks.conf → .docker/images/nginx/helpers/200-blocks.conf b/.docker/images/nginx/helpers/blocks.conf → .docker/images/nginx/helpers/200-blocks.conf
diff --git a/.docker/images/nginx/helpers/expires.conf → ...ker/images/nginx/helpers/210-expires.conf b/.docker/images/nginx/helpers/expires.conf → ...ker/images/nginx/helpers/210-expires.conf
@@ -1,4 +1,8 @@
 # Only cache binary files for 30 minutes. These are the default allowed file extensions uploads that are not images.
 location ~* ^/sites/default/files/.+\.(pdf|doc|docx|txt|xls|xlsx|ppt|pptx|pps|ppsx|odt|ods|odp|mp3|mov|mp4|m4a|m4v|mpeg|avi|ogg|oga|ogv|weba|webp|webm)$ {
+    include /etc/nginx/conf.d/drupal/location_expires_prepend*.conf;
+
     expires ${BINARY_FILES_EXPIRES:-1800s};
+
+    include /etc/nginx/conf.d/drupal/location_expires_append*.conf;
 }
diff --git a/.docker/images/nginx/helpers/hotlink.conf → ...ker/images/nginx/helpers/220-hotlink.conf b/.docker/images/nginx/helpers/hotlink.conf → ...ker/images/nginx/helpers/220-hotlink.conf