From 9abf137b08c5b4ad2ef8838afb8362ba5a8eb902 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Melan=C3=A7on?= <ben@agaric.coop>
Date: Wed, 13 Apr 2022 11:36:02 -0400
Subject: [PATCH] Update DDEV config for its latest version

---
 .ddev/.gitignore  |  1 +
 .ddev/config.yaml | 32 +++++++++++++++++++++-----------
 2 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/.ddev/.gitignore b/.ddev/.gitignore
index 500e5dc..2824c39 100644
--- a/.ddev/.gitignore
+++ b/.ddev/.gitignore
@@ -24,6 +24,7 @@
 /import.yaml
 /mutagen
 /nginx_full/nginx-site.conf
+/postgres/postgresql.conf
 /sequelpro.spf
 /xhprof
 /**/README.*
diff --git a/.ddev/config.yaml b/.ddev/config.yaml
index f707b3a..923457b 100644
--- a/.ddev/config.yaml
+++ b/.ddev/config.yaml
@@ -8,13 +8,15 @@ router_https_port: "443"
 xdebug_enabled: false
 additional_hostnames: []
 additional_fqdns: []
-mariadb_version: "10.5"
-mysql_version: ""
+database:
+  type: mariadb
+  version: "10.5"
 nfs_mount_enabled: false
 mutagen_enabled: false
 use_dns_when_possible: false
 composer_version: "2"
 web_environment: []
+nodejs_version: "16"
 
 # Key features of ddev's config.yaml:
 
@@ -27,19 +29,17 @@ web_environment: []
 
 # php_version: "7.4"  # PHP version to use, "5.6", "7.0", "7.1", "7.2", "7.3", "7.4", "8.0", "8.1"
 
-# You can explicitly specify the webimage, dbimage, dbaimage lines but this
+# You can explicitly specify the webimage but this
 # is not recommended, as the images are often closely tied to ddev's' behavior,
 # so this can break upgrades.
 
 # webimage: <docker_image>  # nginx/php docker image.
-# dbimage: <docker_image>  # mariadb docker image.
-# dbaimage: <docker_image>
 
-# mariadb_version and mysql_version
-# ddev can use many versions of mariadb and mysql
-# However these directives are mutually exclusive
-# mariadb_version: 10.2
-# mysql_version: 8.0
+# database:
+#   type: <dbtype> # mysql, mariadb
+#   version: <version> # database version, like "10.3" or "8.0"
+# Note that mariadb_version or mysql_version from v1.18 and earlier
+# will automatically be converted to this notation with just a "ddev config --auto"
 
 # router_http_port: <port>  # Port to be used for http (defaults to port 80)
 # router_https_port: <port> # Port for https (defaults to 443)
@@ -62,6 +62,11 @@ web_environment: []
 # see https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
 # For example Europe/Dublin or MST7MDT
 
+# composer_root: <relative_path>
+# Relative path to the composer root directory from the project root. This is
+# the directory which contains the composer.json and where all Composer related
+# commands are executed.
+
 # composer_version: "2"
 # if composer_version:"2" it will use the most recent composer v2
 # It can also be set to "1", to get most recent composer v1
@@ -69,6 +74,11 @@ web_environment: []
 # It can be set to any existing specific composer version.
 # After first project 'ddev start' this will not be updated until it changes
 
+# nodejs_version: "16"
+# change from the default system Node.js version to another supported version, like 12, 14, 17.
+# Note that you can use 'ddev nvm' or nvm inside the web container to provide nearly any
+# Node.js version, including v6, etc.
+
 # additional_hostnames:
 #  - somename
 #  - someothername
@@ -82,7 +92,7 @@ web_environment: []
 # Please take care with this because it can cause great confusion.
 
 # upload_dir: custom/upload/dir
-# would set the destination path for ddev import-files to <docroot>/custom/upload/dir 
+# would set the destination path for ddev import-files to <docroot>/custom/upload/dir
 
 # working_dir:
 #   web: /var/www/html