Merge branch 'master' of https://github.com/roots/trellis

.gitignore

@@ -4,4 +4,6 @@ vagrant.local.yml
 vendor/roles
 *.py[co]
 *.retry
-.trellis/virtualenv
+.trellis/*
+!.trellis/cli.yml
+trellis.cli.local.yml

deploy-hooks/build-after.yml

@@ -3,6 +3,7 @@
 # ⚠️ This example assumes your theme is using Sage 10
 #
 # Uncomment the lines below if you are using Sage 10
+# NOTE: this task will fail if Sage theme is not activated at time of deployment.
 #
 # ---
 # - name: Run Acorn optimize

trellis.cli.yml

@@ -0,0 +1,6 @@
+# Trellis CLI example config file
+# https://roots.io/trellis/docs/cli/#configuration
+#
+# database_app: sequel-ace
+# open:
+#   admin: "https://mysite.com/wp/wp-admin"