From 97135f99731ee249762fd64178b7f3a71f0c1365 Mon Sep 17 00:00:00 2001
From: Scott Walkinshaw <scott.walkinshaw@gmail.com>
Date: Sat, 15 Apr 2023 22:55:35 -0400
Subject: [PATCH] CLI config updates

Trellis CLI is now preferring `trellis.cli.yml` as the main config file path
over `.trellis/cli.yml` (though it remains supported).

This now makes it possible to gitignore the entire `.trellis` directory
as it contains CLI generated files for machine use only.

`.trellis/cli.yml` is exempted in the gitignore for legacy compatibility
purposes.
---
 .gitignore      | 4 +++-
 trellis.cli.yml | 6 ++++++
 2 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 trellis.cli.yml

diff --git a/.gitignore b/.gitignore
index d0fc5f0aa7..5fd7350b2b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,6 @@ vagrant.local.yml
 vendor/roles
 *.py[co]
 *.retry
-.trellis/virtualenv
+.trellis/*
+!.trellis/cli.yml
+trellis.cli.local.yml
diff --git a/trellis.cli.yml b/trellis.cli.yml
new file mode 100644
index 0000000000..7cfe2470b0
--- /dev/null
+++ b/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"