From cdf87fe43101c81483e7509bcdcdca8d55d8e337 Mon Sep 17 00:00:00 2001
From: Phil Nelson <phil@fullyint.com>
Date: Mon, 25 Jul 2016 19:44:00 -0700
Subject: [PATCH] Reformat site_hosts to use canonical and redirects

---
 trellis/deploys.md         |  4 ++--
 trellis/wordpress-sites.md | 24 +++++++++++++++++++++---
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/trellis/deploys.md b/trellis/deploys.md
index d667f546..4ed43779 100644
--- a/trellis/deploys.md
+++ b/trellis/deploys.md
@@ -123,7 +123,7 @@ Configuration:
 wordpress_sites:
   mysite.com:
     site_hosts:
-      - mysite.com
+      - canonical: mysite.com
     local_path: ../site
     repo: git@github.com:me/mysite.git
     repo_subtree_path: site
@@ -147,4 +147,4 @@ ansible-playbook deploy.yml -e "site=mysite.com env=production"
 
 ## Rollbacks
 
-To rollback a deploy, run `ansible-playbook rollback.yml -e "site=<domain> env=<environment>"`
\ No newline at end of file
+To rollback a deploy, run `ansible-playbook rollback.yml -e "site=<domain> env=<environment>"`
diff --git a/trellis/wordpress-sites.md b/trellis/wordpress-sites.md
index 657fe1c7..004b7afc 100644
--- a/trellis/wordpress-sites.md
+++ b/trellis/wordpress-sites.md
@@ -35,7 +35,7 @@ There are two components and places to configure sites:
 wordpress_sites:
   example.com:
     site_hosts:
-      - example.dev
+      - canonical: example.dev
     local_path: ../site # path targeting local Bedrock site directory (relative to Ansible root)
     admin_email: admin@example.dev
     multisite:
@@ -71,8 +71,26 @@ For a complete working example of a real-life WordPress site, you can view the c
 
 ### Common
 
-* `site_hosts` - array of hosts that Nginx will listen on (*required*, include main domain at least)
-* `www_redirect` - whether to redirect `www/non-www` counterparts of `site_hosts` (default: `true`)
+* `site_hosts` - List of hosts that Nginx will listen on. At least one is required. Each host item must specify a `canonical` host and may optionally specify a list of corresponding `redirects` (hosts). Remember to set up DNS for every host listed. (*required*)
+
+```
+# minimum required
+example.com:
+  site_hosts:
+    - canonical: example.com
+
+# multiple hosts and redirects are possible
+example.com:
+  site_hosts:
+    - canonical: example.com
+      redirects:
+        - www.example.com
+        - site.com
+    - canonical: example.co.uk
+      redirects:
+        - www.example.co.uk
+```
+
 * `local_path` - path targeting Bedrock-based site directory (*required*)
 * `current_path` - symlink to latest release (default: `current`)
 * `db_create` - whether to auto create a database or not (default: `true`)