Merge pull request #19 from indiegogo/cloudinary-staging/adjust-nginx…

…-config

cloudinary-staging: Adjust Nginx config, add `q_auto,f_auto`

charts/cloudinary-staging/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v2
 name: cloudinary-staging
-version: 0.1.0
-description: A Helm chart for Cloudinary
+version: 0.1.1
+description: A Helm chart for Cloudinary, used by Staging
 type: application
 keywords:
   - cloudinary

charts/cloudinary-staging/templates/configmap.yaml

@@ -51,15 +51,24 @@ data:
           return 200;
         }
 
+        # Of interesting note for the next two locations, you can't mix mapped
+        # variables with default capture variables ($1, $2, etc.) which is why
+        # these captures are named.
+
+        location ~ image/upload {
+          # Prepend both q_auto & f_auto for Cloudinary hosted assets.
+          # This allows for either to be overridden by setting the option again later.
+          rewrite ^(?!q_auto,f_auto.*)(?<prefix>.*?image/upload)/(?<postfix>.*)$ "${prefix}/q_auto,f_auto,${postfix}" break;
+          try_files /nonexistent @proxy;
+        }
+
         location ^~ /indiegogo-dev {
           # Strip the indiegogo-dev/ prefix
           rewrite ^/indiegogo-dev/(.*)$ /$1 last;
         }
 
         location ~ f_auto {
           # Replace f_auto with appropriate setting based on Accept headers.
-          # Of interesting note, you can't mix mapped variables with default capture
-          # variables ($1, $2, etc.) which is why these captures are named.
           rewrite ^(?<prefix>.*)f_auto(?<postfix>.*)$ "${prefix}${f_auto_setting}${postfix}" break;
           try_files /nonexistent @proxy;
         }