Merge branch 'master' of https://github.com/mitchellh/packer

.github/ISSUE_TEMPLATE.md

@@ -1,5 +1,7 @@
 **DELETE THIS TEMPLATE BEFORE SUBMITTING**
 
+_Only use Github issues to report bugs or feature requests, see https://www.packer.io/community/_
+
 If you are planning to open a pull-request just open the pull-request instead of making an issue first.
 
 FOR FEATURES:

website/packer.json

@@ -27,8 +27,10 @@
         "FASTLY_API_KEY={{ user `fastly_api_key` }}"
       ],
       "inline": [
-        "apt-get update",
-        "apt-get install -y build-essential curl git libffi-dev s3cmd wget",
+        "apt-get -qq update",
+        "apt-get -yqq install build-essential curl git libffi-dev wget",
+        "apt-get -yqq install python-pip",
+        "pip install s3cmd",
         "cd /app",
 
         "bundle check || bundle install --jobs 7",

website/scripts/deploy.sh

@@ -64,15 +64,29 @@ if [ -z "$NO_UPLOAD" ]; then
 
   # The s3cmd guessed mime type for text files is often wrong. This is
   # problematic for some assets, so force their mime types to be correct.
+  echo "Overriding javascript mime-types..."
   s3cmd \
     --mime-type="application/javascript" \
-    modify "s3://hc-sites/$PROJECT/latest/**/*.js"
+    --exclude "*" \
+    --include "*.js" \
+    --recursive \
+    modify "s3://hc-sites/$PROJECT/latest/"
+
+  echo "Overriding css mime-types..."
   s3cmd \
     --mime-type="text/css" \
-    modify "s3://hc-sites/$PROJECT/latest/**/*.css"
+    --exclude "*" \
+    --include "*.css" \
+    --recursive \
+    modify "s3://hc-sites/$PROJECT/latest/"
+
+  echo "Overriding svg mime-types..."
   s3cmd \
     --mime-type="image/svg+xml" \
-    modify "s3://hc-sites/$PROJECT/latest/**/*.svg"
+    --exclude "*" \
+    --include "*.svg" \
+    --recursive \
+    modify "s3://hc-sites/$PROJECT/latest/"
 fi
 
 # Perform a soft-purge of the surrogate key.