Merge pull request #2777 from hashicorp/sethvargo/cache

Cache for a longer time on Fastly
This commit is contained in:
James Phillips 2017-02-28 13:25:48 -08:00 committed by GitHub
commit 87f70c1543
1 changed files with 5 additions and 2 deletions

View File

@ -48,6 +48,9 @@ if [ -z "$NO_UPLOAD" ]; then
exit 1 exit 1
fi fi
# Set browser-side cache-control to ~4h, but tell Fastly to cache for much
# longer. We manually purge the Fastly cache, so setting it to a year is more
# than fine.
s3cmd \ s3cmd \
--quiet \ --quiet \
--delete-removed \ --delete-removed \
@ -56,6 +59,7 @@ if [ -z "$NO_UPLOAD" ]; then
--acl-public \ --acl-public \
--recursive \ --recursive \
--add-header="Cache-Control: max-age=14400" \ --add-header="Cache-Control: max-age=14400" \
--add-header="x-amz-meta-surrogate-control: max-age=31536000" \
--add-header="x-amz-meta-surrogate-key: site-$PROJECT" \ --add-header="x-amz-meta-surrogate-key: site-$PROJECT" \
sync "$DIR/build/" "s3://hc-sites/$PROJECT/latest/" sync "$DIR/build/" "s3://hc-sites/$PROJECT/latest/"
@ -89,7 +93,7 @@ if [ -z "$NO_UPLOAD" ]; then
modify "s3://hc-sites/$PROJECT/latest/" modify "s3://hc-sites/$PROJECT/latest/"
fi fi
# Perform a soft-purge of the surrogate key. # Perform a purge of the surrogate key.
if [ -z "$NO_PURGE" ]; then if [ -z "$NO_PURGE" ]; then
echo "Purging Fastly cache..." echo "Purging Fastly cache..."
curl \ curl \
@ -99,7 +103,6 @@ if [ -z "$NO_PURGE" ]; then
--request "POST" \ --request "POST" \
--header "Accept: application/json" \ --header "Accept: application/json" \
--header "Fastly-Key: $FASTLY_API_KEY" \ --header "Fastly-Key: $FASTLY_API_KEY" \
--header "Fastly-Soft-Purge: 1" \
"https://api.fastly.com/service/$FASTLY_SERVICE_ID/purge/site-$PROJECT" "https://api.fastly.com/service/$FASTLY_SERVICE_ID/purge/site-$PROJECT"
fi fi