Move header detection into nginx conf.

This should make it easier to read later

Signed-off-by: Brian Warner <brian@bdwarner.com>

Author: brianwarner

Dockerfile

@@ -25,8 +25,8 @@ COPY cfg/purge.php /usr/share/nginx/html/
 # access environment variables without significant workarounds. Furthermore, the variables are
 # required because nginx does not currently support nested if statements.
 RUN if [ -n "$CDN_ACCESS_KEY" ]; then \
-    sed -i s/##PLACEHOLDER-cdn_header_detection-DO_NOT_CHANGE##/"map \$http_x_cdn_access \$reroute_to_cdn { default '1'; $CDN_ACCESS_KEY '0'; }"/g /etc/nginx/conf.d/default.conf && \
-    sed -i s/##PLACEHOLDER-cdn_reroute-DO_NOT_CHANGE##/"if (\$reroute_to_cdn) { return 301 \$scheme:\/\/code.jquery.com\$uri; }"/g /etc/nginx/conf.d/default.conf; \
+    sed -i s/CDN_ACCESS_KEY_PLACEHOLDER/$CDN_ACCESS_KEY/g /etc/nginx/conf.d/default.conf && \
+    sed -i s/##ACTIVATE-XCDNACCESS##//g /etc/nginx/conf.d/default.conf; \
   fi
 
 # Load the releases into the container

cfg/default.conf

@@ -15,10 +15,9 @@
 # Increase map_hash_bucket_size to accommodate longer CDN tokens
 map_hash_bucket_size 128;
 
-# Do not change the following line. The Dockerfile will add CDN header detection at build time if
-# the correct environment variable is set.
-
-##PLACEHOLDER-cdn_header_detection-DO_NOT_CHANGE##
+# Do not change the following lines. The Dockerfile will set the access key and remove the comment
+# at build time if the correct environment variable is set.
+##ACTIVATE-XCDNACCESS##map $http_x_cdn_access $reroute_to_cdn { default '1'; CDN_ACCESS_KEY_PLACEHOLDER '0'; }
 
 server {
   listen        80;
@@ -31,9 +30,9 @@ server {
     root        /usr/share/nginx/html;
     index       index.html index.htm;
 
-    # Do not change the following line. The Dockerfile will add the reroute logic at build time if
-    # the correct environment variable is set.
-    ##PLACEHOLDER-cdn_reroute-DO_NOT_CHANGE##
+    # Do not change the following line. The Dockerfile will set the access key and remove the
+    # comment at build time if the correct environment variable is set.
+    ##ACTIVATE-XCDNACCESS##if ($reroute_to_cdn) { return 301 \$scheme:\/\/code.jquery.com\$uri; }
 
   }