diff --git a/website/packer.json b/website/packer.json
index e6f50f8dfc..fd2618f178 100644
--- a/website/packer.json
+++ b/website/packer.json
@@ -10,15 +10,12 @@
"type": "docker",
"image": "hashicorp/middleman-hashicorp:0.3.28",
"discard": "true",
- "run_command": ["-d", "-i", "-t", "{{ .Image }}", "/bin/bash"]
+ "volumes": {
+ "{{ pwd }}": "/website"
+ }
}
],
"provisioners": [
- {
- "type": "file",
- "source": ".",
- "destination": "/website"
- },
{
"type": "shell",
"environment_vars": [
diff --git a/website/scripts/deploy.sh b/website/scripts/deploy.sh
index f7dace024a..689ab1c1a7 100755
--- a/website/scripts/deploy.sh
+++ b/website/scripts/deploy.sh
@@ -144,19 +144,23 @@ if [ -z "$NO_REDIRECTS" ] || [ ! test -f "./redirects.txt" ]; then
jq_args+=(--arg "value$((i/2))" "${redirect}")
jq_query+="| .items |= (. + [{op: \"upsert\", item_key: \$key$((i/2)), item_value: \$value$((i/2))}])"
done
- json="$(jq "${jq_args[@]}" "${jq_query}" <<<'{"items": []}')"
- # Post the JSON body
- curl \
- --fail \
- --silent \
- --output /dev/null \
- --request "PATCH" \
- --header "Fastly-Key: $FASTLY_API_KEY" \
- --header "Content-type: application/json" \
- --header "Accept: application/json" \
- --data "$json"\
- "https://api.fastly.com/service/$FASTLY_SERVICE_ID/dictionary/$FASTLY_DICTIONARY_ID/items"
+ # Do not post empty items (the API gets sad)
+ if [ "${#jq_args[@]}" -ne 0 ]; then
+ json="$(jq "${jq_args[@]}" "${jq_query}" <<<'{"items": []}')"
+
+ # Post the JSON body
+ curl \
+ --fail \
+ --silent \
+ --output /dev/null \
+ --request "PATCH" \
+ --header "Fastly-Key: $FASTLY_API_KEY" \
+ --header "Content-type: application/json" \
+ --header "Accept: application/json" \
+ --data "$json"\
+ "https://api.fastly.com/service/$FASTLY_SERVICE_ID/dictionary/$FASTLY_DICTIONARY_ID/items"
+ fi
fi
# Perform a purge of the surrogate key.
@@ -184,8 +188,13 @@ if [ -z "$NO_WARM" ]; then
echo "wget --recursive --delete-after https://$PROJECT_URL/"
echo ""
wget \
- --recursive \
--delete-after \
- --quiet \
+ --level inf \
+ --no-directories \
+ --no-host-directories \
+ --no-verbose \
+ --page-requisites \
+ --recursive \
+ --spider \
"https://$PROJECT_URL/"
fi
diff --git a/website/source/community.html.erb b/website/source/community.html.erb
index 7c8227fdb9..05f6d0de4a 100644
--- a/website/source/community.html.erb
+++ b/website/source/community.html.erb
@@ -8,117 +8,28 @@ description: |-
Community
-Vault is an open source project with a growing community. There are
-active, dedicated users willing to help you through various mediums.
+ Vault is an open source project with a growing community. There are active,
+ dedicated users willing to help you through various mediums.
-IRC: #vault-tool on Freenode
+ IRC: #vault-tool on Freenode
-Announcement list:
-HashiCorp Announcement Google Group
+ Announcement list:
+ HashiCorp Announcement Google Group
-Discussion list:
-Vault Google Group
+ Discussion list:
+ Vault Google Group
-Bug Tracker:
-Issue tracker
+ Bug Tracker:
+ Issue tracker
on GitHub. Please only use this for reporting bugs. Do not ask
-for general help here. Use IRC or the mailing list for that.
+ for general help here. Use IRC or the mailing list for that.
-Training:
-Paid HashiCorp training courses
-are also available in a city near you. Private training courses are also available.
+ Training:
+ Paid HashiCorp training courses
+ are also available in a city near you. Private training courses are also available.
-
-People
-
-The following people are some of the faces behind Vault. They each
-contribute to Vault in some core way. Over time, faces may appear and
-disappear from this list as contributors come and go. In addition to
-the faces below, Vault is a project by
-HashiCorp, so many HashiCorp
-employees actively contribute to Vault.
-
-
-
-
-
-
Mitchell Hashimoto (@mitchellh)
-
- Mitchell Hashimoto is the creator of Vault and works on all
- layers of Vault from the core to backends. In addition to Vault,
- Mitchell is the creator of
- Vagrant,
- Packer,
- Consul, and
- Terraform.
-
-
-
-
-
-
-
-
Armon Dadgar (@armon)
-
- Armon Dadgar is a creator of Vault. He works on all aspects of Vault,
- focusing on core architecture and security. Armon is also the creator of
- Consul,
- Serf,
- Terraform,
- Statsite, and
- Bloomd.
-
-
-
-
-
-
-
-
-
- Jeff Mitchell is a core contributor to Vault. He works on all layers of
- Vault, from the core to backends. Jeff is an employee of HashiCorp and
- has also contributed to
- Consul and
- Terraform,
- as well as many other open-source projects.
-
-
-
-
-
-
-
-
-
- Vishal Nayak is a core contributor to Vault. He works on all layers
- of Vault, from the core to backends. Vishal is an employee of
- HashiCorp.
-
-
-
-
-
-
-
-
-
- Jack Pearkes is the creator of the online interactive demo of Vault.
- He maintains this demo as well as the design and interaction of the
- Vault website. Jack is an employee of HashiCorp and a primary engineer
- behind Atlas.
- He is also a core committer to
- Packer,
- Consul, and
- Terraform.
-
-
-
-
-
-